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

numpy-svn@scip... numpy-svn@scip...
Mon Nov 26 04:07:32 CST 2007


Author: cdavid
Date: 2007-11-26 04:05:05 -0600 (Mon, 26 Nov 2007)
New Revision: 4509

Modified:
   branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py
   branches/numpy.scons/numpy/distutils/scons/checkers/perflib.py
   branches/numpy.scons/numpy/scons_fake/ctypesext/foo_py.py
Log:
Fix typo which used vecLib configuration in Sunperf checker

Modified: branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py	2007-11-26 06:29:01 UTC (rev 4508)
+++ branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py	2007-11-26 10:05:05 UTC (rev 4509)
@@ -219,7 +219,7 @@
                 return st
 
             # Check Sunperf
-            st = check(CheckSunperf, 'Sunperf', ['lapack'])
+            st = check(CheckSunperf, 'Sunperf', [])
             if st:
                 return st
 

Modified: branches/numpy.scons/numpy/distutils/scons/checkers/perflib.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/checkers/perflib.py	2007-11-26 06:29:01 UTC (rev 4508)
+++ branches/numpy.scons/numpy/distutils/scons/checkers/perflib.py	2007-11-26 10:05:05 UTC (rev 4509)
@@ -333,7 +333,7 @@
 
 def CheckSunperf(context, autoadd = 1, check_version = 0):
     """Checker for sunperf."""
-    cfg = _CONFIG['vecLib']
+    cfg = _CONFIG['Sunperf']
     
     st, res = _check(context, cfg.name, cfg.section, cfg.defopts, cfg.headers,
                      cfg.funcs, check_version, None, autoadd)
@@ -383,7 +383,7 @@
         pa = floupi(out)
         for k, v in pa.items():
     	    opts[k].extend(deepcopy(v))
-        res = ConfigRes(name, opts, res.is_customized())
+        res = ConfigRes(cfg.name, opts, res.is_customized())
 	context.Result('Succeeded !')
     else:
         st = 0

Modified: branches/numpy.scons/numpy/scons_fake/ctypesext/foo_py.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/ctypesext/foo_py.py	2007-11-26 06:29:01 UTC (rev 4508)
+++ branches/numpy.scons/numpy/scons_fake/ctypesext/foo_py.py	2007-11-26 10:05:05 UTC (rev 4509)
@@ -1,6 +1,10 @@
-from numpy.ctypeslib import load_library
+try:
+	from numpy.ctypeslib import load_library
+	_FOO = load_library("foo", __file__)
+	def foo():
+	    _FOO.foo()
+except ImportError:
+	print "ctypes not available"
+	def foo():
+	    pass
 
-_FOO = load_library("foo", __file__)
-def foo():
-    _FOO.foo()
-    



More information about the Numpy-svn mailing list