[Scipy-svn] r4440 - in trunk/scipy: fftpack integrate interpolate optimize sparse/linalg/dsolve sparse/linalg/eigen/arpack special stats

scipy-svn@scip... scipy-svn@scip...
Thu Jun 12 06:27:59 CDT 2008


Author: cdavid
Date: 2008-06-12 06:26:55 -0500 (Thu, 12 Jun 2008)
New Revision: 4440

Modified:
   trunk/scipy/fftpack/SConscript
   trunk/scipy/integrate/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/optimize/SConscript
   trunk/scipy/sparse/linalg/dsolve/SConscript
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
   trunk/scipy/special/SConscript
   trunk/scipy/stats/SConscript
Log:
Use Glob instead of NumpyGlob, which is not needed anymore.

Modified: trunk/scipy/fftpack/SConscript
===================================================================
--- trunk/scipy/fftpack/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
+++ trunk/scipy/fftpack/SConscript	2008-06-12 11:26:55 UTC (rev 4440)
@@ -30,7 +30,7 @@
         pass
 
 # Build dfftpack
-src = env.NumpyGlob(pjoin('dfftpack', '*.f'))
+src = env.Glob(pjoin('dfftpack', '*.f'))
 dfftpack = env.DistutilsStaticExtLibrary('dfftpack', source = [str(s) for s in src])
 env.PrependUnique(LIBS = ['dfftpack'])
 env.PrependUnique(LIBPATH = ['.'])

Modified: trunk/scipy/integrate/SConscript
===================================================================
--- trunk/scipy/integrate/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
+++ trunk/scipy/integrate/SConscript	2008-06-12 11:26:55 UTC (rev 4440)
@@ -26,20 +26,20 @@
 # XXX: lapack integration
 
 # Build linpack_lite
-src = [str(s) for s in env.NumpyGlob(pjoin('linpack_lite', '*.f'))]
+src = [str(s) for s in env.Glob(pjoin('linpack_lite', '*.f'))]
 linpack_lite = env.DistutilsStaticExtLibrary('linpack_lite', source = src)
 
 # Build mach
 # XXX: do not use optimization flags for mach
-src = [str(s) for s in env.NumpyGlob(pjoin('mach', '*.f'))]
+src = [str(s) for s in env.Glob(pjoin('mach', '*.f'))]
 mach = env.DistutilsStaticExtLibrary('mach', source = src)
 
 # Build quadpack
-src = [str(s) for s in env.NumpyGlob(pjoin('quadpack', '*.f'))]
+src = [str(s) for s in env.Glob(pjoin('quadpack', '*.f'))]
 quadpack = env.DistutilsStaticExtLibrary('quadpack', source = src)
 
 # Build odepack
-src = [str(s) for s in env.NumpyGlob(pjoin('odepack', '*.f'))]
+src = [str(s) for s in env.Glob(pjoin('odepack', '*.f'))]
 odepack = env.DistutilsStaticExtLibrary('odepack', source = src)
 
 env.AppendUnique(LIBPATH = '.')

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
+++ trunk/scipy/interpolate/SConscript	2008-06-12 11:26:55 UTC (rev 4440)
@@ -18,7 +18,7 @@
 env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # Build fitpack
-src = [str(s) for s in env.NumpyGlob(pjoin('fitpack', '*.f'))]
+src = [str(s) for s in env.Glob(pjoin('fitpack', '*.f'))]
 fitpack = env.DistutilsStaticExtLibrary('fitpack', source = src)
 
 env.PrependUnique(LIBS = ['fitpack'])

Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
+++ trunk/scipy/optimize/SConscript	2008-06-12 11:26:55 UTC (rev 4440)
@@ -48,11 +48,11 @@
 #==========
 
 # minpack lib
-minpack_src = [str(s) for s in env.NumpyGlob(pjoin('minpack', '*.f'))]
+minpack_src = [str(s) for s in env.Glob(pjoin('minpack', '*.f'))]
 env.DistutilsStaticExtLibrary('minpack', source = minpack_src)
 
 # rootfind lib
-rootfind_src = [str(s) for s in env.NumpyGlob(pjoin('Zeros', '*.c'))]
+rootfind_src = [str(s) for s in env.Glob(pjoin('Zeros', '*.c'))]
 env.DistutilsStaticExtLibrary('rootfind', source = rootfind_src)
 
 env.AppendUnique(LIBS = ['minpack', 'rootfind'])

Modified: trunk/scipy/sparse/linalg/dsolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
+++ trunk/scipy/sparse/linalg/dsolve/SConscript	2008-06-12 11:26:55 UTC (rev 4440)
@@ -32,7 +32,7 @@
 superlu_def['USE_VENDOR_BLAS'] = 2
 superlu_env.Append(CPPDEFINES = superlu_def)
 
-superlu_src = superlu_env.NumpyGlob(pjoin('SuperLU', 'SRC', '*.c'))
+superlu_src = superlu_env.Glob(pjoin('SuperLU', 'SRC', '*.c'))
 superlu = superlu_env.DistutilsStaticExtLibrary('superlu_src', source = superlu_src)
 
 # Build python extensions

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 11:26:55 UTC (rev 4440)
@@ -27,9 +27,9 @@
 write_info(env)
 
 # Build arpack
-arpack_src = env.NumpyGlob(pjoin('ARPACK', 'SRC', '*.f'))
-arpack_src += env.NumpyGlob(pjoin('ARPACK', 'UTIL', '*.f'))
-arpack_src += env.NumpyGlob(pjoin('ARPACK', 'LAPACK', '*.f'))
+arpack_src = env.Glob(pjoin('ARPACK', 'SRC', '*.f'))
+arpack_src += env.Glob(pjoin('ARPACK', 'UTIL', '*.f'))
+arpack_src += env.Glob(pjoin('ARPACK', 'LAPACK', '*.f'))
 
 src = [str(s) for s in arpack_src]
 

Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
+++ trunk/scipy/special/SConscript	2008-06-12 11:26:55 UTC (rev 4440)
@@ -30,7 +30,7 @@
     """ext should be .f or .c"""
     if not libname:
         libname = name
-    src = env.NumpyGlob(pjoin(name, '*%s' % ext))
+    src = env.Glob(pjoin(name, '*%s' % ext))
     assert len(src) > 0
     env.DistutilsStaticExtLibrary(libname, source = src)
 

Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript	2008-06-12 11:23:17 UTC (rev 4439)
+++ trunk/scipy/stats/SConscript	2008-06-12 11:26:55 UTC (rev 4440)
@@ -18,7 +18,7 @@
 config.Finish()
 
 # Statlib library
-src = env.NumpyGlob(pjoin('statlib', '*.f' ))
+src = env.Glob(pjoin('statlib', '*.f' ))
 env.DistutilsStaticExtLibrary('statlibimp', source = src)
 
 env.AppendUnique(LIBPATH = '.')



More information about the Scipy-svn mailing list