Skip to content

Commit 57d77fb

Browse files
dlfivefiftygiordanostevengjdevmotion
authored
Require Julia v1.10 (LTS) (#312)
The motivation for this change is to allow adding extensions without adding unnecessary dependencies for users on pre-v1.10. In particular, this makes it easier to finish #311 and #318. See also JuliaMath/AbstractFFTs.jl#140 Co-authored-by: Mosè Giordano <765740+giordano@users.noreply.github.com> Co-authored-by: Steven G. Johnson <stevenj@mit.edu> Co-authored-by: David Widmann <devmotion@users.noreply.github.com>
1 parent 7b20cb5 commit 57d77fb

File tree

7 files changed

+20
-54
lines changed

7 files changed

+20
-54
lines changed

.cirrus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@ task:
66
image_family: freebsd-13-1
77
env:
88
matrix:
9-
- JULIA_VERSION: 1.6
9+
- JULIA_VERSION: 1.10.0
1010
- JULIA_VERSION: 1
1111
- JULIA_VERSION: nightly
1212
- name: Linux ARMv8
1313
arm_container:
1414
image: ubuntu:latest
1515
env:
1616
matrix:
17-
- JULIA_VERSION: 1.6
17+
- JULIA_VERSION: 1.10.0
1818
- JULIA_VERSION: 1
1919
- JULIA_VERSION: nightly
2020
- name: musl Linux
2121
container:
2222
image: alpine:3.14
2323
env:
2424
matrix:
25-
- JULIA_VERSION: 1.6
25+
- JULIA_VERSION: 1.10.0
2626
- JULIA_VERSION: 1
2727
- JULIA_VERSION: nightly
2828
- name: MacOS M1
2929
macos_instance:
3030
image: ghcr.io/cirruslabs/macos-monterey-base:latest
3131
env:
3232
matrix:
33-
# - JULIA_VERSION: 1.6 # not available
33+
- JULIA_VERSION: 1.10.0
3434
- JULIA_VERSION: 1
3535
- JULIA_VERSION: nightly
3636

.github/set_ci_preferences.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env julia
22

3-
open(joinpath(dirname(@__DIR__), "test", "Project.toml"), "a") do io
3+
open(joinpath(dirname(@__DIR__), "Project.toml"), "a") do io
44
println(io, """
55
[preferences.FFTW]
66
provider = "$(ARGS[1])"

.github/workflows/CI.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- 'fftw'
2828
- 'mkl'
2929
version:
30-
- '1.6'
30+
- 'min'
3131
- '1'
3232
- 'nightly'
3333
os:
@@ -60,15 +60,10 @@ jobs:
6060
arch: x86
6161
- os: macOS-13
6262
arch: aarch64
63-
- os: macOS-13
64-
version: '1.6'
65-
provider: 'mkl'
6663
- os: macOS-latest
6764
arch: x86
6865
- os: macOS-latest
6966
arch: x64
70-
- os: macOS-latest
71-
version: '1.6'
7267
- os: macOS-latest
7368
provider: 'mkl'
7469

Project.toml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "FFTW"
22
uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
3-
version = "1.9.0"
3+
version = "1.10.0-dev"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -12,9 +12,18 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1212

1313
[compat]
1414
AbstractFFTs = "1.5"
15+
Aqua = "0.8"
1516
FFTW_jll = "3.3.9"
16-
LinearAlgebra = "<0.0.1, 1"
17+
LinearAlgebra = "1"
1718
MKL_jll = "2019.0.117, 2020, 2021, 2022, 2023, 2024, 2025"
1819
Preferences = "1.2"
1920
Reexport = "0.2, 1.0"
20-
julia = "1.6"
21+
Test = "<0.0.1, 1"
22+
julia = "1.10"
23+
24+
[extras]
25+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
26+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
27+
28+
[targets]
29+
test = ["Aqua", "Test"]

src/fft.jl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,7 @@ function destroy_deferred()
335335
# we'll do nothing (the other function will eventually run destroy_deferred).
336336
if !isempty(deferred_destroy_plans) && trylock(fftwlock)
337337
try
338-
@static if Base.VERSION >= v"1.9"
339-
@inline foreach(unsafe_destroy_plan, deferred_destroy_plans)
340-
else
341-
# call-site @inline isn't supported on old versions of Julia
342-
foreach(unsafe_destroy_plan, deferred_destroy_plans)
343-
end
338+
@inline foreach(unsafe_destroy_plan, deferred_destroy_plans)
344339
empty!(deferred_destroy_plans)
345340
finally
346341
unlock(fftwlock)

test/Project.toml

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

test/runtests.jl

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,7 @@ end
363363
@inferred rfft(x)
364364

365365
if ndims(x) == 2
366-
if VERSION >= v"1.6.7"
367-
@inferred brfft(x,18)
368-
else
369-
# See Julia issue #23063
370-
@test_broken @inferred brfft(x,18)
371-
end
366+
@inferred brfft(x,18)
372367
end
373368

374369
@inferred brfft(y,10)
@@ -382,21 +377,6 @@ end
382377
end
383378
for f in (plan_bfft, plan_fft, plan_ifft,
384379
plan_rfft, fft, bfft, fft_, ifft)
385-
# More of #23063 (why does plan_rfft work and the others don't)?
386-
if ndims(x) == 2 && f != plan_rfft
387-
if VERSION >= v"1.6.7"
388-
@inferred f(x)
389-
if isa(f, Plan)
390-
@inferred plan_inv(f(x))
391-
end
392-
else
393-
@test_broken @inferred f(x)
394-
if isa(f, Plan)
395-
@test_broken @inferred plan_inv(f(x))
396-
end
397-
continue
398-
end
399-
end
400380
p = @inferred f(x)
401381
if isa(p, Plan)
402382
@inferred plan_inv(p)

0 commit comments

Comments
 (0)