Merge pull request pyFFTW#213 from jakirkham/xtras_dask_interface

Dask Interface Extras
s-sajid-ali · Mar 13, 2018 · 406be4a · 406be4a
2 parents 13b3bd8 + fcad133
commit 406be4a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ before_install:
 
 install:
   - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION nomkl numpy scipy cython setuptools
-  - conda install -q -n test-environment dask=0.14.2 || true
+  - conda install -q -n test-environment dask=0.15.0 || true
   - source activate test-environment
   - python setup.py -v build_ext --inplace
 

diff --git a/pyfftw/interfaces/dask_fft.py b/pyfftw/interfaces/dask_fft.py
@@ -56,6 +56,10 @@
 from . import numpy_fft as _numpy_fft
 from dask.array.fft import (
     fft_wrap,
+    fftfreq,
+    rfftfreq,
+    fftshift,
+    ifftshift,
 )
 
 fft = fft_wrap(_numpy_fft.fft)

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 cython
 numpy>=1.6
 scipy>=0.12.0
-dask>=0.14.2
+dask>=0.15.0
diff --git a/test/test_pyfftw_dask_interface.py b/test/test_pyfftw_dask_interface.py
@@ -92,7 +92,7 @@ def _dask_array_fft_has_norm_kwarg():
         'hfft': 'c2r',
         'ihfft': 'r2c'}
 
-acquired_names = ('fft_wrap',)
+acquired_names = ('fft_wrap', 'fftfreq', 'rfftfreq', 'fftshift', 'ifftshift')
 
 @unittest.skipIf(
     not interfaces.dask_fft,