Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Make IdentityPlan! subtype AbstractCustomPlan #46

Merged
merged 2 commits into from
May 7, 2022
Merged

Make IdentityPlan! subtype AbstractCustomPlan #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9deebbc
Make IdentityPlan! subtype AbstractCustomPlan
glwagner May 7, 2022
9cc0a64
Add `NoTransform!` tests
jipolanco May 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Transforms/no_transform.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Base.:\(::IdentityPlan, x) = copy(x)

Type of plan associated to [`NoTransform!`](@ref).
"""
struct IdentityPlan! end
struct IdentityPlan! <: AbstractCustomPlan end

function LinearAlgebra.mul!(y, ::IdentityPlan!, x)
if x !== y
Expand Down
59 changes: 35 additions & 24 deletions test/transforms.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ using Random
using Test
using TimerOutputs

include("include/MPITools.jl")
using .MPITools

const DATA_DIMS = (16, 12, 6)

const FAST_TESTS = !("--all" in ARGS)
Expand Down Expand Up @@ -147,8 +144,10 @@ function test_transform_types(size_in)
nothing
end

function test_inplace(::Type{T}, comm, proc_dims, size_in;
extra_dims=()) where {T}
function test_inplace_fft(
::Type{T}, comm, proc_dims, size_in;
extra_dims=(),
) where {T}
transforms = Transforms.FFT!() # in-place c2c FFT
plan = PencilFFTPlan(size_in, transforms, proc_dims, comm, T;
extra_dims=extra_dims)
Expand Down Expand Up @@ -351,7 +350,8 @@ function test_transforms(::Type{T}, comm, proc_dims, size_in;
end

function test_pencil_plans(size_in::Tuple, pdims::Tuple, comm)
@assert length(size_in) >= 3
N = length(size_in)
@assert N >= 3

@inferred PencilFFTPlan(size_in, Transforms.RFFT(), pdims, comm, Float64)

Expand Down Expand Up @@ -390,10 +390,25 @@ function test_pencil_plans(size_in::Tuple, pdims::Tuple, comm)
end

for T in types, edims in extra_dims
test_inplace(T, comm, pdims, size_in, extra_dims=edims)
test_inplace_fft(T, comm, pdims, size_in, extra_dims=edims)
test_transforms(T, comm, pdims, size_in, extra_dims=edims)
end

@testset "FFT! + NoTransform!" begin
transforms = (
ntuple(_ -> Transforms.FFT!(), N - 1)...,
Transforms.NoTransform!(),
)
transforms_oop = (
ntuple(_ -> Transforms.FFT(), N - 1)...,
Transforms.NoTransform(),
)
plan = PencilFFTPlan(size_in, transforms, pdims, comm)
plan_oop = PencilFFTPlan(size_in, transforms_oop, pdims, comm)
fftw_planner(x) = FFTW.plan_fft!(x, 1:(N - 1))
test_transform(plan, fftw_planner, plan_oop)
end

nothing
end

Expand Down Expand Up @@ -502,25 +517,21 @@ function make_pdims(::Val{M}, Nproc) where {M}
ntuple(d -> pdims[d], Val(M))
end

function main()
size_in = DATA_DIMS
comm = MPI.COMM_WORLD
Nproc = MPI.Comm_size(comm)
silence_stdout(comm)
MPI.Init()

test_transform_types(size_in)
test_incompatibility(comm)
test_dimensionality(comm)
size_in = DATA_DIMS
comm = MPI.COMM_WORLD
Nproc = MPI.Comm_size(comm)
rank = MPI.Comm_rank(comm)
rank == 0 || redirect_stdout(devnull)

pdims_1d = (Nproc, ) # 1D ("slab") decomposition
pdims_2d = make_pdims(Val(2), Nproc)
test_transform_types(size_in)
test_incompatibility(comm)
test_dimensionality(comm)

for p in (pdims_1d, pdims_2d)
test_pencil_plans(size_in, p, comm)
end
pdims_1d = (Nproc, ) # 1D ("slab") decomposition
pdims_2d = make_pdims(Val(2), Nproc)

nothing
for p in (pdims_1d, pdims_2d)
test_pencil_plans(size_in, p, comm)
end

MPI.Initialized() || MPI.Init()
main()