[Scipy-svn] r4159 - in trunk/scipy: interpolate optimize sparse/linalg/eigen/arpack

scipy-svn@scip... scipy-svn@scip...
Mon Apr 21 22:16:26 CDT 2008


Author: cdavid
Date: 2008-04-21 22:16:19 -0500 (Mon, 21 Apr 2008)
New Revision: 4159

Modified:
   trunk/scipy/interpolate/SConstruct
   trunk/scipy/optimize/SConstruct
   trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
Log:
scons build: remove explicit target for F2py builders when not needed (.pyf sources).

Modified: trunk/scipy/interpolate/SConstruct
===================================================================
--- trunk/scipy/interpolate/SConstruct	2008-04-21 10:01:45 UTC (rev 4158)
+++ trunk/scipy/interpolate/SConstruct	2008-04-22 03:16:19 UTC (rev 4159)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 03:00 PM 2008 J
+# Last Change: Tue Apr 22 11:00 AM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 
@@ -27,6 +27,5 @@
 env.NumpyPythonExtension('_fitpack', source = '_fitpackmodule.c')
 
 # Build dfitpack
-dfitpack_wrap = env.F2py(pjoin(env['build_dir'], 'dfitpack'), 
-                         pjoin(env['build_dir'], 'fitpack.pyf')) 
+dfitpack_wrap = env.F2py(pjoin(env['build_dir'], 'fitpack.pyf'))
 env.NumpyPythonExtension('dfitpack', source = dfitpack_wrap)

Modified: trunk/scipy/optimize/SConstruct
===================================================================
--- trunk/scipy/optimize/SConstruct	2008-04-21 10:01:45 UTC (rev 4158)
+++ trunk/scipy/optimize/SConstruct	2008-04-22 03:16:19 UTC (rev 4159)
@@ -1,4 +1,4 @@
-# Last Change: Wed Mar 05 11:00 PM 2008 J
+# Last Change: Tue Apr 22 11:00 AM 2008 J
 # vim:syntax=python
 
 import os
@@ -66,22 +66,19 @@
 
 # _lbfgsb pyextension
 src = pjoin('lbfgsb', 'routines.f')
-lbfgsb_src = env.F2py(pjoin(env['build_dir'], '_lbfgsbmodule.c'), 
-                      pjoin(env['build_dir'], 'lbfgsb', 'lbfgsb.pyf'))
+lbfgsb_src = env.F2py(pjoin(env['build_dir'], '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', '_cobylamodule.c'), 
-                    pjoin(env['build_dir'], 'cobyla', 'cobyla.pyf'))
+wrap_src = env.F2py(pjoin(env['build_dir'], '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', 'minpack2module.c'), 
-                    pjoin(env['build_dir'], 'minpack2', 'minpack2.pyf'))
+wrap_src = env.F2py(pjoin(env['build_dir'], 'minpack2', 'minpack2.pyf'))
 env.NumpyPythonExtension('minpack2', source = src + wrap_src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
@@ -92,8 +89,7 @@
 
 # _slsqp pyextension
 src = pjoin('slsqp', 'slsqp_optmz.f')
-slsqp_src = env.F2py(pjoin(env['build_dir'], '_slsqpmodule.c'), 
-                      pjoin(env['build_dir'], 'slsqp', 'slsqp.pyf'))
+slsqp_src = env.F2py(pjoin(env['build_dir'], '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-21 10:01:45 UTC (rev 4158)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-04-22 03:16:19 UTC (rev 4159)
@@ -42,7 +42,6 @@
 env.AppendUnique(CPPPATH = get_numpy_include_dirs())
 
 env.NumpyFromFTemplate('arpack.pyf', 'arpack.pyf.src')
-wsrc = env.F2py(pjoin(env['build_dir'], '_arpackmodule.c'), 
-                pjoin(env['build_dir'], 'arpack.pyf'))
+wsrc = env.F2py(pjoin(env['build_dir'], 'arpack.pyf'))
 env.Prepend(LIBS = 'arpack')
 env.NumpyPythonExtension('_arpack', source = wsrc)



More information about the Scipy-svn mailing list