[Numpy-svn] r4237 - in branches/numpy.scons/numpy: fft lib linalg

[numpy-svn at scipy.org]

Author: cdavid
Date: 2007-10-18 07:58:14 -0500 (Thu, 18 Oct 2007)
New Revision: 4237

Added:
   branches/numpy.scons/numpy/fft/SConstruct
   branches/numpy.scons/numpy/lib/SConstruct
   branches/numpy.scons/numpy/linalg/SConstruct
Modified:
   branches/numpy.scons/numpy/linalg/setupscons.py
Log:
linalg sconsified (wo lapack support), added forgotten SConscript

Added: branches/numpy.scons/numpy/fft/SConstruct
===================================================================
--- branches/numpy.scons/numpy/fft/SConstruct	2007-10-18 12:44:32 UTC (rev 4236)
+++ branches/numpy.scons/numpy/fft/SConstruct	2007-10-18 12:58:14 UTC (rev 4237)
@@ -0,0 +1,10 @@
+# Last Change: Thu Oct 18 09:00 PM 2007 J
+# vim:syntax=python
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numpy.distutils.scons import GetNumpyEnvironment, scons_get_paths
+
+env = GetNumpyEnvironment(ARGUMENTS)
+env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
+
+fftpack_lite = env.NumpyPythonExtension('fftpack_litemodule', 
+                                        source = ['fftpack_litemodule.c', 'fftpack.c'])

Added: branches/numpy.scons/numpy/lib/SConstruct
===================================================================
--- branches/numpy.scons/numpy/lib/SConstruct	2007-10-18 12:44:32 UTC (rev 4236)
+++ branches/numpy.scons/numpy/lib/SConstruct	2007-10-18 12:58:14 UTC (rev 4237)
@@ -0,0 +1,10 @@
+# Last Change: Thu Oct 18 09:00 PM 2007 J
+# vim:syntax=python
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numpy.distutils.scons import GetNumpyEnvironment, scons_get_paths
+
+env = GetNumpyEnvironment(ARGUMENTS)
+env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
+
+_compiled_base = env.NumpyPythonExtension('_compiled_base', 
+                                        source = ['src/_compiled_base.c'])

Added: branches/numpy.scons/numpy/linalg/SConstruct
===================================================================
--- branches/numpy.scons/numpy/linalg/SConstruct	2007-10-18 12:44:32 UTC (rev 4236)
+++ branches/numpy.scons/numpy/linalg/SConstruct	2007-10-18 12:58:14 UTC (rev 4237)
@@ -0,0 +1,12 @@
+# Last Change: Thu Oct 18 09:00 PM 2007 J
+# vim:syntax=python
+from numpy.distutils.misc_util import get_numpy_include_dirs
+from numpy.distutils.scons import GetNumpyEnvironment, scons_get_paths
+
+env = GetNumpyEnvironment(ARGUMENTS)
+env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
+
+sources = ['lapack_litemodule.c', 'zlapack_lite.c', 'dlapack_lite.c',
+          'blas_lite.c', 'dlamch.c', 'f2c_lite.c']
+lapack_lite = env.NumpyPythonExtension('lapack_lite', source = sources)
+            

Modified: branches/numpy.scons/numpy/linalg/setupscons.py
===================================================================
--- branches/numpy.scons/numpy/linalg/setupscons.py	2007-10-18 12:44:32 UTC (rev 4236)
+++ branches/numpy.scons/numpy/linalg/setupscons.py	2007-10-18 12:58:14 UTC (rev 4237)
@@ -6,23 +6,9 @@
 
     config.add_data_dir('tests')
 
-    # Configure lapack_lite
-    lapack_info = get_info('lapack_opt',0)
-    def get_lapack_lite_sources(ext, build_dir):
-        if not lapack_info:
-            print "### Warning:  Using unoptimized lapack ###"
-            return ext.depends[:-1]
-        else:
-            return ext.depends[:1]
+    print "### Warning:  Using unoptimized lapack ###"
 
-    config.add_extension('lapack_lite',
-                         sources = [get_lapack_lite_sources],
-                         depends=  ['lapack_litemodule.c',
-                                   'zlapack_lite.c', 'dlapack_lite.c',
-                                   'blas_lite.c', 'dlamch.c',
-                                   'f2c_lite.c','f2c.h'],
-                         extra_info = lapack_info
-                         )
+    config.add_sconscript('SConstruct')
 
     return config