[Scipy-svn] r4874 - branches/remove_fft_backends/scipy/fftpack

scipy-svn@scip... scipy-svn@scip...
Sat Nov 1 08:29:29 CDT 2008


Author: cdavid
Date: 2008-11-01 08:29:25 -0500 (Sat, 01 Nov 2008)
New Revision: 4874

Modified:
   branches/remove_fft_backends/scipy/fftpack/setup.py
Log:
Do not look for fftw and other backends anymore in distutils build.

Modified: branches/remove_fft_backends/scipy/fftpack/setup.py
===================================================================
--- branches/remove_fft_backends/scipy/fftpack/setup.py	2008-11-01 13:24:40 UTC (rev 4873)
+++ branches/remove_fft_backends/scipy/fftpack/setup.py	2008-11-01 13:29:25 UTC (rev 4874)
@@ -5,19 +5,9 @@
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
-    from numpy.distutils.system_info import get_info
+
     config = Configuration('fftpack',parent_package, top_path)
 
-    djbfft_info = {}
-    mkl_info = get_info('mkl')
-    if mkl_info:
-        mkl_info.setdefault('define_macros', []).append(('SCIPY_MKL_H', None))
-        fft_opt_info = mkl_info
-    else:
-        fft_opt_info = get_info('fftw3') or get_info('fftw2') \
-                        or get_info('dfftw')
-        djbfft_info = get_info('djbfft')
-
     config.add_data_dir('tests')
     config.add_data_dir('benchmarks')
 
@@ -30,7 +20,6 @@
     config.add_extension('_fftpack',
         sources=sources,
         libraries=['dfftpack'],
-        extra_info=[fft_opt_info, djbfft_info],
         depends=['src/zfft_djbfft.c', 'src/zfft_fftpack.c', 'src/zfft_fftw.c',
             'src/zfft_fftw3.c', 'src/zfft_mkl.c',
             'src/drfft_djbfft.c', 'src/drfft_fftpack.c',
@@ -43,7 +32,6 @@
     config.add_extension('convolve',
         sources=['convolve.pyf','src/convolve.c'],
         libraries=['dfftpack'],
-        extra_info=[fft_opt_info, djbfft_info],
     )
     return config
 



More information about the Scipy-svn mailing list