Skip to content

Commit 97b451a

Browse files
staticfloatararslan
authored andcommitted
Upgrade to Julia 1.3+, use JLL package to provide FFTW
This is the first package where I've tried to mix JLL packages with more custom installation procedures, but it seems to more-or-less work.
1 parent b17ecac commit 97b451a

File tree

7 files changed

+16
-93
lines changed

7 files changed

+16
-93
lines changed

.cirrus.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ task:
44
name: FreeBSD
55
env:
66
matrix:
7-
- JULIA_VERSION: 1.0
8-
- JULIA_VERSION: 1.1
7+
- JULIA_VERSION: 1.3
98
- JULIA_VERSION: nightly
109
install_script:
1110
- sh -c "$(fetch https://raw.githubusercontent.com/ararslan/CirrusCI.jl/master/bin/install.sh -o -)"

.drone.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,6 @@ steps:
1212
commands:
1313
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
1414

15-
---
16-
kind: pipeline
17-
name: linux - arm64 - Julia 1.0
18-
19-
platform:
20-
os: linux
21-
arch: arm64
22-
23-
steps:
24-
- name: build
25-
image: julia:1.0
26-
commands:
27-
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
28-
29-
---
30-
kind: pipeline
31-
name: linux - arm64 - Julia 1.2
32-
33-
platform:
34-
os: linux
35-
arch: arm64
36-
37-
steps:
38-
- name: build
39-
image: julia:1.2
40-
commands:
41-
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
42-
4315
---
4416
kind: pipeline
4517
name: linux - arm64 - Julia 1.3

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ os:
44
- linux
55
- osx
66
julia:
7-
- 1.0
8-
- 1.1
7+
- 1.3
98
- nightly
109
env:
1110
matrix:
@@ -24,7 +23,7 @@ after_success:
2423
jobs:
2524
include:
2625
- stage: "Documentation"
27-
julia: 1.0
26+
julia: 1.3
2827
os: linux
2928
script:
3029
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd()));

Project.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@ version = "1.1.0"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
7-
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
87
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
8+
FFTW_jll = "f5851436-0d7a-5f13-b9de-f02708fd171a"
99
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1010
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1111
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1212

1313
[compat]
1414
AbstractFFTs = "0.5"
15-
BinaryProvider = "0.5"
1615
Conda = "1"
1716
Reexport = "0.2"
18-
julia = "1"
17+
julia = "1.3"
1918

2019
[extras]
2120
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
environment:
22
matrix:
3-
- julia_version: 1
4-
- julia_version: 1.1
3+
- julia_version: 1.3
54
- julia_version: nightly
65

76
platform:

deps/build.jl

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ using LinearAlgebra
33
import Libdl
44
const depsfile = joinpath(@__DIR__, "deps.jl")
55

6-
# If BLAS was compiled with MKL and the user wants MKL-based FFTs, we'll oblige.
7-
# In that case, we have to do this little dance to get around having to use BinDeps
8-
# for a library that's already linked to Julia.
96
settings = joinpath(first(DEPOT_PATH), "prefs", "FFTW")
107
mkpath(dirname(settings))
118
if haskey(ENV, "JULIA_FFTW_PROVIDER")
@@ -17,7 +14,9 @@ else
1714
provider = "FFTW"
1815
open(f -> println(f, provider), settings, "w")
1916
end
17+
2018
if provider == "MKL"
19+
# If BLAS was compiled with MKL and the user wants MKL-based FFTs, we'll oblige.
2120
if BLAS.vendor() === :mkl
2221
mklpath = Libdl.dlpath("libmkl_rt")
2322
else
@@ -41,10 +40,15 @@ if provider == "MKL"
4140
end
4241
""")
4342
end
44-
elseif provider != "FFTW"
43+
elseif provider == "FFTW"
44+
open(depsfile, "w") do io
45+
println(io, """
46+
using FFTW_jll
47+
check_deps() = nothing
48+
""")
49+
end
50+
else
4551
error("Unrecognized JULIA_FFTW_PROVIDER \"$provider\".\n",
4652
"To fix this, set ENV[\"JULIA_FFTW_PROVIDER\"] to \"FFTW\" or \"MKL\"\n",
4753
"and rerun Pkg.build(\"FFTW\").")
48-
else
49-
include("build_fftw.jl")
5054
end

deps/build_fftw.jl

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)