Skip to content

Commit 7df1c45

Browse files
committed
using works in 0.7
1 parent 66d3b7a commit 7df1c45

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

src/FastTransforms.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
__precompile__()
22
module FastTransforms
33

4-
using Base, ToeplitzMatrices, HierarchicalMatrices, LowRankApprox, ProgressMeter, Compat
4+
using ToeplitzMatrices, HierarchicalMatrices, LowRankApprox, ProgressMeter, Compat,
5+
FFTW, AbstractFFTs
56

67
import Base: *, \, size, view
78
import Base: getindex, setindex!, Factorization, length
89
import Base.LinAlg: BlasFloat, BlasInt
910
import HierarchicalMatrices: HierarchicalMatrix, unsafe_broadcasttimes!
1011
import HierarchicalMatrices: A_mul_B!, At_mul_B!, Ac_mul_B!
1112
import LowRankApprox: ColPerm
13+
import AbstractFFTs: Plan
14+
import FFTW: r2rFFTWPlan, unsafe_execute!, fftwSingle, fftwDouble, fftwNumber
15+
import FFTW: libfftw, libfftwf, PlanPtr, r2rFFTWPlan
16+
1217

1318
export cjt, icjt, jjt, plan_cjt, plan_icjt
1419
export leg2cheb, cheb2leg, leg2chebu, ultra2ultra, jac2jac

src/SphericalHarmonics/synthesisanalysis.jl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ immutable SynthesisPlan{T, P1, P2}
55
temp::Vector{T}
66
end
77

8-
function plan_synthesis{T<:FFTW.fftwNumber}(A::Matrix{T})
8+
function plan_synthesis{T<:fftwNumber}(A::Matrix{T})
99
m, n = size(A)
1010
x = FFTW.FakeArray(T, m)
1111
y = FFTW.FakeArray(T, n)
@@ -22,7 +22,7 @@ immutable AnalysisPlan{T, P1, P2}
2222
temp::Vector{T}
2323
end
2424

25-
function plan_analysis{T<:FFTW.fftwNumber}(A::Matrix{T})
25+
function plan_analysis{T<:fftwNumber}(A::Matrix{T})
2626
m, n = size(A)
2727
x = FFTW.FakeArray(T, m)
2828
y = FFTW.FakeArray(T, n)
@@ -171,9 +171,6 @@ function negateeven!(x::Vector)
171171
x
172172
end
173173

174-
import Base.FFTW: unsafe_execute!, fftwSingle, fftwDouble, fftwNumber
175-
import Base.FFTW: libfftw, libfftwf, PlanPtr, r2rFFTWPlan
176-
177174
function A_mul_B_col_J!{T}(Y::Matrix{T}, P::r2rFFTWPlan{T}, X::Matrix{T}, J::Int)
178175
unsafe_execute_col_J!(P, X, Y, J)
179176
return Y

src/fftBigFloat.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ Base.dct!{T<:BigFloats}(a::AbstractArray{T}) = (b = dct(a); a[:] = b)
128128
Base.idct!{T<:BigFloats}(a::AbstractArray{T}) = (b = idct(a); a[:] = b)
129129

130130
# dummy plans
131-
type DummyFFTPlan{T,inplace} <: Base.DFT.Plan{T} end
132-
type DummyiFFTPlan{T,inplace} <: Base.DFT.Plan{T} end
133-
type DummyrFFTPlan{T,inplace} <: Base.DFT.Plan{T} end
134-
type DummyirFFTPlan{T,inplace} <: Base.DFT.Plan{T} end
135-
type DummyDCTPlan{T,inplace} <: Base.DFT.Plan{T} end
136-
type DummyiDCTPlan{T,inplace} <: Base.DFT.Plan{T} end
131+
type DummyFFTPlan{T,inplace} <: Plan{T} end
132+
type DummyiFFTPlan{T,inplace} <: Plan{T} end
133+
type DummyrFFTPlan{T,inplace} <: Plan{T} end
134+
type DummyirFFTPlan{T,inplace} <: Plan{T} end
135+
type DummyDCTPlan{T,inplace} <: Plan{T} end
136+
type DummyiDCTPlan{T,inplace} <: Plan{T} end
137137

138138
for (Plan,iPlan) in ((:DummyFFTPlan,:DummyiFFTPlan),
139139
(:DummyrFFTPlan,:DummyirFFTPlan),

src/inufft.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pre-computes an inverse nonuniform fast Fourier transform of type `N`.
33
44
For best performance, choose the right number of threads by `FFTW.set_num_threads(4)`, for example.
55
"""
6-
immutable iNUFFTPlan{N,T,S,PT} <: Base.DFT.Plan{T}
6+
immutable iNUFFTPlan{N,T,S,PT} <: Plan{T}
77
pt::PT
88
TP::Toeplitz{T}
99
r::Vector{T}

src/nufft.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pre-computes a nonuniform fast Fourier transform of type `N`.
33
44
For best performance, choose the right number of threads by `FFTW.set_num_threads(4)`, for example.
55
"""
6-
immutable NUFFTPlan{N,T,FFT} <: Base.DFT.Plan{T}
6+
immutable NUFFTPlan{N,T,FFT} <: Plan{T}
77
U::Matrix{T}
88
V::Matrix{T}
99
p::FFT
@@ -234,7 +234,7 @@ Pre-computes a 2D nonuniform fast Fourier transform.
234234
235235
For best performance, choose the right number of threads by `FFTW.set_num_threads(4)`, for example.
236236
"""
237-
immutable NUFFT2DPlan{T,P1,P2} <: Base.DFT.Plan{T}
237+
immutable NUFFT2DPlan{T,P1,P2} <: Plan{T}
238238
p1::P1
239239
p2::P2
240240
temp::Vector{T}

0 commit comments

Comments
 (0)