Improving interface for possibly missing precisions

Author: mikaem

conf/meta.yaml

@@ -30,14 +30,15 @@ requirements:
     - pyfftw
     - six
     - nomkl
-    - scipy
+    - scipy >=1.0.0
     - h5py-parallel
     - netcdf4-parallel
 
 test:
   requires:
     - coverage # [py3k]
     - codecov # [py3k]
+    - scipy >=1.0.0
 
   source_files:
     - tests

mpi4py_fft/fftw/__init__.py

@@ -1,4 +1,3 @@
 from .xfftn import *
 from .factory import get_planned_FFT, export_wisdom, import_wisdom, \
-  forget_wisdom, cleanup, set_timelimit
-
+    forget_wisdom, cleanup, set_timelimit, get_fftw_lib

mpi4py_fft/fftw/factory.py

@@ -1,21 +1,34 @@
 import six
 import numpy as np
 from mpi4py import MPI
-from . import fftw_xfftn
-try:
-    from . import fftwf_xfftn
-except ImportError:
-    fftwf_xfftn = None
-try:
-    from . import fftwl_xfftn
-except ImportError:
-    fftwl_xfftn = None
 from .utilities import FFTW_FORWARD, FFTW_MEASURE
 
+def get_fftw_lib(dtype):
+    dtype = np.dtype(dtype).char.upper()
+    if dtype == 'G':
+        try:
+            from . import fftwl_xfftn
+            return fftwl_xfftn
+        except ImportError:
+            return None
+    elif dtype == 'D':
+        try:
+            from . import fftw_xfftn
+            return fftw_xfftn
+        except ImportError:
+            return None
+    elif dtype == 'F':
+        try:
+            from . import fftwf_xfftn
+            return fftwf_xfftn
+        except ImportError:
+            return None
+
 fftlib = {}
-for k, v in zip(('F', 'D', 'G'), (fftwf_xfftn, fftw_xfftn, fftwl_xfftn)):
-    if v is not None:
-        fftlib[k] = v
+for t in 'fdg':
+    lib = get_fftw_lib(t)
+    if lib is not None:
+        fftlib[t.upper()] = lib
 
 comm = MPI.COMM_WORLD
 

tests/test_fftw.py

@@ -35,7 +35,10 @@ def test_fftw():
 
     dims = (1, 2, 3)
     sizes = (7, 8, 10)
-    types = 'fdg'
+    types = ''
+    for t in 'fdg':
+        if fftw.get_fftw_lib(t):
+            types += t
     fflags = (fftw.FFTW_ESTIMATE, fftw.FFTW_DESTROY_INPUT)
     iflags = (fftw.FFTW_ESTIMATE, fftw.FFTW_DESTROY_INPUT)