[Scipy-svn] r4437 - in trunk/scipy: lib/blas lib/lapack sparse/linalg/eigen/arpack sparse/linalg/isolve

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-06-12 05:58:13 -0500 (Thu, 12 Jun 2008)
New Revision: 4437

Modified:
   trunk/scipy/lib/blas/SConscript
   trunk/scipy/lib/lapack/SConscript
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
   trunk/scipy/sparse/linalg/isolve/SConscript
Log:
Replace depreacted NumpyFrom*Template builders by their new names.

Modified: trunk/scipy/lib/blas/SConscript
===================================================================
--- trunk/scipy/lib/blas/SConscript	2008-06-12 10:47:48 UTC (rev 4436)
+++ trunk/scipy/lib/blas/SConscript	2008-06-12 10:58:13 UTC (rev 4437)
@@ -64,13 +64,13 @@
 #------------
 #   fblas
 #------------
-env.NumpyFromFTemplate('fblas.pyf', 'fblas.pyf.src')
+env.FromFTemplate('fblas.pyf', 'fblas.pyf.src')
 source = ['fblas.pyf']
 if IsVeclib(env, 'blas') or IsAccelerate(env, 'blas'):
-    env.NumpyFromCTemplate('fblaswrap_veclib_c.c', 'fblaswrap_veclib_c.c.src')
+    env.FromCTemplate('fblaswrap_veclib_c.c', 'fblaswrap_veclib_c.c.src')
     source.append('fblaswrap_veclib_c.c')
 else:
-    env.NumpyFromFTemplate('fblaswrap.f', 'fblaswrap.f.src')
+    env.FromFTemplate('fblaswrap.f', 'fblaswrap.f.src')
     source.append('fblaswrap.f')
 env.DistutilsPythonExtension('fblas', source)
 
@@ -79,7 +79,7 @@
 #------------
 source = ['cblas.pyf']
 if has_cblas:
-    env.NumpyFromFTemplate('cblas.pyf', 'cblas.pyf.src')
+    env.FromFTemplate('cblas.pyf', 'cblas.pyf.src')
 else:
     print env.GenerateFakePyf('cblas', 'cblas.pyf.src')
 env.DistutilsPythonExtension('cblas', source)

Modified: trunk/scipy/lib/lapack/SConscript
===================================================================
--- trunk/scipy/lib/lapack/SConscript	2008-06-12 10:47:48 UTC (rev 4436)
+++ trunk/scipy/lib/lapack/SConscript	2008-06-12 10:58:13 UTC (rev 4437)
@@ -69,14 +69,14 @@
 #------------
 #   flapack
 #------------
-yop = env.NumpyFromFTemplate('flapack.pyf', 'flapack.pyf.src')
+yop = env.FromFTemplate('flapack.pyf', 'flapack.pyf.src')
 env.DistutilsPythonExtension('flapack', source = ['flapack.pyf'])
 
 #------------
 #   clapack
 #------------
 if has_clapack:
-    env.NumpyFromFTemplate('clapack.pyf', 'clapack.pyf.src')
+    env.FromFTemplate('clapack.pyf', 'clapack.pyf.src')
 else:
     env.GenerateFakePyf('clapack', 'clapack.pyf.src')
 env.DistutilsPythonExtension('clapack', source = 'clapack.pyf')

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 10:47:48 UTC (rev 4436)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-06-12 10:58:13 UTC (rev 4437)
@@ -42,6 +42,6 @@
 env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
 env.AppendUnique(CPPPATH = get_numpy_include_dirs())
 
-env.NumpyFromFTemplate('arpack.pyf', 'arpack.pyf.src')
+env.FromFTemplate('arpack.pyf', 'arpack.pyf.src')
 env.Prepend(LIBS = 'arpack')
 env.DistutilsPythonExtension('_arpack', 'arpack.pyf')

Modified: trunk/scipy/sparse/linalg/isolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/isolve/SConscript	2008-06-12 10:47:48 UTC (rev 4436)
+++ trunk/scipy/sparse/linalg/isolve/SConscript	2008-06-12 10:58:13 UTC (rev 4437)
@@ -52,7 +52,7 @@
 sources = []
 for method in raw_sources:
     target = splitext(method)[0]
-    res = env.NumpyFromFTemplate(target, pjoin('iterative', method))
+    res = env.FromFTemplate(target, pjoin('iterative', method))
     sources.append(res[0])
 
 env.DistutilsPythonExtension('_iterative', source = sources)