-
Notifications
You must be signed in to change notification settings - Fork 27
Extend FTPlans to Arrays and higher dimensions #252
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 4 commits
04556c5
16b6f43
87b1924
e0dd9d6
5bdb5e2
b17e76d
1fd17ca
9aca321
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
struct ArrayPlan{T, FF<:FTPlan{<:T}, Szs<:Tuple, Dims<:Tuple{<:Int}} <: Plan{T} | ||
F::FF | ||
szs::Szs | ||
dims::Dims | ||
end | ||
size(P::ArrayPlan) = P.szs | ||
size(P::ArrayPlan, k::Int) = P.szs[k] | ||
size(P::ArrayPlan, k...) = P.szs[[k...]] | ||
|
||
function ArrayPlan(F::FTPlan{<:T}, c::AbstractArray{T}, dims::Tuple{<:Int}=(1,)) where T | ||
szs = size(c) | ||
@assert F.n == szs[dims[1]] | ||
ArrayPlan(F, size(c), dims) | ||
end | ||
|
||
function inv_perm(d::Vector{<:Int}) | ||
inv_d = Vector{Int}(undef, length(d)) | ||
for (i, val) in enumerate(d) | ||
inv_d[val] = i | ||
end | ||
return inv_d | ||
end | ||
inv_perm(d::Tuple) = inv_perm([d...]) | ||
|
||
function *(P::ArrayPlan, f::AbstractArray) | ||
F, dims, szs = P.F, P.dims, P.szs | ||
@assert length(dims) == 1 | ||
@assert szs == size(f) | ||
d = first(dims) | ||
|
||
perm = [d; setdiff(1:ndims(f), d)] | ||
jishnub marked this conversation as resolved.
Show resolved
Hide resolved
|
||
fp = permutedims(f, perm) | ||
|
||
fr = reshape(fp, size(fp,1), :) | ||
|
||
permutedims(reshape(F*fr, size(fp)...), inv_perm(perm)) | ||
end | ||
|
||
function \(P::ArrayPlan, f::AbstractArray) | ||
F, dims, szs = P.F, P.dims, P.szs | ||
@assert length(dims) == 1 | ||
@assert szs == size(f) | ||
d = first(dims) | ||
|
||
perm = [d; setdiff(1:ndims(f), d)] | ||
jishnub marked this conversation as resolved.
Show resolved
Hide resolved
|
||
fp = permutedims(f, perm) | ||
|
||
fr = reshape(fp, size(fp,1), :) | ||
|
||
permutedims(reshape(F\fr, size(fp)...), inv_perm(perm)) | ||
end | ||
|
||
struct NDimsPlan{T, FF<:ArrayPlan{<:T}, Szs<:Tuple, Dims<:Tuple} <: Plan{T} | ||
F::FF | ||
szs::Szs | ||
dims::Dims | ||
function NDimsPlan(F, szs, dims) | ||
if length(Set(szs[[dims...]])) > 1 | ||
error("Different size in dims axes not yet implemented in N-dimensional transform.") | ||
end | ||
new{eltype(F), typeof(F), typeof(szs), typeof(dims)}(F, szs, dims) | ||
end | ||
end | ||
|
||
size(P::NDimsPlan) = P.szs | ||
size(P::NDimsPlan, k::Int) = P.szs[k] | ||
size(P::NDimsPlan, k...) = P.szs[[k...]] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why the array construction in the indexing? Shouldn't this just be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've probably misunderstood what e.g.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps I've misunderstood this. Are you trying to obtain multiple indices in one go? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's the intention! Although I don't need that functionality in this PR. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps best to remove it then, as it's not the conventional usage of There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note sizes of plans and arrays behave differently compare w FFT There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. judging by this line here https://github.com/JuliaMath/FFTW.jl/blob/f888022d7a1ff78491abf8f33f1055cc52a68f0a/src/fft.jl#L254 I think I should only really keep There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ...or maybe I should keep |
||
|
||
function NDimsPlan(F::FTPlan, szs::Tuple, dims::Tuple) | ||
NDimsPlan(ArrayPlan(F, szs, (first(dims),)), szs, dims) | ||
end | ||
|
||
function *(P::NDimsPlan, f::AbstractArray) | ||
F, dims = P.F, P.dims | ||
@assert size(P) == size(f) | ||
g = copy(f) | ||
t = 1:ndims(g) | ||
d1 = dims[1] | ||
for d in dims | ||
perm = ntuple(k -> k == d1 ? t[d] : k == d ? t[d1] : t[k], ndims(g)) | ||
gp = permutedims(g, perm) | ||
g = permutedims(F*gp, inv_perm(perm)) | ||
end | ||
return g | ||
end | ||
|
||
function \(P::NDimsPlan, f::AbstractArray) | ||
F, dims = P.F, P.dims | ||
@assert size(P) == size(f) | ||
g = copy(f) | ||
t = 1:ndims(g) | ||
d1 = dims[1] | ||
for d in dims | ||
perm = ntuple(k -> k == d1 ? t[d] : k == d ? t[d1] : t[k], ndims(g)) | ||
gp = permutedims(g, perm) | ||
g = permutedims(F\gp, inv_perm(perm)) | ||
end | ||
return g | ||
end |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
using FastTransforms, Test | ||
import FastTransforms: ArrayPlan, NDimsPlan | ||
|
||
@testset "Array transform" begin | ||
@testset "ArrayPlan" begin | ||
c = randn(5,20,10) | ||
F = plan_cheb2leg(c) | ||
FT = ArrayPlan(F, c) | ||
|
||
@test size(FT) == size(c) | ||
@test size(FT,1) == size(c,1) | ||
@test size(FT,1,2) == (size(c,1), size(c,2)) | ||
|
||
f = similar(c); | ||
for k in axes(c,3) | ||
f[:,:,k] = (F*c[:,:,k]) | ||
end | ||
@test f ≈ FT*c | ||
@test c ≈ FT\f | ||
|
||
F = plan_cheb2leg(Vector{Float64}(axes(c,2))) | ||
FT = ArrayPlan(F, c, (2,)) | ||
for k in axes(c,3) | ||
f[:,:,k] = (F*c[:,:,k]')' | ||
end | ||
@test f ≈ FT*c | ||
@test c ≈ FT\f | ||
end | ||
|
||
@testset "NDimsPlan" begin | ||
c = randn(20,10,20) | ||
@test_throws ErrorException("Different size in dims axes not yet implemented in N-dimensional transform.") NDimsPlan(ArrayPlan(plan_cheb2leg(c), c), size(c), (1,2)) | ||
|
||
c = randn(5,20) | ||
F = plan_cheb2leg(c) | ||
FT = ArrayPlan(F, c) | ||
P = NDimsPlan(F, size(c), (1,)) | ||
@test F*c ≈ FT*c ≈ P*c | ||
|
||
c = randn(20,20,5); | ||
F = plan_cheb2leg(c) | ||
FT = ArrayPlan(F, c) | ||
P = NDimsPlan(FT, size(c), (1,2)) | ||
|
||
@test size(P) == size(c) | ||
@test size(P,1) == size(c,1) | ||
@test size(P,1,2) == (size(c,1), size(c,2)) | ||
|
||
f = similar(c); | ||
for k in axes(f,3) | ||
f[:,:,k] = (F*(F*c[:,:,k])')' | ||
end | ||
@test f ≈ P*c | ||
@test c ≈ P\f | ||
|
||
c = randn(5,10,10,60) | ||
F = plan_cheb2leg(randn(10)) | ||
P = NDimsPlan(F, size(c), (2,3)) | ||
f = similar(c) | ||
for i in axes(f,1), j in axes(f,4) | ||
f[i,:,:,j] = (F*(F*c[i,:,:,j])')' | ||
end | ||
@test f ≈ P*c | ||
@test c ≈ P\f | ||
end | ||
end | ||
|
||
|
Uh oh!
There was an error while loading. Please reload this page.