Skip to content

Commit 485faec

Browse files
committed
Move NFFTOp to trigger on AbstractNFFTs instead
1 parent 03c63b3 commit 485faec

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Project.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ julia = "1.9"
2424
GPUArrays = "11"
2525
KernelAbstractions = "0.9"
2626
JLArrays = "0.2"
27-
NFFT = "0.13"
27+
AbstractNFFTs = "0.9"
2828
LinearOperators = "2"
2929
RadonKA = "0.6"
3030
Wavelets = "0.9, 0.10"
3131
Reexport = "1.0"
3232
FFTW = "1.0"
3333

3434
[weakdeps]
35+
AbstractNFFTs = "7f219486-4aa7-41d6-80a7-e08ef20ceed7"
3536
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
3637
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
3738
NFFT = "efe261a4-0d2b-5849-be55-fc731d526b0d"
@@ -43,7 +44,7 @@ RadonKA = "86de8297-835b-47df-b249-c04e8db91db5"
4344
test = ["Test", "FFTW", "Wavelets", "NFFT", "JLArrays", "RadonKA"]
4445

4546
[extensions]
46-
LinearOperatorNFFTExt = ["NFFT", "FFTW"]
47+
LinearOperatorNFFTExt = ["AbstractNFFTs", "FFTW"]
4748
LinearOperatorFFTWExt = "FFTW"
4849
LinearOperatorWaveletExt = "Wavelets"
4950
LinearOperatorGPUArraysExt = "GPUArrays"

ext/LinearOperatorNFFTExt/LinearOperatorNFFTExt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module LinearOperatorNFFTExt
22

3-
using LinearOperatorCollection, NFFT, NFFT.AbstractNFFTs, FFTW, FFTW.AbstractFFTs
3+
using LinearOperatorCollection, AbstractNFFTs, FFTW, FFTW.AbstractFFTs
44

55
include("NFFTOp.jl")
66

ext/LinearOperatorNFFTExt/NFFTOp.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ LinearOperators.storage_type(op::NFFTOpImpl) = typeof(op.Mv5)
4141
function NFFTOpImpl(shape::Tuple, tr::AbstractMatrix{T}; toeplitz=false, oversamplingFactor=1.25, kernelSize=3, S = Vector{Complex{T}}, kargs...) where {T}
4242

4343
baseArrayType = Base.typename(S).wrapper # https://github.com/JuliaLang/julia/issues/35543
44-
plan = plan_nfft(baseArrayType, tr, shape, m=kernelSize, σ=oversamplingFactor, precompute=NFFT.TENSOR,
44+
plan = plan_nfft(baseArrayType, tr, shape, m=kernelSize, σ=oversamplingFactor, # precompute=AbstractNFFTs.TENSOR,
4545
fftflags=FFTW.ESTIMATE, blocking=true)
4646

4747
return NFFTOpImpl{eltype(S), S, typeof(plan)}(size(tr,2), prod(shape), false, false

0 commit comments

Comments
 (0)