[Numpy-svn] r4407 - in branches/numpy.scons/numpy: distutils/scons distutils/scons/checkers scons_fake/checkers

numpy-svn@scip... numpy-svn@scip...
Tue Nov 6 05:16:13 CST 2007


Author: cdavid
Date: 2007-11-06 05:16:05 -0600 (Tue, 06 Nov 2007)
New Revision: 4407

Modified:
   branches/numpy.scons/numpy/distutils/scons/Changelog
   branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py
   branches/numpy.scons/numpy/scons_fake/checkers/SConstruct
Log:
Fix invalid CBLAS and LAPACK checks when used with atlas

Modified: branches/numpy.scons/numpy/distutils/scons/Changelog
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/Changelog	2007-11-06 11:08:06 UTC (rev 4406)
+++ branches/numpy.scons/numpy/distutils/scons/Changelog	2007-11-06 11:16:05 UTC (rev 4407)
@@ -1,5 +1,9 @@
 Tue, 06 Nov 2007 16:48:51 +0900
 User-visible Changes:
+	* NumpyCheckLibAndHeader checker. This can be used as a generic
+	checker for simple checks (list of libraries/headers/symbols to
+	check).
+
 	* LAPACK and CBLAS checkers are now overridable from site.cfg
 
 	* CheckF77Mangling and CheckF90Mangling define variables

Modified: branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py	2007-11-06 11:08:06 UTC (rev 4406)
+++ branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py	2007-11-06 11:16:05 UTC (rev 4407)
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# Last Change: Tue Nov 06 06:00 PM 2007 J
+# Last Change: Tue Nov 06 08:00 PM 2007 J
 
 # Module for custom, common checkers for numpy (and scipy)
 import sys
@@ -80,6 +80,7 @@
             # Check ATLAS
             st, res = CheckATLAS(context, autoadd)
             if st:
+                res.cfgopts['libs'].insert(0, 'blas')
                 st = check_include_and_run(context, 'CBLAS (ATLAS)', res.cfgopts,
                                            [], cblas_src, autoadd)
                 if st:
@@ -176,8 +177,9 @@
                 return st
 
             # Check ATLAS
-            st, opts = CheckATLAS(context, autoadd = 1)
+            st, res = CheckATLAS(context, autoadd = 1)
             if st:
+                res.cfgopts['libs'].insert(0, 'lapack')
                 st = check_include_and_run(context, 'LAPACK (ATLAS)', res.cfgopts,
                                            [], test_src, autoadd)
                 if st:

Modified: branches/numpy.scons/numpy/scons_fake/checkers/SConstruct
===================================================================
--- branches/numpy.scons/numpy/scons_fake/checkers/SConstruct	2007-11-06 11:08:06 UTC (rev 4406)
+++ branches/numpy.scons/numpy/scons_fake/checkers/SConstruct	2007-11-06 11:16:05 UTC (rev 4407)
@@ -9,10 +9,11 @@
 
 import os
 try:
-    os.environ['DEBUG_SCONS_CHECK']
+    val = os.environ['DEBUG_SCONS_CHECK']
+    do_check = val
+except KeyError:
     do_check = 1
-except KeyError:
-    do_check = 0
+print "do_check is %s" % do_check
 
 config = env.NumpyConfigure(custom_tests = 
     {'CheckATLAS' : CheckATLAS,
@@ -23,8 +24,7 @@
     'CheckF77Mangling' : CheckF77Mangling,
     'CheckSunperf' : CheckSunperf})
 
-do_check = 1
-if do_check:
+if do_check == 1:
     st, opts = config.CheckATLAS(autoadd = 0)
     st, opts = config.CheckMKL(autoadd = 0)
     st, opts = config.CheckAccelerate(autoadd = 0)



More information about the Numpy-svn mailing list