[Scipy-svn] r3555 - branches/scipy.scons/scipy/fftpack

scipy-svn@scip... scipy-svn@scip...
Wed Nov 21 05:36:36 CST 2007


Author: cdavid
Date: 2007-11-21 05:36:30 -0600 (Wed, 21 Nov 2007)
New Revision: 3555

Modified:
   branches/scipy.scons/scipy/fftpack/SConstruct
   branches/scipy.scons/scipy/fftpack/setupscons.py
Log:
Remove junk in setupscons.py

Modified: branches/scipy.scons/scipy/fftpack/SConstruct
===================================================================
--- branches/scipy.scons/scipy/fftpack/SConstruct	2007-11-21 11:34:00 UTC (rev 3554)
+++ branches/scipy.scons/scipy/fftpack/SConstruct	2007-11-21 11:36:30 UTC (rev 3555)
@@ -11,6 +11,8 @@
 env.AppendUnique(CPPPATH = get_numpy_include_dirs())
 env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
 
+# XXX: implement fft checkers ...
+
 # Build dfftpack
 src = glob.glob(pjoin('dfftpack', '*.f'))
 dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = src)

Modified: branches/scipy.scons/scipy/fftpack/setupscons.py
===================================================================
--- branches/scipy.scons/scipy/fftpack/setupscons.py	2007-11-21 11:34:00 UTC (rev 3554)
+++ branches/scipy.scons/scipy/fftpack/setupscons.py	2007-11-21 11:36:30 UTC (rev 3555)
@@ -10,42 +10,7 @@
 
     config.add_sconscript('SConstruct')
     config.add_data_dir('tests')
-#
-#
-#    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_library('dfftpack',
-#                       sources=[join('dfftpack','*.f')])
-#
-#    sources = ['fftpack.pyf','src/zfft.c','src/drfft.c','src/zrfft.c',
-#               'src/zfftnd.c']
-#
-#    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',
-#            'src/drfft_fftw3.c', 'src/drfft_fftw.c',
-#            'src/zfftnd_fftpack.c', 'src/zfftnd_fftw.c',
-#            'src/zfftnd_fftw3.c', 'src/zfftnd_mkl.c',
-#            ],
-#    )
-#
-#    config.add_extension('convolve',
-#        sources=['convolve.pyf','src/convolve.c'],
-#        libraries=['dfftpack'],
-#        extra_info=[fft_opt_info, djbfft_info],
-#    )
+    
     return config
 
 if __name__ == '__main__':



More information about the Scipy-svn mailing list