Skip to content

Commit 6c1f969

Browse files
Feat libfasttransforms v0.3.3 (#115)
* support v0.3.3 add linux jobs on travis * travis didn't bite * had jobs and matrix * allow arm64 to fail
1 parent 9703ea6 commit 6c1f969

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

.travis.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,26 @@
22
language: julia
33
os:
44
- freebsd
5+
- linux
6+
arch:
7+
- x64
8+
- x86
9+
- arm64
510
julia:
611
- 1.3
712
- 1.4
813
- nightly
9-
notifications:
10-
email: false
1114
jobs:
15+
exclude:
16+
- os: freebsd
17+
arch: x86
18+
- os: freebsd
19+
arch: arm64
1220
allow_failures:
1321
- julia: nightly
22+
- arch: arm64
23+
notifications:
24+
email: false
1425
cache:
1526
directories:
1627
- $HOME/.julia/artifacts

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "FastTransforms"
22
uuid = "057dd010-8810-581a-b7be-e3fc3b93f78c"
3-
version = "0.9.3"
3+
version = "0.9.4"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -25,7 +25,7 @@ BinaryProvider = "0.5"
2525
DSP = "0.6"
2626
FFTW = "1"
2727
FastGaussQuadrature = "0.4"
28-
FastTransforms_jll = "0.3.2"
28+
FastTransforms_jll = "0.3.3"
2929
FillArrays = "0.8"
3030
Reexport = "0.2"
3131
SpecialFunctions = "0.8, 0.9, 0.10"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This package provides a Julia wrapper for the [C library](https://github.com/Mik
88

99
## Installation
1010

11-
Installation, which uses [BinaryBuilder](https://github.com/JuliaPackaging/BinaryBuilder.jl) for Intel processors (Sandybridge and beyond), may be as straightforward as:
11+
Installation, which uses [BinaryBuilder](https://github.com/JuliaPackaging/BinaryBuilder.jl) for all of Julia's supported platforms (in particular Sandybridge Intel processors and beyond), may be as straightforward as:
1212

1313
```julia
1414
pkg> add FastTransforms

deps/build.jl

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
using BinaryProvider
22
import Libdl
33

4-
version = v"0.3.2"
5-
6-
if arch(platform_key_abi()) != :x86_64
7-
@warn "FastTransforms has only been tested on x86_64 architectures."
8-
end
4+
version = v"0.3.3"
95

106
const extension = Sys.isapple() ? "dylib" : Sys.islinux() ? "so" : Sys.iswindows() ? "dll" : ""
117

@@ -15,15 +11,14 @@ print_error() = error(
1511
print_platform_error(platform_key_abi())
1612
)
1713

18-
print_platform_error(p::Platform) = "On $(BinaryProvider.platform_name(p)), please consider opening a pull request to add support.\n"
19-
print_platform_error(p::MacOS) = "On MacOS\n\tbrew install gcc@8 fftw mpfr\n"
20-
print_platform_error(p::Linux) = "On Linux\n\tsudo apt-get install gcc-8 libblas-dev libopenblas-base libfftw3-dev libmpfr-dev\n"
14+
print_platform_error(p::Platform) = "On $(BinaryProvider.platform_name(p)), please consider opening a pull request to add support to build from source.\n"
15+
print_platform_error(p::MacOS) = "On MacOS\n\tbrew install libomp fftw mpfr\n"
16+
print_platform_error(p::Linux) = "On Linux\n\tsudo apt-get install libomp-dev libblas-dev libopenblas-base libfftw3-dev libmpfr-dev\n"
2117
print_platform_error(p::Windows) = "On Windows\n\tvcpkg install openblas:x64-windows fftw3[core,threads]:x64-windows mpir:x64-windows mpfr:x64-windows\n"
2218

2319
ft_build_from_source = get(ENV, "FT_BUILD_FROM_SOURCE", "false")
2420
if ft_build_from_source == "true"
2521
make = Sys.iswindows() ? "mingw32-make" : "make"
26-
compiler = Sys.isapple() ? "CC=gcc-8" : "CC=gcc"
2722
flags = Sys.isapple() ? "FT_USE_APPLEBLAS=1" : Sys.iswindows() ? "FT_FFTW_WITH_COMBINED_THREADS=1" : ""
2823
script = """
2924
set -e
@@ -37,8 +32,8 @@ if ft_build_from_source == "true"
3732
git clone -b v$version https://github.com/MikaelSlevinsky/FastTransforms.git FastTransforms
3833
fi
3934
cd FastTransforms
40-
$make assembly $compiler
41-
$make lib $compiler $flags
35+
$make assembly
36+
$make lib $flags
4237
cd ..
4338
mv -f FastTransforms/libfasttransforms.$extension libfasttransforms.$extension
4439
"""

src/clenshaw.jl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
evaluates the orthogonal polynomials at points `x`,
55
where `A`, `B`, and `C` are `AbstractVector`s containing the recurrence coefficients
66
as defined in DLMF,
7-
overwriting `v` with the results.
7+
overwriting `v` with the results.
88
"""
99
function forwardrecurrence!(v::AbstractVector{T}, A::AbstractVector, B::AbstractVector, C::AbstractVector, x) where T
1010
N = length(v)
@@ -51,7 +51,7 @@ where `A`, `B`, and `C` are `AbstractVector`s containing the recurrence coeffici
5151
as defined in DLMF,
5252
overwriting `x` with the results.
5353
"""
54-
clenshaw!(c::AbstractVector, A::AbstractVector, B::AbstractVector, C::AbstractVector, x::AbstractVector) =
54+
clenshaw!(c::AbstractVector, A::AbstractVector, B::AbstractVector, C::AbstractVector, x::AbstractVector) =
5555
clenshaw!(c, A, B, C, x, Ones{eltype(x)}(length(x)), x)
5656

5757

@@ -85,7 +85,7 @@ where `A`, `B`, and `C` are `AbstractVector`s containing the recurrence coeffici
8585
as defined in DLMF.
8686
`x` may also be a single `Number`.
8787
"""
88-
88+
8989
function clenshaw(c::AbstractVector, A::AbstractVector, B::AbstractVector, C::AbstractVector, x::Number)
9090
N = length(c)
9191
T = promote_type(eltype(c),eltype(A),eltype(B),eltype(C),typeof(x))
@@ -104,7 +104,7 @@ function clenshaw(c::AbstractVector, A::AbstractVector, B::AbstractVector, C::Ab
104104
end
105105

106106

107-
clenshaw(c::AbstractVector, A::AbstractVector, B::AbstractVector, C::AbstractVector, x::AbstractVector) =
107+
clenshaw(c::AbstractVector, A::AbstractVector, B::AbstractVector, C::AbstractVector, x::AbstractVector) =
108108
clenshaw!(c, A, B, C, copy(x))
109109

110110
###
@@ -157,4 +157,3 @@ function clenshaw(c::AbstractVector, x::Number)
157157
end
158158

159159
clenshaw(c::AbstractVector, x::AbstractVector) = clenshaw!(c, copy(x))
160-

0 commit comments

Comments
 (0)