Merged in dalcinl/checks (pull request #13)

Add error checking for NULL FFTW plan pointers

Author: dalcinl

mpi4py_fft/fftw/fftw_xfftn.pyx

@@ -149,6 +149,8 @@ cdef class FFT:
             knd[i] = kind[i]
         self._plan = fftw_planxfftn(ndims, sz_in, _in, sz_out, _out, naxes,
                                     axs, knd, allflags)
+        if self._plan == NULL:
+            raise RuntimeError("Failure creating FFTW plan")
         free(sz_in)
         free(sz_out)
         free(axs)
@@ -169,6 +171,7 @@ cdef class FFT:
         return self._output_array
 
     def print_plan(self):
+        assert self._plan != NULL
         fftw_print_plan(<fftw_plan>self._plan)
 
     def update_arrays(self, input_array, output_array):
@@ -235,6 +238,7 @@ cdef class FFT:
         """Apply plan with explicit (and safe) update of work arrays"""
         if input_array is not None:
             self._input_array[...] = input_array
+        assert self._plan != NULL
         with nogil:
             fftw_execute(<fftw_plan>self._plan)
         if normalize:
@@ -283,6 +287,7 @@ cdef class FFT:
 
         _in = <void *>np.PyArray_DATA(input_array)
         _out = <void *>np.PyArray_DATA(output_array)
+        assert self._plan != NULL
         with nogil:
             apply_plan(<fftw_plan>self._plan, _in, _out)
         if normalize:

tests/test_fftw.py

@@ -103,7 +103,7 @@ def test_fftw():
                                 idct = fftw.idctn(input_array, None, axes, type, threads, iflags, output_array=oa)
                                 A2 = idct(B, implicit=True, normalize=True)
                                 assert allclose(A, A2), np.linalg.norm(A-A2)
-                                if typecode is not 'g' and not type is 4:
+                                if typecode != 'g' and type != 4:
                                     B2 = scipy_dctn(A, axes=axes, type=type)
                                     assert allclose(B, B2), np.linalg.norm(B-B2)
 
@@ -112,7 +112,7 @@ def test_fftw():
                                 idst = fftw.idstn(input_array, None, axes, type, threads, iflags, output_array=oa)
                                 A2 = idst(B, implicit=True, normalize=True)
                                 assert allclose(A, A2), np.linalg.norm(A-A2)
-                                if typecode is not 'g' and not type is 4:
+                                if typecode != 'g' and type != 4:
                                     B2 = scipy_dstn(A, axes=axes, type=type)
                                     assert allclose(B, B2), np.linalg.norm(B-B2)
 
@@ -132,7 +132,7 @@ def test_fftw():
                             M = fftw.get_normalization(kds, input_array.shape, axes)
                             assert allclose(C2*M, A)
                             # Test vs scipy for transforms available in scipy
-                            if typecode is not 'g' and not any(f in kds for f in (fftw.FFTW_RODFT11, fftw.FFTW_REDFT11)):
+                            if typecode != 'g' and not any(f in kds for f in (fftw.FFTW_RODFT11, fftw.FFTW_REDFT11)):
                                 for m, ts in enumerate(tsf):
                                     A = eval('scipy.fftpack.'+ts[:-1])(A, axis=axes[m], type=int(ts[-1]))
                                 assert allclose(C, A), np.linalg.norm(C-A)