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

scipy-svn@scip... scipy-svn@scip...
Mon Apr 21 23:42:06 CDT 2008


Author: cdavid
Date: 2008-04-21 23:41:53 -0500 (Mon, 21 Apr 2008)
New Revision: 4163

Modified:
   trunk/scipy/fftpack/SConstruct
   trunk/scipy/interpolate/SConstruct
   trunk/scipy/optimize/SConstruct
   trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
Log:

Do not explictly use NumpyF2py builder on .pyf files: .pyf are registered and
handled automatically now.



Modified: trunk/scipy/fftpack/SConstruct
===================================================================
--- trunk/scipy/fftpack/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
+++ trunk/scipy/fftpack/SConstruct	2008-04-22 04:41:53 UTC (rev 4163)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 12:00 PM 2008 J
+# Last Change: Tue Apr 22 01:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 
@@ -35,11 +35,9 @@
 env.PrependUnique(LIBPATH = env['build_dir'])
 
 # Build _fftpack
-src = ['src/zfft.c','src/drfft.c','src/zrfft.c', 'src/zfftnd.c']
-wsrc = env.NumpyF2py('fftpack.pyf')
-env.NumpyPythonExtension('_fftpack', source = src + wsrc)
+src = ['src/zfft.c','src/drfft.c','src/zrfft.c', 'src/zfftnd.c', 'fftpack.pyf']
+env.NumpyPythonExtension('_fftpack', src)
 
 # Build convolve
-src = ['src/convolve.c']
-wsrc = env.NumpyF2py('convolve.pyf')
-env.NumpyPythonExtension('convolve', source = src + wsrc)
+src = ['src/convolve.c',  'convolve.pyf']
+env.NumpyPythonExtension('convolve', src)

Modified: trunk/scipy/interpolate/SConstruct
===================================================================
--- trunk/scipy/interpolate/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
+++ trunk/scipy/interpolate/SConstruct	2008-04-22 04:41:53 UTC (rev 4163)
@@ -1,4 +1,4 @@
-# Last Change: Tue Apr 22 12:00 PM 2008 J
+# Last Change: Tue Apr 22 01:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 
@@ -27,5 +27,4 @@
 env.NumpyPythonExtension('_fitpack', source = '_fitpackmodule.c')
 
 # Build dfitpack
-dfitpack_wrap = env.NumpyF2py('fitpack.pyf')
-env.NumpyPythonExtension('dfitpack', source = dfitpack_wrap)
+env.NumpyPythonExtension('dfitpack', source = 'fitpack.pyf')

Modified: trunk/scipy/optimize/SConstruct
===================================================================
--- trunk/scipy/optimize/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
+++ trunk/scipy/optimize/SConstruct	2008-04-22 04:41:53 UTC (rev 4163)
@@ -65,21 +65,18 @@
 env.NumpyPythonExtension('_zeros', 'zeros.c')
 
 # _lbfgsb pyextension
-src = pjoin('lbfgsb', 'routines.f')
-lbfgsb_src = env.NumpyF2py(pjoin('lbfgsb', 'lbfgsb.pyf'))
-env.NumpyPythonExtension('_lbfgsb', source = [src] + lbfgsb_src,
+src = [pjoin('lbfgsb', i) for i in ['lbfgsb.pyf', 'routines.f']]
+env.NumpyPythonExtension('_lbfgsb', source = src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # _cobyla pyextension
-src = [pjoin('cobyla', i) for i in ['cobyla2.f', 'trstlp.f']]
-wrap_src = env.NumpyF2py(pjoin('cobyla', 'cobyla.pyf'))
-env.NumpyPythonExtension('_cobyla', source = src + wrap_src,
+src = [pjoin('cobyla', i) for i in ['cobyla2.f', 'trstlp.f', 'cobyla.pyf']]
+env.NumpyPythonExtension('_cobyla', source = src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # _minpack2 pyextension
-src = [pjoin('minpack2', i) for i in ['dcsrch.f', 'dcstep.f']]
-wrap_src = env.NumpyF2py(pjoin('minpack2', 'minpack2.pyf'))
-env.NumpyPythonExtension('minpack2', source = src + wrap_src,
+src = [pjoin('minpack2', i) for i in ['dcsrch.f', 'dcstep.f', 'minpack2.pyf']]
+env.NumpyPythonExtension('minpack2', source = src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # moduleTNC pyextension
@@ -88,7 +85,6 @@
                                                    ['moduleTNC.c', 'tnc.c']])
 
 # _slsqp pyextension
-src = pjoin('slsqp', 'slsqp_optmz.f')
-slsqp_src = env.NumpyF2py(pjoin('slsqp', 'slsqp.pyf'))
-env.NumpyPythonExtension('_slsqp', source = [src] + slsqp_src,
+src = [pjoin('slsqp', i) for i in ['slsqp_optmz.f', 'slsqp.pyf']]
+env.NumpyPythonExtension('_slsqp', source = src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConstruct
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-04-22 04:28:52 UTC (rev 4162)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-04-22 04:41:53 UTC (rev 4163)
@@ -42,6 +42,5 @@
 env.AppendUnique(CPPPATH = get_numpy_include_dirs())
 
 env.NumpyFromFTemplate('arpack.pyf', 'arpack.pyf.src')
-wsrc = env.NumpyF2py('arpack.pyf')
 env.Prepend(LIBS = 'arpack')
-env.NumpyPythonExtension('_arpack', source = wsrc)
+env.NumpyPythonExtension('_arpack', 'arpack.pyf')



More information about the Scipy-svn mailing list