[Scipy-svn] r4537 - in trunk/scipy: integrate interpolate lib/lapack odr optimize special stats

scipy-svn@scip... scipy-svn@scip...
Wed Jul 9 22:32:24 CDT 2008


Author: cdavid
Date: 2008-07-09 22:32:10 -0500 (Wed, 09 Jul 2008)
New Revision: 4537

Modified:
   trunk/scipy/integrate/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/lib/lapack/SConscript
   trunk/scipy/odr/SConscript
   trunk/scipy/optimize/SConscript
   trunk/scipy/special/SConscript
   trunk/scipy/stats/SConscript
Log:
Remove F77 runtime handling: this is automatically handled by numscons now.

Modified: trunk/scipy/integrate/SConscript
===================================================================
--- trunk/scipy/integrate/SConscript	2008-07-09 12:51:55 UTC (rev 4536)
+++ trunk/scipy/integrate/SConscript	2008-07-10 03:32:10 UTC (rev 4537)
@@ -9,11 +9,8 @@
 env.Tool('f2py')
 
 # Configuration
-config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib,
-                                            'CheckF77BLAS' : CheckF77BLAS})
+config = env.NumpyConfigure(custom_tests = {'CheckF77BLAS' : CheckF77BLAS})
 
-if not config.CheckF77Clib():
-    raise Exception("Could not check F77 runtime, needed for interpolate")
 if not config.CheckF77BLAS():
     raise Exception("Could not find F77 BLAS, needed for integrate package")
 
@@ -56,7 +53,6 @@
 odepack = env.DistutilsStaticExtLibrary('odepack', source = src)
 
 env.AppendUnique(LIBPATH = '.')
-env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
 
 quadenv = env.Clone()
 quadenv.Prepend(LIBS = ['quadpack', 'linpack_lite', 'mach'])

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2008-07-09 12:51:55 UTC (rev 4536)
+++ trunk/scipy/interpolate/SConscript	2008-07-10 03:32:10 UTC (rev 4537)
@@ -12,8 +12,6 @@
     raise Exception("Could not check F77 runtime, needed for interpolate")
 config.Finish()
 
-env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
-
 # Build fitpack
 src = [pjoin("fitpack", s) for s in ["bispev.f", "clocur.f", "cocosp.f",
 "concon.f", "concur.f", "cualde.f", "curev.f", "curfit.f", "dblint.f",

Modified: trunk/scipy/lib/lapack/SConscript
===================================================================
--- trunk/scipy/lib/lapack/SConscript	2008-07-09 12:51:55 UTC (rev 4536)
+++ trunk/scipy/lib/lapack/SConscript	2008-07-10 03:32:10 UTC (rev 4537)
@@ -32,10 +32,6 @@
 #--------------
 # Checking Blas
 #--------------
-if not config.CheckF77Clib():
-    raise RuntimeError("Could not check F/C runtime library for %s/%s, " \
-                       "contact the maintainer" % (env['CC'], env['F77']))
-
 st = config.CheckLAPACK(check_version = 1)
 if not st:
     raise RuntimeError("no lapack found, necessary for lapack module")
@@ -83,8 +79,7 @@
 #----------------
 calc_src = env.F2py(pjoin('calc_lworkmodule.c'), 
                          source = pjoin('calc_lwork.f'))
-env.NumpyPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'])
 
 #--------------
 # Atlas version

Modified: trunk/scipy/odr/SConscript
===================================================================
--- trunk/scipy/odr/SConscript	2008-07-09 12:51:55 UTC (rev 4536)
+++ trunk/scipy/odr/SConscript	2008-07-10 03:32:10 UTC (rev 4537)
@@ -19,8 +19,7 @@
 #=======================
 # Starting Configuration
 #=======================
-config = env.NumpyConfigure(custom_tests = {'CheckBLAS' : CheckF77BLAS, 
-                                            'CheckF77Clib' : CheckF77Clib})
+config = env.NumpyConfigure(custom_tests = {'CheckBLAS' : CheckF77BLAS}) 
 
 if not config.CheckF77Clib():
     raise RuntimeError("Could not check F/C runtime library for %s/%s, " \
@@ -55,5 +54,4 @@
 env.PrependUnique(LIBPATH = '.')
 
 # odr pyextension
-env.NumpyPythonExtension('__odrpack', '__odrpack.c',
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('__odrpack', '__odrpack.c')

Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript	2008-07-09 12:51:55 UTC (rev 4536)
+++ trunk/scipy/optimize/SConscript	2008-07-10 03:32:10 UTC (rev 4537)
@@ -21,16 +21,11 @@
 #=======================
 # Starting Configuration
 #=======================
-config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK,
-                                            'CheckF77Clib' : CheckF77Clib})
+config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK})
 
 #-----------------
 # Checking Lapack
 #-----------------
