Skip to content

WIP: 2don2d #6

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.

Sign up for GitHub

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

Merged
rainwoodman merged 15 commits into from
May 25, 2018
Merged

WIP: 2don2d #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d7c921d
Use the version of pfft that has 2don2d..
rainwoodman May 9, 2018
14a38d9
allow creating 2don2d partitions.
rainwoodman May 9, 2018
7af8d16
Add test cases for 2don2d.
rainwoodman May 9, 2018
a796339
Allow inputs of variable number of dimensions in roundtrip.py
rainwoodman May 9, 2018
7fcbf26
modernize the roundtrip test.
rainwoodman May 9, 2018
402f1e9
install the roundtrip script.
rainwoodman May 9, 2018
5aac5df
If there are failures, return 1.
rainwoodman May 9, 2018
3deea57
support shorter constants without PFFT prefix.
rainwoodman May 9, 2018
ef4f5b0
better formatted output.
rainwoodman May 9, 2018
a5953e7
Raise error on unsupported padded r2c and c2r transforms.
rainwoodman May 15, 2018
8ca4680
count number of unimplemented transforms.
rainwoodman May 15, 2018
7739005
update test cases of 2d on 2d transforms.
rainwoodman May 15, 2018
b279c20
remove a typo.
rainwoodman May 15, 2018
ee9b508
update travis to use the new roundtrip.py
rainwoodman May 19, 2018
fe87aaa
import print_function (python 2)
rainwoodman May 21, 2018
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
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ install:

script:
- pip install runtests
- mpirun -n 1 python $PWD/tests/roundtrip.py -v -Nproc 1 1 -Nmesh 13 15 16
- mpirun -n 2 python $PWD/tests/roundtrip.py -v -Nproc 2 1 -Nproc 1 2 -Nmesh 13 15 16
- mpirun -n 4 python $PWD/tests/roundtrip.py -v -Nproc 2 2 -Nmesh 13 15 16
- python ./runtests.py --mpirun="mpirun -np 4"
- mpirun -n 1 python $PWD/scripts/pfft-roundtrip-matrix.py -v -diag -Nproc 1 1 -Nmesh 13 15 16
- mpirun -n 2 python $PWD/scripts/pfft-roundtrip-matrix.py -v -diag -Nproc 2 1 -Nproc 1 2 -Nmesh 13 15 16
- mpirun -n 4 python $PWD/scripts/pfft-roundtrip-matrix.py -v -diag -Nproc 2 2 -Nmesh 13 15 16
- mpirun -n 4 python $PWD/scripts/pfft-roundtrip-matrix.py -v -diag -Nproc 2 2 -Nmesh 13 15
- bash check_tag.sh pfft/version.py

deploy:
Expand Down
2 changes: 1 addition & 1 deletion depends/install_pfft.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ OPTIMIZE1=`echo "$*" | sed 's;enable-sse2;enable-sse;'`
echo "Optimization for double" ${OPTIMIZE}
echo "Optimization for single" ${OPTIMIZE1}

PFFT_VERSION=1.0.8-alpha3-fftw3
PFFT_VERSION=1.0.8-alpha3-fftw3-2don2d
TMP="tmp-pfft-$PFFT_VERSION"
LOGFILE="build.log"

