[Scipy-svn] r4162 - in trunk/scipy: lib/lapack linalg optimize sparse/linalg/eigen/arpack stats

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-04-21 23:28:52 -0500 (Mon, 21 Apr 2008)
New Revision: 4162

Modified:
   trunk/scipy/lib/lapack/SConstruct
   trunk/scipy/linalg/SConstruct
   trunk/scipy/optimize/SConstruct
   trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
   trunk/scipy/stats/SConstruct
Log:
scons build: use NumpyF2py instead of F2py everywhere.

Modified: trunk/scipy/lib/lapack/SConstruct
===================================================================
--- trunk/scipy/lib/lapack/SConstruct	2008-04-22 04:12:09 UTC (rev 4161)
+++ trunk/scipy/lib/lapack/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 03:00 PM 2008 J
+# Last Change: Tue Apr 22 01:00 PM 2008 J
 # vim:syntax=python
 
 import os
@@ -83,8 +83,8 @@
 #----------------
 # calc_lwork:
 #----------------
-calc_src = env.F2py(pjoin(env['build_dir'], 'calc_lworkmodule.c'), 
-                    source = pjoin(env['build_dir'], 'calc_lwork.f'))
+calc_src = env.NumpyF2py(pjoin('calc_lworkmodule.c'), 
+                         source = pjoin('calc_lwork.f'))
 env.NumpyPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'],
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 

Modified: trunk/scipy/linalg/SConstruct
===================================================================
--- trunk/scipy/linalg/SConstruct	2008-04-22 04:12:09 UTC (rev 4161)
+++ trunk/scipy/linalg/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
@@ -1,4 +1,4 @@
-# Last Change: Fri Mar 07 07:00 PM 2008 J
+# Last Change: Tue Apr 22 01:00 PM 2008 J
 # vim:syntax=python
 
 import os
@@ -138,9 +138,8 @@
 #   _flinalg
 #----------------
 _flinalg_fsrc = ['det.f', 'lu.f']
-_flinalg_src = fenv.F2py(
-    pjoin(fenv['build_dir'], 'src', '_flinalgmodule.c'), 
-    source = [pjoin(fenv['build_dir'], 'src', i) for i in _flinalg_fsrc])
+_flinalg_src = fenv.NumpyF2py(pjoin('src', '_flinalgmodule.c'), 
+    source = [pjoin('src', i) for i in _flinalg_fsrc])
 
 fenv.NumpyPythonExtension(
     '_flinalg', source = _flinalg_src + [pjoin('src', i) for i in _flinalg_fsrc])
@@ -148,8 +147,8 @@
 #----------------
 # calc_lwork:
 #----------------
-calc_src = env.F2py(pjoin(env['build_dir'], 'src', 'calc_lworkmodule.c'), 
-                    source = pjoin(env['build_dir'], 'src', 'calc_lwork.f'))
+calc_src = env.NumpyF2py(pjoin('src', 'calc_lworkmodule.c'), 
+                    source = pjoin('src', 'calc_lwork.f'))
 fenv.NumpyPythonExtension('calc_lwork', 
                          source = calc_src + [pjoin('src', 'calc_lwork.f')])
 

Modified: trunk/scipy/optimize/SConstruct
===================================================================
--- trunk/scipy/optimize/SConstruct	2008-04-22 04:12:09 UTC (rev 4161)
+++ trunk/scipy/optimize/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 11:00 AM 2008 J
+# Last Change: Tue Apr 22 01:00 PM 2008 J
 # vim:syntax=python
 
 import os
@@ -66,19 +66,19 @@
 
 # _lbfgsb pyextension
 src = pjoin('lbfgsb', 'routines.f')
-lbfgsb_src = env.F2py(pjoin(env['build_dir'], 'lbfgsb', 'lbfgsb.pyf'))
+lbfgsb_src = env.NumpyF2py(pjoin('lbfgsb', 'lbfgsb.pyf'))
 env.NumpyPythonExtension('_lbfgsb', source = [src] + lbfgsb_src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # _cobyla pyextension
 src = [pjoin('cobyla', i) for i in ['cobyla2.f', 'trstlp.f']]
-wrap_src = env.F2py(pjoin(env['build_dir'], 'cobyla', 'cobyla.pyf'))
+wrap_src = env.NumpyF2py(pjoin('cobyla', 'cobyla.pyf'))
 env.NumpyPythonExtension('_cobyla', source = src + wrap_src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # _minpack2 pyextension
 src = [pjoin('minpack2', i) for i in ['dcsrch.f', 'dcstep.f']]
-wrap_src = env.F2py(pjoin(env['build_dir'], 'minpack2', 'minpack2.pyf'))
+wrap_src = env.NumpyF2py(pjoin('minpack2', 'minpack2.pyf'))
 env.NumpyPythonExtension('minpack2', source = src + wrap_src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
@@ -89,7 +89,6 @@
 
 # _slsqp pyextension
 src = pjoin('slsqp', 'slsqp_optmz.f')
-slsqp_src = env.F2py(pjoin(env['build_dir'], 'slsqp', 'slsqp.pyf'))
+slsqp_src = env.NumpyF2py(pjoin('slsqp', 'slsqp.pyf'))
 env.NumpyPythonExtension('_slsqp', source = [src] + slsqp_src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
-

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-04-22 04:12:09 UTC (rev 4161)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
@@ -42,6 +42,6 @@
 env.AppendUnique(CPPPATH = get_numpy_include_dirs())
 
 env.NumpyFromFTemplate('arpack.pyf', 'arpack.pyf.src')
-wsrc = env.F2py(pjoin(env['build_dir'], 'arpack.pyf'))
+wsrc = env.NumpyF2py('arpack.pyf')
 env.Prepend(LIBS = 'arpack')
 env.NumpyPythonExtension('_arpack', source = wsrc)

Modified: trunk/scipy/stats/SConstruct
===================================================================
--- trunk/scipy/stats/SConstruct	2008-04-22 04:12:09 UTC (rev 4161)
+++ trunk/scipy/stats/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 09:00 PM 2008 J
+# Last Change: Tue Apr 22 01:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 
@@ -28,8 +28,7 @@
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # futil extension
-futil_src = env.F2py(pjoin(env['build_dir'], 'futilmodule.c'), 
-                     pjoin(env['build_dir'], 'futil.f'))
+futil_src = env.NumpyF2py(pjoin('futilmodule.c'), pjoin('futil.f'))
 env.NumpyPythonExtension('futil', source = futil_src + ['futil.f'],
                          LINKFLAGSEND = env['F77_LDFLAGS'])