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

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


Author: cdavid
Date: 2007-11-21 05:34:00 -0600 (Wed, 21 Nov 2007)
New Revision: 3554

Added:
   branches/scipy.scons/scipy/fftpack/SConstruct
   branches/scipy.scons/scipy/fftpack/setupscons.py
Log:
fftpack knows build and all tests pass

Added: branches/scipy.scons/scipy/fftpack/SConstruct
===================================================================
--- branches/scipy.scons/scipy/fftpack/SConstruct	2007-11-20 14:28:31 UTC (rev 3553)
+++ branches/scipy.scons/scipy/fftpack/SConstruct	2007-11-21 11:34:00 UTC (rev 3554)
@@ -0,0 +1,29 @@
+# Last Change: Wed Nov 21 08:00 PM 2007 J
+# vim:syntax=python
+from os.path import join as pjoin
+import glob
+
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numpy.distutils.scons import GetNumpyEnvironment
+
+env = GetNumpyEnvironment(ARGUMENTS)
+
+env.AppendUnique(CPPPATH = get_numpy_include_dirs())
+env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
+
+# Build dfftpack
+src = glob.glob(pjoin('dfftpack', '*.f'))
+dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = src)
+env.AppendUnique(LIBS = ['dfftpack'])
+env.AppendUnique(LIBPATH = env['build_dir'])
+
+# Build _fftpack
+src = ['src/zfft.c','src/drfft.c','src/zrfft.c', 'src/zfftnd.c']
+wsrc = env.F2PY(pjoin(env['build_dir'], '_fftpackmodule.c'),
+                pjoin(env['build_dir'], 'fftpack.pyf'))
+env.NumpyPythonExtension('_fftpack', source = src + wsrc)
+
+# Build convolve
+src = ['src/convolve.c']
+wsrc = env.F2PY(pjoin(env['build_dir'], 'convolve.pyf'))
+env.NumpyPythonExtension('convolve', source = src + wsrc)

Copied: branches/scipy.scons/scipy/fftpack/setupscons.py (from rev 3551, branches/scipy.scons/scipy/fftpack/setup.py)
===================================================================
--- branches/scipy.scons/scipy/fftpack/setup.py	2007-11-20 11:53:08 UTC (rev 3551)
+++ branches/scipy.scons/scipy/fftpack/setupscons.py	2007-11-21 11:34:00 UTC (rev 3554)
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+# Created by Pearu Peterson, August 2002
+
+from os.path import join
+
+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)
+
+    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__':
+    from numpy.distutils.core import setup
+    from fftpack_version import fftpack_version
+    setup(version=fftpack_version,
+          description='fftpack - Discrete Fourier Transform package',
+          author='Pearu Peterson',
+          author_email = 'pearu@cens.ioc.ee',
+          maintainer_email = 'scipy-dev@scipy.org',
+          license = 'SciPy License (BSD Style)',
+          **configuration(top_path='').todict())



More information about the Scipy-svn mailing list