Require scipy >1.0 and address #5, #6, #8

Author: jchutrue

ghost/sigtools/convolution.py

@@ -8,8 +8,6 @@
 from scipy.signal import fftconvolve
 from multiprocessing import cpu_count
 
-from .fourier import clean_scipy_cache
-
 try:
     import pyfftw
 except:
@@ -77,8 +75,6 @@ def fastconv_scipy(signal, kernel, *, mode=None, fft_length=None):
                    * fft(kernel, n=fft_length))
         conv_chunk = ifft(conv_fd)[..., :length + M - 1]
         res[..., start:start+len(conv_chunk)] += conv_chunk
-        # Usually the cache is to blame for memory errors
-        clean_scipy_cache()
 
     if mode == 'full':
         newsize = tot_length
@@ -277,8 +273,6 @@ def fastconv_freq_scipy(signal_td, kernel_fd, kernel_len,
         conv_fd = signal_fd * kernel_fd
         conv_td = ifft(conv_fd)[..., :length+M-1]
         res[..., start:start+len(conv_td)] += conv_td
-        # Usually the cache is to blame for memory errors
-        clean_scipy_cache()
 
     if mode == 'full':
         newsize = tot_length

ghost/sigtools/fourier.py

@@ -2,26 +2,9 @@
 
 import logging
 import numpy as np
-import scipy.fftpack._fftpack as sff
 from . import convolution
 
-__all__ = ['clean_scipy_cache', 'chirpz_dft']
-
-def clean_scipy_cache():
-    sff.destroy_zfft_cache()
-    sff.destroy_zfftnd_cache()
-    sff.destroy_drfft_cache()
-    sff.destroy_cfft_cache()
-    sff.destroy_cfftnd_cache()
-    sff.destroy_rfft_cache()
-    sff.destroy_ddct2_cache()
-    sff.destroy_ddct1_cache()
-    sff.destroy_dct2_cache()
-    sff.destroy_dct1_cache()
-    sff.destroy_ddst2_cache()
-    sff.destroy_ddst1_cache()
-    sff.destroy_dst2_cache()
-    sff.destroy_dst1_cache()
+__all__ = ['chirpz_dft']
 
 def chirpz_dft(x):
     """Computes the DFT of a signal using the Chirp Z-transform.

ghost/wave/morlet.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 from .wavelet import Wavelet
-from scipy.misc import logsumexp
+from scipy.special import logsumexp
 import copy
 
 __all__ = ['Morlet']

setup.py

@@ -27,7 +27,7 @@
     license='MIT License',
     author='Joshua Chu',
     install_requires=['numpy>=1.15.0',
-                      'scipy>=0.17.0',   # need to check minimum version
+                      'scipy>=1.0',   # need to check minimum version
                       'matplotlib>=3.0',
                      ],
     author_email='jpc6@rice.edu',