FFTW and Memoization compat to fix tests

marius311 · Apr 22, 2021 · 6d18650 · 6d18650
1 parent 5866269
commit 6d18650
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -56,7 +56,7 @@ Adapt = "1.0.1, 2, 3"
 CUDA = "2.1"
 Combinatorics = "1"
 DataStructures = "0.17.9, 0.18"
-FFTW = "1.2"
+FFTW = "1.2 - 1.3"
 FileIO = "1.2.2"
 Formatting = "0.4"
 ImageFiltering = "0.6.14"
@@ -70,7 +70,7 @@ Loess = "0.5"
 MacroTools = "0.5"
 Match = "1.1"
 Measurements = "2"
-Memoization = "0.1.4"
+Memoization = "0.1.8"
 NamedTupleTools = "0.13"
 OptimKit = "0.3.1"
 ProgressMeter = "1.2"

diff --git a/src/util_fft.jl b/src/util_fft.jl
@@ -29,7 +29,7 @@ m_irfft!(dst, arr::AbstractArray{Complex{T},N}, dims) where {T,N} = ldiv!(dst, m
 end
 # FFTW (but not MKL) destroys the input array for inplace inverse real
 # FFTs, so we need a copy. see https://github.com/JuliaMath/FFTW.jl/issues/158
-copy_if_fftw(x) = FFTW.fftw_provider==:fftw ? copy(x) : x
+copy_if_fftw(x) = FFTW.fftw_vendor==:fftw ? copy(x) : x
 
 
 """

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -39,7 +39,7 @@ Nsides_big = [(128,128), (64,128), (128,64)]
 
 Random.seed!(1)
 
-has_batched_fft = (FFTW.fftw_provider != :mkl) || (storage != Array)
+has_batched_fft = (FFTW.fftw_vendor != :mkl) || (storage != Array)
 
 ##
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ Nsides_big = [(128,128), (64,128), (128,64)] @@
     Random.seed!(1)
-    has_batched_fft = (FFTW.fftw_provider != :mkl) || (storage != Array)
+    has_batched_fft = (FFTW.fftw_vendor != :mkl) || (storage != Array)
     ##
@@ Expand Down @@