[Numpy-svn] r5374 - branches/1.1.x/numpy/core

numpy-svn@scip... numpy-svn@scip...
Wed Jul 9 05:23:56 CDT 2008


Author: cdavid
Date: 2008-07-09 05:23:50 -0500 (Wed, 09 Jul 2008)
New Revision: 5374

Modified:
   branches/1.1.x/numpy/core/SConscript
Log:
merge 5304: update dotblas build with numscons.

Modified: branches/1.1.x/numpy/core/SConscript
===================================================================
--- branches/1.1.x/numpy/core/SConscript	2008-07-09 10:17:18 UTC (rev 5373)
+++ branches/1.1.x/numpy/core/SConscript	2008-07-09 10:23:50 UTC (rev 5374)
@@ -263,5 +263,12 @@
 #----------------------
 if build_blasdot:
     dotblas_src = [pjoin('blasdot', i) for i in ['_dotblas.c']]
-    dotblas = env.DistutilsPythonExtension('_dotblas', source = dotblas_src)
-    env.Depends(dotblas, pjoin("blasdot", "cblas.h"))
+    # because _dotblas does #include CBLAS_HEADER instead of #include
+    # "cblas.h", scons does not detect the dependency
+    # XXX: PythonExtension builder does not take the Depends on extension into
+    # account for some reason, so we first build the object, with forced
+    # dependency, and then builds the extension. This is more likely a bug in
+    # our PythonExtension builder, but I cannot see how to solve it.
+    dotblas_o = env.PythonObject('_dotblas', source = dotblas_src)
+    env.Depends(dotblas_o, pjoin("blasdot", "cblas.h"))
+    dotblas = env.DistutilsPythonExtension('_dotblas', dotblas_o)



More information about the Numpy-svn mailing list