Skip to content

Commit 6d3c702

Browse files
authored
Merge pull request #112 from wheeheee/jetls_info
Fix (style?) issues flagged by JETLS
2 parents 4230ac7 + c6f3f55 commit 6d3c702

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/algos.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ function fft_composite!(out::AbstractVector{T}, in::AbstractVector{U}, start_out
7171
tmp = g.workspace[idx]
7272

7373
if Rt === BLUESTEIN
74-
R_scratch = prealloc_blue(N2, d, T)
74+
R_bluestein_scratchspace = prealloc_blue(N2, d, T)
7575
end
7676
for j1 in 0:N1-1
7777
wk2 = wj1
7878
R_start_in = start_in + j1 * s_in
7979
R_start_out = 1 + N2 * j1
8080

81-
if Rt === BLUESTEIN
81+
if @isdefined R_bluestein_scratchspace
8282
R_s_in = right.s_in
8383
R_s_out = right.s_out
84-
fft_bluestein!(tmp, in, d, N2, R_start_out, R_s_out, R_start_in, R_s_in, R_scratch)
84+
fft_bluestein!(tmp, in, d, N2, R_start_out, R_s_out, R_start_in, R_s_in, R_bluestein_scratchspace)
8585
else
8686
fft!(tmp, in, R_start_out, R_start_in, d, Rt, g, right_idx)
8787
end
@@ -97,15 +97,15 @@ function fft_composite!(out::AbstractVector{T}, in::AbstractVector{U}, start_out
9797
end
9898

9999
if Lt === BLUESTEIN
100-
L_scratch = prealloc_blue(N1, d, T)
100+
L_bluestein_scratchspace = prealloc_blue(N1, d, T)
101101
end
102102
for k2 in 0:N2-1
103103
L_start_out = start_out + k2 * s_out
104104
L_start_in = 1 + k2
105-
if Lt === BLUESTEIN
105+
if @isdefined L_bluestein_scratchspace
106106
L_s_in = left.s_in
107107
L_s_out = left.s_out
108-
fft_bluestein!(out, tmp, d, N1, L_start_out, L_s_out, L_start_in, L_s_in, L_scratch)
108+
fft_bluestein!(out, tmp, d, N1, L_start_out, L_s_out, L_start_in, L_s_in, L_bluestein_scratchspace)
109109
else
110110
fft!(out, tmp, L_start_out, L_start_in, d, Lt, g, left_idx)
111111
end

src/plan.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ AbstractFFTs.plan_fft(x::AbstractArray{T,N}, region::R; kwargs...) where {T<:Com
5252
AbstractFFTs.plan_bfft(x::AbstractArray{T,N}, region::R; kwargs...) where {T<:Complex,N,R} =
5353
_plan_fft(x, region, FFT_BACKWARD; kwargs...)
5454

55-
function _plan_fft(x::AbstractArray{T,N}, region::R, dir::Direction; BLUESTEIN_CUTOFF=DEFAULT_BLUESTEIN_CUTOFF, kwargs...) where {T<:Complex,N,R}
55+
function _plan_fft(x::AbstractArray{T,N}, region::R, dir::Direction; BLUESTEIN_CUTOFF=DEFAULT_BLUESTEIN_CUTOFF, _kwargs...) where {T<:Complex,N,R}
5656
FFTN = length(region)
5757
if FFTN == 1
5858
R1 = Int(region[])
@@ -74,7 +74,7 @@ function _plan_fft(x::AbstractArray{T,N}, region::R, dir::Direction; BLUESTEIN_C
7474
end
7575
end
7676

77-
function AbstractFFTs.plan_rfft(x::AbstractArray{T,N}, region::R; BLUESTEIN_CUTOFF=DEFAULT_BLUESTEIN_CUTOFF, kwargs...) where {T<:Real,N,R}
77+
function AbstractFFTs.plan_rfft(x::AbstractArray{T,N}, region::R; BLUESTEIN_CUTOFF=DEFAULT_BLUESTEIN_CUTOFF, _kwargs...) where {T<:Real,N,R}
7878
FFTN = length(region)
7979
if FFTN == 1
8080
R1 = Int(region[])
@@ -97,7 +97,7 @@ function AbstractFFTs.plan_rfft(x::AbstractArray{T,N}, region::R; BLUESTEIN_CUTO
9797
end
9898
end
9999

100-
function AbstractFFTs.plan_brfft(x::AbstractArray{T,N}, len, region::R; BLUESTEIN_CUTOFF=DEFAULT_BLUESTEIN_CUTOFF, kwargs...) where {T,N,R}
100+
function AbstractFFTs.plan_brfft(x::AbstractArray{T,N}, len, region::R; BLUESTEIN_CUTOFF=DEFAULT_BLUESTEIN_CUTOFF, _kwargs...) where {T,N,R}
101101
FFTN = length(region)
102102
if FFTN == 1
103103
# For even length problems, we solve the real problem with

0 commit comments

Comments
 (0)