[Scipy-svn] r4431 - in trunk/scipy: fftpack integrate interpolate lib/blas lib/lapack linalg optimize sparse/linalg/eigen/arpack sparse/linalg/isolve special stats

scipy-svn@scip... scipy-svn@scip...
Thu Jun 12 05:21:18 CDT 2008


Author: cdavid
Date: 2008-06-12 05:20:52 -0500 (Thu, 12 Jun 2008)
New Revision: 4431

Modified:
   trunk/scipy/fftpack/SConscript
   trunk/scipy/integrate/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/lib/blas/SConscript
   trunk/scipy/lib/lapack/SConscript
   trunk/scipy/linalg/SConscript
   trunk/scipy/optimize/SConscript
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
   trunk/scipy/sparse/linalg/isolve/SConscript
   trunk/scipy/special/SConscript
   trunk/scipy/stats/SConscript
Log:
rename numpyf2py to f2py scons tool; numpyf2py is deprecated.

Modified: trunk/scipy/fftpack/SConscript
===================================================================
--- trunk/scipy/fftpack/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/fftpack/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -7,7 +7,7 @@
 from numscons import CheckFFT, IsMKL, IsFFTW2, IsFFTW3
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
+env.Tool('f2py')
 
 env.AppendUnique(CPPPATH = get_numpy_include_dirs())
 env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])

Modified: trunk/scipy/integrate/SConscript
===================================================================
--- trunk/scipy/integrate/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/integrate/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -7,7 +7,7 @@
 from numscons import GetNumpyEnvironment, CheckF77Clib, CheckF77BLAS
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
+env.Tool('f2py')
 
 # Configuration
 config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib,

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/interpolate/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -6,7 +6,7 @@
 from numscons import GetNumpyEnvironment, CheckF77Clib
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
+env.Tool('f2py')
 
 config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
 if not config.CheckF77Clib():

Modified: trunk/scipy/lib/blas/SConscript
===================================================================
--- trunk/scipy/lib/blas/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/lib/blas/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -15,7 +15,7 @@
 from scons_support import do_generate_fake_interface, generate_interface_emitter
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
+env.Tool('f2py')
 
 env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
 #if os.name == 'nt':

Modified: trunk/scipy/lib/lapack/SConscript
===================================================================
--- trunk/scipy/lib/lapack/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/lib/lapack/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -17,7 +17,7 @@
                           generate_interface_emitter
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
+env.Tool('f2py')
 env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
 #if os.name == 'nt':
 #    # NT needs the pythonlib to run any code importing Python.h, including

Modified: trunk/scipy/linalg/SConscript
===================================================================
--- trunk/scipy/linalg/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/linalg/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -19,7 +19,7 @@
 #    generate_config_header, generate_config_header_emitter
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
+env.Tool('f2py')
 env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
 
 # XXX: handle cblas wrapper for complex (check in numpy.scons or here ?)

Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/optimize/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -12,7 +12,7 @@
 from numscons import write_info
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
+env.Tool('f2py')
 env.Append(CPPPATH = get_numpy_include_dirs())
 env.Append(CPPPATH = env['F2PYINCLUDEDIR'])
 #if os.name == 'nt':

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -14,7 +14,7 @@
 config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK,
                                             'CheckF77Clib' : CheckF77Clib})
 
-env.Tool('numpyf2py')
+env.Tool('f2py')
 #-----------------
 # Checking Lapack
 #-----------------

Modified: trunk/scipy/sparse/linalg/isolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/isolve/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/sparse/linalg/isolve/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -10,7 +10,7 @@
 from numscons import write_info
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Tool('numpyf2py')
+env.Tool('f2py')
 env.Append(CPPPATH = [get_numpy_include_dirs(), env['F2PYINCLUDEDIR']])
 #if os.name == 'nt':
 #    # NT needs the pythonlib to run any code importing Python.h, including

Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/special/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -11,7 +11,7 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-env.Tool('numpyf2py')
+env.Tool('f2py')
 
 env.AppendUnique(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
 env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])

Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript	2008-06-12 10:18:28 UTC (rev 4430)
+++ trunk/scipy/stats/SConscript	2008-06-12 10:20:52 UTC (rev 4431)
@@ -7,7 +7,7 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-t = env.Tool('numpyf2py')
+t = env.Tool('f2py')
 
 env.AppendUnique(CPPPATH = [get_numpy_include_dirs()])
 env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])



More information about the Scipy-svn mailing list