Expand Down
64 changes: 57 additions & 7 deletions pfft/core.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,25 +187,58 @@ class Flags(int):
PFFT_BUFFERED_INPLACE = _PFFT_BUFFERED_INPLACE
PFFT_PADDED_R2C = _PFFT_PADDED_R2C
PFFT_PADDED_C2R = _PFFT_PADDED_C2R
TRANSPOSED_NONE = _PFFT_TRANSPOSED_NONE
TRANSPOSED_IN = _PFFT_TRANSPOSED_IN
TRANSPOSED_OUT = _PFFT_TRANSPOSED_OUT
SHIFTED_NONE = _PFFT_SHIFTED_NONE
SHIFTED_IN = _PFFT_SHIFTED_IN
SHIFTED_OUT = _PFFT_SHIFTED_OUT
MEASURE = _PFFT_MEASURE
ESTIMATE = _PFFT_ESTIMATE
PATIENT = _PFFT_PATIENT
EXHAUSTIVE = _PFFT_EXHAUSTIVE
NO_TUNE = _PFFT_NO_TUNE
TUNE = _PFFT_TUNE
PRESERVE_INPUT = _PFFT_PRESERVE_INPUT
DESTROY_INPUT = _PFFT_DESTROY_INPUT
BUFFERED_INPLACE = _PFFT_BUFFERED_INPLACE
PADDED_R2C = _PFFT_PADDED_R2C
PADDED_C2R = _PFFT_PADDED_C2R
def __new__(cls, value):
self = int.__new__(cls, value)
return self
def __repr__(self):
d = self.__class__.__dict__
return '|'.join([k for k in d.keys() if k.startswith('PFFT') and (d[k] & self)])
keys = sorted([k for k in d.keys() if k.isupper() and not k.startswith('PFFT')])
return '|'.join([k for k in keys if (d[k] & self)])

def format(self, flags=None):
d = self.__class__.__dict__
keys = sorted([k for k in d.keys() if k.isupper() and not k.startswith('PFFT')])
s = []
for key in keys:
if flags is not None and not (d[key] & flags): continue
if d[key] & self:
s.append(key)
else:
s.append(" " * len(key))
return ' '.join(s)

class Direction(int):
"""
PFFT Transformation Directions
"""
PFFT_FORWARD = _PFFT_FORWARD
PFFT_BACKWARD = _PFFT_BACKWARD
FORWARD = _PFFT_FORWARD
BACKWARD = _PFFT_BACKWARD
def __new__(cls, value):
self = int.__new__(cls, value)
return self
def __repr__(self):
d = self.__class__.__dict__
return 'and'.join([k for k in d.keys() if k.startswith('PFFT') and (d[k] == self)])
keys = sorted([k for k in d.keys() if k.isupper() and not k.startswith('PFFT')])
return 'and'.join([k for k in keys if (d[k] == self)])

######
# define Type as the transform type
Expand All @@ -225,12 +258,21 @@ class Type(int):
PFFTF_R2C = 5
PFFTF_C2R = 6
PFFTF_R2R = 7
C2C = 0
R2C = 1
C2R = 2
R2R = 3
C2CF = 4
R2CF = 5
C2RF = 6
R2RF = 7
def __new__(cls, value):
self = int.__new__(cls, value)
return self
def __repr__(self):
d = self.__class__.__dict__
return 'and'.join([k for k in d.keys() if k.startswith('PFFT') and (d[k] == self)])
keys = sorted([k for k in d.keys() if k.isupper() and not k.startswith('PFFT')])
return 'and'.join([k for k in keys if (d[k] == self)])