-if not config.CheckF77Clib():
-    raise RuntimeLibrary("Could not check C/F runtime library for %s/%s"\
-                         " , contact the maintainer" % (env['CC'], env['F77']))
-
 st = config.CheckLAPACK()
 if not st:
     has_lapack = 0
@@ -61,26 +56,22 @@
 env.AppendUnique(LIBPATH = '.')
 
 # _minpack pyextension
-env.NumpyPythonExtension('_minpack', '_minpackmodule.c',
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('_minpack', '_minpackmodule.c')
 
 # _zeros pyextension
 env.NumpyPythonExtension('_zeros', 'zeros.c')
 
 # _lbfgsb pyextension
 src = [pjoin('lbfgsb', i) for i in ['lbfgsb.pyf', 'routines.f']]
-env.NumpyPythonExtension('_lbfgsb', source = src,
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('_lbfgsb', source = src)
 
 # _cobyla pyextension
 src = [pjoin('cobyla', i) for i in ['cobyla2.f', 'trstlp.f', 'cobyla.pyf']]
-env.NumpyPythonExtension('_cobyla', source = src,
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('_cobyla', source = src)
 
 # _minpack2 pyextension
 src = [pjoin('minpack2', i) for i in ['dcsrch.f', 'dcstep.f', 'minpack2.pyf']]
-env.NumpyPythonExtension('minpack2', source = src,
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('minpack2', source = src)
 
 # moduleTNC pyextension
 env.NumpyPythonExtension('moduleTNC', 
@@ -89,5 +80,4 @@
 
 # _slsqp pyextension
 src = [pjoin('slsqp', i) for i in ['slsqp_optmz.f', 'slsqp.pyf']]
-env.NumpyPythonExtension('_slsqp', source = src,
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('_slsqp', source = src)

Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript	2008-07-09 12:51:55 UTC (rev 4536)
+++ trunk/scipy/special/SConscript	2008-07-10 03:32:10 UTC (rev 4537)
@@ -50,11 +50,9 @@
 env.NumpyPythonExtension('_cephes', 
                          source = src, 
                          LIBS = ['amos', 'toms', 'c_misc', 'cephes', 'mach',\
-                                 'cdf', 'specfunlib'], 
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+                                 'cdf', 'specfunlib']) 
 
 # Specfun extension
 env.Prepend(LIBS = ['specfunlib'])
 env.NumpyPythonExtension('specfun', source = 'specfun.pyf',
-                         F2PYOPTIONS = ["--no-wrap-functions"],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+                         F2PYOPTIONS = ["--no-wrap-functions"])

Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript	2008-07-09 12:51:55 UTC (rev 4536)
+++ trunk/scipy/stats/SConscript	2008-07-10 03:32:10 UTC (rev 4537)
@@ -22,14 +22,11 @@
 # Statlib extension
 env.NumpyPythonExtension('statlib', source = 'statlib.pyf', 
                          F2PYOPTIONS = ["--no-wrap-functions"],
-                         LIBS = 'statlibimp',
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+                         LIBS = 'statlibimp')
 
 # futil extension
 futil_src = env.F2py(pjoin('futilmodule.c'), pjoin('futil.f'))
-env.NumpyPythonExtension('futil', source = futil_src + ['futil.f'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('futil', source = futil_src + ['futil.f'])
 
 # mvn extension
-env.NumpyPythonExtension('mvn', source = ['mvn.pyf', 'mvndst.f'],
-                         LINKFLAGSEND = env['F77_LDFLAGS'])
+env.NumpyPythonExtension('mvn', source = ['mvn.pyf', 'mvndst.f'])



More information about the Scipy-svn mailing list