Skip to content

Commit 52ef87c

Browse files
authored
Merge pull request #13 from dannys4/ds/dev
New and improved!
2 parents 9238a79 + 3e59cd3 commit 52ef87c

File tree

9 files changed

+175
-246
lines changed

9 files changed

+175
-246
lines changed

src/FFTA.jl

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ include("algos.jl")
1010
function fft(x::AbstractVector{T}) where {T}
1111
y = similar(x)
1212
g = CallGraph{T}(length(x))
13-
fft!(y, x, Val(FFT_FORWARD), g[1].type, g, 1)
13+
fft!(y, x, 1, 1, FFT_FORWARD(), g[1].type, g, 1)
1414
y
1515
end
1616

1717
function fft(x::AbstractVector{T}) where {T <: Real}
1818
y = similar(x, Complex{T})
1919
g = CallGraph{Complex{T}}(length(x))
20-
fft!(y, x, Val(FFT_FORWARD), g[1].type, g, 1)
20+
fft!(y, x, 1, 1, FFT_FORWARD(), g[1].type, g, 1)
2121
y
2222
end
2323

@@ -29,19 +29,26 @@ function fft(x::AbstractMatrix{T}) where {T}
2929
g2 = CallGraph{T}(size(x,2))
3030

3131
for k in 1:N
32-
@views fft!(y1[:,k], x[:,k], Val(FFT_FORWARD), g1[1].type, g1, 1)
32+
@views fft!(y1[:,k], x[:,k], 1, 1, FFT_FORWARD(), g1[1].type, g1, 1)
3333
end
3434

3535
for k in 1:M
36-
@views fft!(y2[k,:], y1[k,:], Val(FFT_FORWARD), g2[1].type, g2, 1)
36+
@views fft!(y2[k,:], y1[k,:], 1, 1, FFT_FORWARD(), g2[1].type, g2, 1)
3737
end
3838
y2
3939
end
4040

4141
function bfft(x::AbstractVector{T}) where {T}
4242
y = similar(x)
4343
g = CallGraph{T}(length(x))
44-
fft!(y, x, Val(FFT_BACKWARD), g[1].type, g, 1)
44+
fft!(y, x, 1, 1, FFT_BACKWARD(), g[1].type, g, 1)
45+
y
46+
end
47+
48+
function bfft(x::AbstractVector{T}) where {T <: Real}
49+
y = similar(x, Complex{T})
50+
g = CallGraph{Complex{T}}(length(x))
51+
fft!(y, x, 1, 1, FFT_BACKWARD(), g[1].type, g, 1)
4552
y
4653
end
4754

@@ -53,11 +60,11 @@ function bfft(x::AbstractMatrix{T}) where {T}
5360
g2 = CallGraph{T}(size(x,2))
5461

5562
for k in 1:N
56-
@views fft!(y1[:,k], x[:,k], Val(FFT_BACKWARD), g1[1].type, g1, 1)
63+
@views fft!(y1[:,k], x[:,k], 1, 1, FFT_BACKWARD(), g1[1].type, g1, 1)
5764
end
5865

5966
for k in 1:M
60-
@views fft!(y2[k,:], y1[k,:], Val(FFT_BACKWARD), g2[1].type, g2, 1)
67+
@views fft!(y2[k,:], y1[k,:], 1, 1, FFT_BACKWARD(), g2[1].type, g2, 1)
6168
end
6269
y2
6370
end

0 commit comments

Comments
 (0)