Merge branch 'master' into jn/lazylib_support

Author: vtjnash

.cirrus.yml

@@ -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
 

.github/set_ci_preferences.jl

@@ -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])"

.github/workflows/CI.yml

@@ -27,7 +27,7 @@ jobs:
           - 'fftw'
           - 'mkl'
         version:
-          - '1.6'
+          - 'min'
           - '1'
           - 'nightly'
         os:
@@ -60,20 +60,15 @@ 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'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
@@ -96,7 +91,7 @@ jobs:
   Documentation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: julia-actions/setup-julia@latest
         with:
           version: 1

.github/workflows/Invalidations.yml

@@ -19,12 +19,12 @@ jobs:
     - uses: julia-actions/setup-julia@v2
       with:
         version: '1'
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: julia-actions/julia-buildpkg@v1
     - uses: julia-actions/julia-invalidations@v1
       id: invs_pr
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ github.event.repository.default_branch }}
     - uses: julia-actions/julia-buildpkg@v1

Project.toml

@@ -13,10 +13,19 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 AbstractFFTs = "1.5"
+Aqua = "0.8"
 FFTW_jll = "3.3.9"
 Libdl = "1.6"
-LinearAlgebra = "<0.0.1, 1"
+LinearAlgebra = "1"
 MKL_jll = "2019.0.117, 2020, 2021, 2022, 2023, 2024, 2025"
 Preferences = "1.2"
 Reexport = "0.2, 1.0"
-julia = "1.6"
+Test = "1"
+julia = "1.10"
+
+[extras]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Aqua", "Test"]

src/fft.jl

@@ -338,12 +338,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)

test/Project.toml

@@ -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)
@@ -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)