[Scipy-svn] r4328 - branches/refactor_fft/scipy/fftpack

scipy-svn at scipy.org scipy-svn at scipy.org
Thu May 15 08:26:39 EDT 2008


Author: cdavid
Date: 2008-05-15 07:26:31 -0500 (Thu, 15 May 2008)
New Revision: 4328

Modified:
   branches/refactor_fft/scipy/fftpack/setup.py
Log:
Do not build any optimized backend anymore.


Modified: branches/refactor_fft/scipy/fftpack/setup.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/setup.py	2008-05-14 06:46:10 UTC (rev 4327)
+++ branches/refactor_fft/scipy/fftpack/setup.py	2008-05-15 12:26:31 UTC (rev 4328)
@@ -84,33 +84,26 @@
     from numpy.distutils.misc_util import Configuration
     config = Configuration('fftpack',parent_package, top_path)
 
-    info, djbfft_info, fft_opt_info = get_available_backends()
-    opts = [fft_opt_info]
-    if djbfft_info:
-        opts.append(djbfft_info)
-
-    libs = build_backends(config, opts, info, djbfft_info, fft_opt_info)
-
     config.add_data_dir('tests')
     config.add_data_dir('benchmarks')
 
     config.add_library('dfftpack',
                        sources=[join('dfftpack','*.f')])
 
-    sources = ['fftpack.pyf', 'src/fftpack.cxx', 'src/zrfft.c']
+    sources = ['fftpack.pyf', 'src/zrfft.c']
+    for s in ["zfft.cxx", "zfftnd.cxx", "drfft.cxx"]:
+	sources.append(join('src/fftpack', s))
 
     # Build the python extensions
     config.add_extension('_fftpack',
         sources=sources,
-        libraries = libs,
-        extra_info = opts,
+        libraries = ["dfftpack"],
         include_dirs = ['src'],
     )
 
     config.add_extension('convolve',
         sources = ['convolve.pyf', 'src/convolve.cxx'],
-        libraries = libs,
-        extra_info = opts,
+        libraries = ["dfftpack"],
         include_dirs = ['src'],
     )
     return config




More information about the Scipy-svn mailing list