[Scipy-svn] r4373 - in branches/refactor_fft/scipy/fftpack: . fftpack

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-05-16 04:31:01 -0500 (Fri, 16 May 2008)
New Revision: 4373

Added:
   branches/refactor_fft/scipy/fftpack/fftpack/SConstruct
   branches/refactor_fft/scipy/fftpack/fftpack/setupscons.py
Removed:
   branches/refactor_fft/scipy/fftpack/SConstruct
Modified:
   branches/refactor_fft/scipy/fftpack/fftpack/
   branches/refactor_fft/scipy/fftpack/setupscons.py
Log:
Fix scons build of fftpack (no backend yet).

Deleted: branches/refactor_fft/scipy/fftpack/SConstruct
===================================================================
--- branches/refactor_fft/scipy/fftpack/SConstruct	2008-05-16 08:32:20 UTC (rev 4372)
+++ branches/refactor_fft/scipy/fftpack/SConstruct	2008-05-16 09:31:01 UTC (rev 4373)
@@ -1,52 +0,0 @@
-# Last Change: Tue May 13 10:00 AM 2008 J
-# vim:syntax=python
-from os.path import join as pjoin
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import GetNumpyEnvironment, write_info
-from numscons import CheckFFT, IsMKL, IsFFTW2, IsFFTW3
-from numscons import CheckF77Clib
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
-
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-backends_paths = [pjoin(env['build_dir'], 'src', b)
-                  for b in ["mkl", "fftw", "djbfft", "fftpack", "fftw3"]]
-env.AppendUnique(CPPPATH = backends_paths)
-env.AppendUnique(CPPPATH = [pjoin(env['build_dir'], "src")])
-
-# Check fft implementation
-config = env.NumpyConfigure(custom_tests = {'CheckFFT': CheckFFT,
-                            'CheckF77Clib' : CheckF77Clib})
-has_fft = config.CheckFFT()
-if not config.CheckF77Clib():
-    raise Exception("Could not get f77/c++ link information")
-config.Finish()
-write_info(env)
-
-# Tweak defineds depending on the fft used
-if has_fft:
-    if IsMKL(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_MKL_H")
-    elif IsFFTW3(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_FFTW3_H")
-    elif IsFFTW2(env, 'fft'):
-        env.Append(CPPDEFINES = "SCIPY_FFTW2_H")
-    else:
-        pass
-
-# Build dfftpack
-src = env.NumpyGlob(pjoin('dfftpack', '*.f'))
-dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = [str(s) for s in src])
-env.PrependUnique(LIBS = ['dfftpack'])
-env.PrependUnique(LIBPATH = env['build_dir'])
-
-# Build _fftpack
-src = ['src/zfft.cxx','src/drfft.cxx','src/zrfft.c', 'src/zfftnd.cxx', 'fftpack.pyf']
-env.NumpyPythonExtension('_fftpack', src)
-
-# Build convolve
-src = ['src/convolve.cxx',  'convolve.pyf']
-env.NumpyPythonExtension('convolve', src)


Property changes on: branches/refactor_fft/scipy/fftpack/fftpack
___________________________________________________________________
Name: svn:ignore
   - *.pyc
*.swp
*.pyd
*.so

   + .sconsign.dblite
*.pyc
*.swp
*.pyd
*.so


Copied: branches/refactor_fft/scipy/fftpack/fftpack/SConstruct (from rev 4369, branches/refactor_fft/scipy/fftpack/SConstruct)
===================================================================
--- branches/refactor_fft/scipy/fftpack/SConstruct	2008-05-16 06:46:53 UTC (rev 4369)
+++ branches/refactor_fft/scipy/fftpack/fftpack/SConstruct	2008-05-16 09:31:01 UTC (rev 4373)
@@ -0,0 +1,33 @@
+# Last Change: Fri May 16 06:00 PM 2008 J
+# vim:syntax=python
+from os.path import join as pjoin
+
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numscons import GetNumpyEnvironment
+from numscons import CheckF77Clib
+
+env = GetNumpyEnvironment(ARGUMENTS)
+env.Tool('numpyf2py')
+
+env.AppendUnique(CPPPATH = get_numpy_include_dirs())
+env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
+env.AppendUnique(CPPPATH = [pjoin(env['build_dir'], "src")])
+
+config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
+if not config.CheckF77Clib():
+    raise Exception("Could not get f77/c++ link information")
+config.Finish()
+
+# Build dfftpack
+src = env.NumpyGlob(pjoin('DFFTPACK', '*.f'))
+dfftpack = env.NumpyStaticExtLibrary('dfftpack', source = [str(s) for s in src])
+env.PrependUnique(LIBS = ['dfftpack'])
+env.PrependUnique(LIBPATH = env['build_dir'])
+
+# Build the fftpack wrapper
+src = [pjoin("src/fftpack", i) for i in ['zfft.cxx','drfft.cxx', 'zfftnd.cxx']]
+env.NumpyPythonExtension('_fftpack', src + ['fftpack.pyf', 'src/zrfft.c'])
+
+# Build convolve
+src = ['src/fftpack/convolve.cxx',  'convolve.pyf']
+env.NumpyPythonExtension('convolve', src)

Copied: branches/refactor_fft/scipy/fftpack/fftpack/setupscons.py (from rev 4369, branches/refactor_fft/scipy/fftpack/fftpack/setup.py)
===================================================================
--- branches/refactor_fft/scipy/fftpack/fftpack/setup.py	2008-05-16 06:46:53 UTC (rev 4369)
+++ branches/refactor_fft/scipy/fftpack/fftpack/setupscons.py	2008-05-16 09:31:01 UTC (rev 4373)
@@ -0,0 +1,16 @@
+#!/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
+    config = Configuration('fftpack',parent_package, top_path)
+
+    config.add_sconscript("SConstruct")
+
+    return config
+
+if __name__ == '__main__':
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())

Modified: branches/refactor_fft/scipy/fftpack/setupscons.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/setupscons.py	2008-05-16 08:32:20 UTC (rev 4372)
+++ branches/refactor_fft/scipy/fftpack/setupscons.py	2008-05-16 09:31:01 UTC (rev 4373)
@@ -6,11 +6,16 @@
 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 = Configuration('fftpack',parent_package, top_path, setup_name = 'setupscons.py')
 
-    config.add_sconscript('SConstruct')
     config.add_data_dir('tests')
+    config.add_data_dir('benchmarks')
 
+    config.add_subpackage('fftpack')
+
+    # Build optional backends
+    config.add_subpackage('backends')
+
     return config
 
 if __name__ == '__main__':