ctypedef numpy.intp_t (*pfft_local_size_func)(int rnk_n, numpy.intp_t * n, cMPI.MPI_Comm comm, int
pfft_flags, numpy.intp_t * local_ni, numpy.intp_t * local_i_start,
Expand Down Expand Up @@ -484,14 +526,20 @@ cdef class Partition(object):

local_ni, local_no, local_i_start, local_o_start = numpy.empty((4, n_.shape[0]), 'intp')

self.type = Type(type)
self.flags = Flags(flags)

if len(n_) < len(procmesh.np):
raise ValueError("ProcMesh (%d) shall have less dimentions than Mesh (%d)" % (len(procmesh.np), len(n_)))

if len(n_) == len(procmesh.np): # https://github.com/mpip/pfft/issues/29
raise NotImplementedError("Currently using the same ProcMesh (%d) dimentions with Mesh (%d) is not supported." % (len(procmesh.np), len(n_)))
if len(n_) == len(procmesh.np):
if len(n_) != 2 and len(n_) != 3: # https://github.com/mpip/pfft/issues/29
raise NotImplementedError("Currently using the same ProcMesh (%d) dimentions with Mesh (%d) is not supported other than 2don2d or 3don3d" % (len(procmesh.np), len(n_)))
if (self.flags & Flags.PFFT_PADDED_R2C) | (self.flags & Flags.PFFT_PADDED_C2R):
if self.type in (Type.R2C, Type.C2R, Type.R2CF, Type.C2RF):
# https://github.com/mpip/pfft/pull/31
raise NotImplementedError("Currently using the same ProcMesh (%d) dimentions with Mesh (%d) is not supported on padded transforms." % (len(procmesh.np), len(n_)))

self.type = Type(type)
self.flags = Flags(flags)
cdef pfft_local_size_func func = PFFT_LOCAL_SIZE_FUNC[self.type]


Expand Down Expand Up @@ -774,7 +822,9 @@ cdef class Plan(object):
inplace = False
if inplace != self.inplace:
raise ValueError("inplace status mismatch with the plan")

func(self.plan, i.ptr, o.ptr)

def __repr__(self):
return "Plan(" + \
','.join([
Expand Down
62 changes: 62 additions & 0 deletions pfft/tests/test_pfft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,65 @@ def test_leak(comm):
buffer = pfft.LocalBuffer(partition)
#FIXME: check with @mpip if this is correct.
i = buffer.view_input()

@MPITest([4])
def test_2d_on_2d_c2c(comm):
procmesh = pfft.ProcMesh(np=[2, 2], comm=comm)
N = (8, 8)

data = numpy.arange(numpy.prod(N), dtype='complex128').reshape(N)

correct = numpy.fft.fftn(data.copy())
result = numpy.zeros_like(correct)

partition = pfft.Partition(pfft.Type.PFFT_C2C, N,
procmesh, flags=pfft.Flags.PFFT_ESTIMATE
| pfft.Flags.PFFT_TRANSPOSED_OUT
# | pfft.Flags.PFFT_DESTROY_INPUT
| pfft.Flags.PFFT_PRESERVE_INPUT
)

buffer1 = pfft.LocalBuffer(partition)
buffer2 = pfft.LocalBuffer(partition)

plan = pfft.Plan(partition, pfft.Direction.PFFT_FORWARD, buffer1, buffer2)

buffer1.view_input()[:] = data[partition.local_i_slice]
plan.execute(buffer1, buffer2)

result[partition.local_o_slice] = buffer2.view_output()
result = comm.allreduce(result)
assert_almost_equal(correct, result)

@MPITest([1, 4])
def test_2d_on_2d_r2c(comm):
if comm.size == 1:
procmesh = pfft.ProcMesh(np=[1, 1], comm=comm)
else:
procmesh = pfft.ProcMesh(np=[2, 2], comm=comm)
N = (8, 8)

data = numpy.arange(numpy.prod(N), dtype='f8').reshape(N)

correct = numpy.fft.rfftn(data.copy())
result = numpy.zeros_like(correct)

partition = pfft.Partition(pfft.Type.PFFT_R2C, N,
procmesh, flags=pfft.Flags.PFFT_ESTIMATE
| pfft.Flags.PFFT_TRANSPOSED_OUT
# | pfft.Flags.PFFT_DESTROY_INPUT
| pfft.Flags.PFFT_PRESERVE_INPUT
# | pfft.Flags.PADDED_R2C # doesn't work yet
)

buffer1 = pfft.LocalBuffer(partition)
buffer2 = pfft.LocalBuffer(partition)

plan = pfft.Plan(partition, pfft.Direction.PFFT_FORWARD, buffer1, buffer2)

buffer1.view_input()[:] = data[partition.local_i_slice]
plan.execute(buffer1, buffer2)

result[partition.local_o_slice] = buffer2.view_output()
result = comm.allreduce(result)
assert_almost_equal(correct, result)
Loading