[Numpy-svn] r5367 - in trunk/numpy: fft lib linalg numarray random

numpy-svn@scip... numpy-svn@scip...
Wed Jul 9 01:03:47 CDT 2008


Author: cdavid
Date: 2008-07-09 01:03:35 -0500 (Wed, 09 Jul 2008)
New Revision: 5367

Modified:
   trunk/numpy/fft/SConscript
   trunk/numpy/lib/SConscript
   trunk/numpy/linalg/SConscript
   trunk/numpy/numarray/SConscript
   trunk/numpy/random/SConscript
Log:
Simplify a bit more scons scripts.

Modified: trunk/numpy/fft/SConscript
===================================================================
--- trunk/numpy/fft/SConscript	2008-07-09 06:02:36 UTC (rev 5366)
+++ trunk/numpy/fft/SConscript	2008-07-09 06:03:35 UTC (rev 5367)
@@ -4,6 +4,5 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-fftpack_lite = env.NumpyPythonExtension('fftpack_lite', 
-                                        source = ['fftpack_litemodule.c', 
-                                                  'fftpack.c'])
+env.NumpyPythonExtension('fftpack_lite', 
+			  source = ['fftpack_litemodule.c', 'fftpack.c'])

Modified: trunk/numpy/lib/SConscript
===================================================================
--- trunk/numpy/lib/SConscript	2008-07-09 06:02:36 UTC (rev 5366)
+++ trunk/numpy/lib/SConscript	2008-07-09 06:03:35 UTC (rev 5367)
@@ -3,5 +3,4 @@
 from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
-_compiled_base = env.NumpyPythonExtension('_compiled_base', 
-                                        source = ['src/_compiled_base.c'])
+env.NumpyPythonExtension('_compiled_base', source = ['src/_compiled_base.c'])

Modified: trunk/numpy/linalg/SConscript
===================================================================
--- trunk/numpy/linalg/SConscript	2008-07-09 06:02:36 UTC (rev 5366)
+++ trunk/numpy/linalg/SConscript	2008-07-09 06:03:35 UTC (rev 5367)
@@ -1,16 +1,12 @@
 # Last Change: Thu Jun 12 06:00 PM 2008 J
 # vim:syntax=python
-import os.path
-
-from numscons import GetNumpyEnvironment, \
-                     scons_get_mathlib
+from numscons import GetNumpyEnvironment, scons_get_mathlib
 from numscons import CheckF77LAPACK
 from numscons import write_info
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-config = env.NumpyConfigure(custom_tests = 
-    {'CheckLAPACK' : CheckF77LAPACK})
+config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK})
 
 use_lapack = config.CheckLAPACK()
 
@@ -24,5 +20,4 @@
 if not use_lapack:
     sources.extend(['python_xerbla.c', 'zlapack_lite.c', 'dlapack_lite.c',
                     'blas_lite.c', 'dlamch.c', 'f2c_lite.c'])
-lapack_lite = env.NumpyPythonExtension('lapack_lite', source = sources)
-            
+env.NumpyPythonExtension('lapack_lite', source = sources)

Modified: trunk/numpy/numarray/SConscript
===================================================================
--- trunk/numpy/numarray/SConscript	2008-07-09 06:02:36 UTC (rev 5366)
+++ trunk/numpy/numarray/SConscript	2008-07-09 06:03:35 UTC (rev 5367)
@@ -5,4 +5,4 @@
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Append(CPPPATH = ['numpy'])
 
-_capi = env.NumpyPythonExtension('_capi', source = ['_capi.c'])
+env.NumpyPythonExtension('_capi', source = ['_capi.c'])

Modified: trunk/numpy/random/SConscript
===================================================================
--- trunk/numpy/random/SConscript	2008-07-09 06:02:36 UTC (rev 5366)
+++ trunk/numpy/random/SConscript	2008-07-09 06:03:35 UTC (rev 5367)
@@ -41,4 +41,4 @@
            ['mtrand.c', 'randomkit.c', 'initarray.c', 'distributions.c']]
 
 # XXX: Pyrex dependency
-mtrand = env.NumpyPythonExtension('mtrand', source = sources)
+env.NumpyPythonExtension('mtrand', source = sources)



More information about the Numpy-svn mailing list