[Scipy-svn] r4926 - trunk/scipy/sparse/linalg/eigen/arpack

scipy-svn@scip... scipy-svn@scip...
Sun Nov 2 19:23:52 CST 2008


Author: cdavid
Date: 2008-11-02 19:23:35 -0600 (Sun, 02 Nov 2008)
New Revision: 4926

Modified:
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
Log:
Do not add LAPACK files for accelerate/veclib.

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-11-03 00:44:10 UTC (rev 4925)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-11-03 01:23:35 UTC (rev 4926)
@@ -2,7 +2,7 @@
 
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77LAPACK, CheckF77Clib
-from numscons import write_info
+from numscons import write_info, IsAccelerate, IsVeclib
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
@@ -21,6 +21,7 @@
 if not st:
     raise RuntimeError("no lapack found, necessary for arpack module")
 
+use_c_calling = IsAccelerate(env, "lapack") or IsVeclib(env, "lapack)
 config.Finish()
 write_info(env)
 
@@ -42,8 +43,9 @@
 "dmout.f", "dvout.f", "icnteq.f", "icopy.f", "iset.f", "iswap.f", "ivout.f",
 "second.f", "smout.f", "svout.f", "zmout.f", "zvout.f"]]
 
-arpack_src += [pjoin('ARPACK', 'LAPACK', s) for s in [ "clahqr.f", "dlahqr.f",
-"slahqr.f", "zlahqr.f"]]
+if not use_c_calling:
+    arpack_src += [pjoin('ARPACK', 'LAPACK', s) for s in [ "clahqr.f", "dlahqr.f",
+    "slahqr.f", "zlahqr.f"]]
 
 src = [str(s) for s in arpack_src]
 



More information about the Scipy-svn mailing list