BENTO: update arpack, isolve and blas.

scipy · Aug 30, 2011 · bfbb88a · bfbb88a
1 parent 1ac9633
commit bfbb88a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/scipy/linalg/bento.info b/scipy/linalg/bento.info
@@ -3,7 +3,7 @@ HookFile: bscript
 Library:
     Extension: fblas
         Sources:
-            generic_fblas.pyf,
+            fblas.pyf.src,
             src/fblaswrap.f
     Extension: cblas
         Sources:

diff --git a/scipy/linalg/bscript b/scipy/linalg/bscript
@@ -12,11 +12,10 @@ def pre_build(context):
         if sys.platform == "darwin":
             source.pop(source.index("src/fblaswrap.f"))
             source.append("src/fblaswrap_veclib_c.c")
-        t = bld(features="c pyext bento cloadable f2py",
-                source=source,
-                target=extension.name,
-                use="FBLAS")
-        t.mappings[".pyf"] = f2py.interface_gen_callback
+        bld(features="c fc pyext bento cloadable f2py",
+            source=source,
+            target=extension.name,
+            use="FBLAS")
     context.register_builder("fblas", builder)
 
     def builder(extension):

diff --git a/scipy/sparse/linalg/eigen/arpack/bscript b/scipy/sparse/linalg/eigen/arpack/bscript
@@ -18,9 +18,11 @@ def pre_build(context):
             sources.append("ARPACK/FWRAPPERS/veclib_cabi_c.c")
         else:
             sources.append("ARPACK/FWRAPPERS/dummy.f")
-        bld(features="c fc cstlib",
+        bld(features="c fc cstlib pyext bento",
             source=sources,
-            target=extension.name)
+            target=extension.name,
+            # Hack to make use of claoadable flags for static archive
+            use="cloadable")
     context.register_compiled_library_builder("arpack", builder)
 
     def builder(extension):

diff --git a/scipy/sparse/linalg/isolve/bscript b/scipy/sparse/linalg/isolve/bscript
@@ -7,8 +7,18 @@ def pre_build(context):
     bld = context.waf_context
 
     def builder(extension):
+        if sys.platform == "darwin":
+            use_c_calling = True
+        else:
+            use_c_calling = False
+        sources = extension.sources[:]
+        if use_c_calling:
+            sources.append("iterative/FWRAPPERS/veclib_cabi_f.f")
+            sources.append("iterative/FWRAPPERS/veclib_cabi_c.c")
+        else:
+            sources.append("iterative/FWRAPPERS/dummy.f")
         bld(features="c pyext fc bento cloadable f2py",
-            source=extension.sources,
+            source=sources,
             target=extension.name,
             use="FLAPACK")
     context.register_builder("_iterative", builder)