Skip to content

Commit 6d18650

Browse files
committed
FFTW and Memoization compat to fix tests
1 parent 5866269 commit 6d18650

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Adapt = "1.0.1, 2, 3"
5656
CUDA = "2.1"
5757
Combinatorics = "1"
5858
DataStructures = "0.17.9, 0.18"
59-
FFTW = "1.2"
59+
FFTW = "1.2 - 1.3"
6060
FileIO = "1.2.2"
6161
Formatting = "0.4"
6262
ImageFiltering = "0.6.14"
@@ -70,7 +70,7 @@ Loess = "0.5"
7070
MacroTools = "0.5"
7171
Match = "1.1"
7272
Measurements = "2"
73-
Memoization = "0.1.4"
73+
Memoization = "0.1.8"
7474
NamedTupleTools = "0.13"
7575
OptimKit = "0.3.1"
7676
ProgressMeter = "1.2"

src/util_fft.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ m_irfft!(dst, arr::AbstractArray{Complex{T},N}, dims) where {T,N} = ldiv!(dst, m
2929
end
3030
# FFTW (but not MKL) destroys the input array for inplace inverse real
3131
# FFTs, so we need a copy. see https://github.com/JuliaMath/FFTW.jl/issues/158
32-
copy_if_fftw(x) = FFTW.fftw_provider==:fftw ? copy(x) : x
32+
copy_if_fftw(x) = FFTW.fftw_vendor==:fftw ? copy(x) : x
3333

3434

3535
"""

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Nsides_big = [(128,128), (64,128), (128,64)]
3939

4040
Random.seed!(1)
4141

42-
has_batched_fft = (FFTW.fftw_provider != :mkl) || (storage != Array)
42+
has_batched_fft = (FFTW.fftw_vendor != :mkl) || (storage != Array)
4343

4444
##
4545

0 commit comments

Comments
 (0)