[Scipy-svn] r6213 - in branches/0.7.x/scipy: lib/lapack sparse/linalg/dsolve sparse/linalg/eigen/arpack

scipy-svn@scip... scipy-svn@scip...
Tue Feb 2 23:14:38 CST 2010


Author: cdavid
Date: 2010-02-02 23:14:38 -0600 (Tue, 02 Feb 2010)
New Revision: 6213

Modified:
   branches/0.7.x/scipy/lib/lapack/SConscript
   branches/0.7.x/scipy/sparse/linalg/dsolve/SConscript
   branches/0.7.x/scipy/sparse/linalg/eigen/arpack/SConscript
Log:
BUG: update scons scripts to last numscons.

Modified: branches/0.7.x/scipy/lib/lapack/SConscript
===================================================================
--- branches/0.7.x/scipy/lib/lapack/SConscript	2010-02-02 03:35:23 UTC (rev 6212)
+++ branches/0.7.x/scipy/lib/lapack/SConscript	2010-02-03 05:14:38 UTC (rev 6213)
@@ -53,7 +53,7 @@
 #==========
 #  Build
 #==========
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
+env.AppendUnique(CPPPATH=[env['F2PYINCLUDEDIR']])
 env.AppendUnique(F2PYOPTIONS = '--quiet')
 
 env['BUILDERS']['GenerateFakePyf'] = Builder(action = do_generate_fake_interface,

Modified: branches/0.7.x/scipy/sparse/linalg/dsolve/SConscript
===================================================================
--- branches/0.7.x/scipy/sparse/linalg/dsolve/SConscript	2010-02-02 03:35:23 UTC (rev 6212)
+++ branches/0.7.x/scipy/sparse/linalg/dsolve/SConscript	2010-02-03 05:14:38 UTC (rev 6213)
@@ -4,6 +4,7 @@
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77LAPACK
 from numscons import write_info
+from numscons.core.misc import built_with_mstools, built_with_gnu_f77
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
@@ -24,10 +25,10 @@
 
 # Build superlu lib
 superlu_env = env.Clone()
-superlu_def = {}
+superlu_def = []
 if sys.platform == 'win32':
-    superlu_def['NO_TIMER'] = 1
-superlu_def['USE_VENDOR_BLAS'] = 2
+    superlu_def.append((('NO_TIMER'), 1))
+superlu_def.append((('USE_VENDOR_BLAS'), 2))
 superlu_env.Append(CPPDEFINES = superlu_def)
 
 superlu_src = [pjoin('SuperLU', 'SRC', s) for s in [ "ccolumn_bmod.c",
@@ -42,7 +43,7 @@
 "dpanel_bmod.c", "dpanel_dfs.c", "dpivotL.c", "dpivotgrowth.c", "dpruneL.c",
 "dreadhb.c", "dsnode_bmod.c", "dsnode_dfs.c", "dsp_blas2.c", "dsp_blas3.c",
 "dutil.c", "dzsum1.c", "get_perm_c.c", "heap_relax_snode.c", "icmax1.c",
-"izmax1.c", "lsame.c", "memory.c", "mmd.c", "relax_snode.c", "scolumn_bmod.c",
+"izmax1.c", "memory.c", "mmd.c", "relax_snode.c", "scolumn_bmod.c",
 "scolumn_dfs.c", "scomplex.c", "scopy_to_ucol.c", "scsum1.c", "sgscon.c",
 "sgsequ.c", "sgsrfs.c", "sgssv.c", "sgssvx.c", "sgstrf.c", "sgstrs.c",
 "slacon.c", "slamch.c", "slangs.c", "slaqgs.c", "smemory.c", "sp_coletree.c",
@@ -54,6 +55,11 @@
 "zlacon.c", "zlangs.c", "zlaqgs.c", "zmemory.c", "zpanel_bmod.c",
 "zpanel_dfs.c", "zpivotL.c", "zpivotgrowth.c", "zpruneL.c", "zreadhb.c",
 "zsnode_bmod.c", "zsnode_dfs.c", "zsp_blas2.c", "zsp_blas3.c", "zutil.c"]]
+
+# XXX: we should detect whether lsame is already defined in BLAS/LAPACK. Here,
+# when using MSVC + MKL, lsame is already in MKL
+if not (built_with_mstools(env) and (not built_with_gnu_f77(env))):
+    superlu_src.append(pjoin("SuperLU", "SRC", "lsame.c"))
 superlu = superlu_env.DistutilsStaticExtLibrary('superlu_src', source = superlu_src)
 
 # Build python extensions

Modified: branches/0.7.x/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- branches/0.7.x/scipy/sparse/linalg/eigen/arpack/SConscript	2010-02-02 03:35:23 UTC (rev 6212)
+++ branches/0.7.x/scipy/sparse/linalg/eigen/arpack/SConscript	2010-02-03 05:14:38 UTC (rev 6213)
@@ -53,9 +53,9 @@
 
 src = [str(s) for s in arpack_src]
 
-env.AppendUnique(CPPPATH = pjoin('ARPACK', 'SRC'))
-env.AppendUnique(F77PATH = pjoin('ARPACK', 'SRC'))
-env.AppendUnique(LIBPATH = '.')
+env.AppendUnique(CPPPATH = [pjoin('ARPACK', 'SRC')])
+env.AppendUnique(F77PATH = [pjoin('ARPACK', 'SRC')])
+env.AppendUnique(LIBPATH = ['.'])
 arpack_lib = env.DistutilsStaticExtLibrary('arpack', source = src)
 
 # Build _arpack extension



More information about the Scipy-svn mailing list