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

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-11-02 19:28:19 -0600 (Sun, 02 Nov 2008)
New Revision: 4931

Modified:
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
Log:
Use custom wrappers for dot and cladiv/zladiv funcs with Accelerate, dummy wrappers eveywhere else.

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-11-03 01:26:58 UTC (rev 4930)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-11-03 01:28:19 UTC (rev 4931)
@@ -21,7 +21,7 @@
 if not st:
     raise RuntimeError("no lapack found, necessary for arpack module")
 
-use_c_calling = IsAccelerate(env, "lapack") or IsVeclib(env, "lapack)
+use_c_calling = IsAccelerate(env, "lapack") or IsVeclib(env, "lapack")
 config.Finish()
 write_info(env)
 
@@ -43,9 +43,13 @@
 "dmout.f", "dvout.f", "icnteq.f", "icopy.f", "iset.f", "iswap.f", "ivout.f",
 "second.f", "smout.f", "svout.f", "zmout.f", "zvout.f"]]
 
-if not use_c_calling:
-    arpack_src += [pjoin('ARPACK', 'LAPACK', s) for s in [ "clahqr.f", "dlahqr.f",
-    "slahqr.f", "zlahqr.f"]]
+if use_c_calling:
+    arpack_src += [pjoin('ARPACK', 'FWRAPPERS', 'veclib_cabi_f.f'),
+                   pjoin('ARPACK', 'FWRAPPERS', 'veclib_cabi_c.c')]
+else:
+    arpack_src += [pjoin('ARPACK', 'FWRAPPERS', 'dummy.f')]
+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]