Skip to content

Require Julia v1.10 (LTS) #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Require Julia v1.10 (LTS) #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7f7350b
Require Julia v1.10 (LTS)
dlfivefifty Dec 17, 2024
64dbdd8
Update .github/workflows/CI.yml
dlfivefifty May 27, 2025
8a2fb50
Merge branch 'master' into Julia-v1.10
dlfivefifty May 27, 2025
8db2260
Merge branch 'master' into Julia-v1.10
stevengj Aug 12, 2025
0cede8e
Remove unnecessary `VERSION` checks
devmotion Aug 12, 2025
bb9b987
Clean GHA workflow
devmotion Aug 12, 2025
1db4402
Remove workaround for Preferences in Julia 1.6
devmotion Aug 12, 2025
c3e8f02
Update Cirrus config
devmotion Aug 12, 2025
6ec29e9
Add test dependencies
devmotion Aug 12, 2025
5d7f0de
Add missing dependencies
devmotion Aug 12, 2025
23804f7
Fix CI?
devmotion Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ task:
image_family: freebsd-13-1
env:
matrix:
- JULIA_VERSION: 1.6
- JULIA_VERSION: 1.10.0
- JULIA_VERSION: 1
- JULIA_VERSION: nightly
- name: Linux ARMv8
arm_container:
image: ubuntu:latest
env:
matrix:
- JULIA_VERSION: 1.6
- JULIA_VERSION: 1.10.0
- JULIA_VERSION: 1
- JULIA_VERSION: nightly
- name: musl Linux
container:
image: alpine:3.14
env:
matrix:
- JULIA_VERSION: 1.6
- JULIA_VERSION: 1.10.0
- JULIA_VERSION: 1
- JULIA_VERSION: nightly
- name: MacOS M1
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-base:latest
env:
matrix:
# - JULIA_VERSION: 1.6 # not available
- JULIA_VERSION: 1.10.0
- JULIA_VERSION: 1
- JULIA_VERSION: nightly

Expand Down
2 changes: 1 addition & 1 deletion .github/set_ci_preferences.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env julia

open(joinpath(dirname(@__DIR__), "test", "Project.toml"), "a") do io
open(joinpath(dirname(@__DIR__), "Project.toml"), "a") do io
println(io, """
[preferences.FFTW]
provider = "$(ARGS[1])"
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- 'fftw'
- 'mkl'
version:
- '1.6'
- 'min'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't realize we could do this. So this automatically tests on the minimum-supported version from Project.toml?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes 👍

- '1'
- 'nightly'
os:
Expand Down Expand Up @@ -60,15 +60,10 @@ jobs:
arch: x86
- os: macOS-13
arch: aarch64
- os: macOS-13
version: '1.6'
provider: 'mkl'
- os: macOS-latest
arch: x86
- os: macOS-latest
arch: x64
- os: macOS-latest
version: '1.6'
- os: macOS-latest
provider: 'mkl'

Expand Down
15 changes: 12 additions & 3 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "FFTW"
uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
version = "1.9.0"
version = "1.10.0-dev"

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

[compat]
AbstractFFTs = "1.5"
Aqua = "0.8"
FFTW_jll = "3.3.9"
LinearAlgebra = "<0.0.1, 1"
LinearAlgebra = "1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is https://discourse.julialang.org/t/psa-compat-requirements-in-the-general-registry-are-changing/104958#update-november-9th-2023-2 still the recommended approach? Then this should be changed back to

Suggested change
LinearAlgebra = "1"
LinearAlgebra = "<0.0.1, 1"

MKL_jll = "2019.0.117, 2020, 2021, 2022, 2023, 2024, 2025"
Preferences = "1.2"
Reexport = "0.2, 1.0"
julia = "1.6"
Test = "<0.0.1, 1"
julia = "1.10"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Aqua", "Test"]
7 changes: 1 addition & 6 deletions src/fft.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,7 @@ function destroy_deferred()
# we'll do nothing (the other function will eventually run destroy_deferred).
if !isempty(deferred_destroy_plans) && trylock(fftwlock)
try
@static if Base.VERSION >= v"1.9"
@inline foreach(unsafe_destroy_plan, deferred_destroy_plans)
else
# call-site @inline isn't supported on old versions of Julia
foreach(unsafe_destroy_plan, deferred_destroy_plans)
end
@inline foreach(unsafe_destroy_plan, deferred_destroy_plans)
empty!(deferred_destroy_plans)
finally
unlock(fftwlock)
Expand Down
13 changes: 0 additions & 13 deletions test/Project.toml
View file
Open in desktop

This file was deleted.

22 changes: 1 addition & 21 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,7 @@ end
@inferred rfft(x)

if ndims(x) == 2
if VERSION >= v"1.6.7"
@inferred brfft(x,18)
else
# See Julia issue #23063
@test_broken @inferred brfft(x,18)
end
@inferred brfft(x,18)
end

@inferred brfft(y,10)
Expand All @@ -382,21 +377,6 @@ end
end
for f in (plan_bfft, plan_fft, plan_ifft,
plan_rfft, fft, bfft, fft_, ifft)
# More of #23063 (why does plan_rfft work and the others don't)?
if ndims(x) == 2 && f != plan_rfft
if VERSION >= v"1.6.7"
@inferred f(x)
if isa(f, Plan)
@inferred plan_inv(f(x))
end
else
@test_broken @inferred f(x)
if isa(f, Plan)
@test_broken @inferred plan_inv(f(x))
end
continue
end
end
p = @inferred f(x)
if isa(p, Plan)
@inferred plan_inv(p)
Expand Down
Loading