[Numpy-svn] r4388 - branches/numpy.scons/numpy/distutils/scons/checkers

numpy-svn@scip... numpy-svn@scip...
Mon Nov 5 04:23:10 CST 2007


Author: cdavid
Date: 2007-11-05 04:23:07 -0600 (Mon, 05 Nov 2007)
New Revision: 4388

Modified:
   branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py
Log:
Support Mac OS X Accelerate for LAPACK checker.

Modified: branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py	2007-11-05 10:11:27 UTC (rev 4387)
+++ branches/numpy.scons/numpy/distutils/scons/checkers/custom_checkers.py	2007-11-05 10:23:07 UTC (rev 4388)
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# Last Change: Wed Oct 31 07:00 PM 2007 J
+# Last Change: Mon Nov 05 07:00 PM 2007 J
 
 # Module for custom, common checkers for numpy (and scipy)
 import sys
@@ -75,19 +75,18 @@
     if found:
         raise NotImplementedError("FIXME: siteconfig for lapack")
         # XXX: adapt this to libperf refactor
-        headers = ['cblas.h']
-        linkflags = []
-        cflags = []
-        st = check_include_and_run(context, 'CBLAS', [], headers, cblas_src,
-                                      libs, libpath, linkflags, cflags, autoadd)
-        if st:
-            add_info(env, 'cblas', opt_info('cblas', site = 1))
-            return st
     else:
         if sys.platform == 'nt':
             import warnings
             warning.warn('FIXME: LAPACK checks not implemented yet on win32')
             return 0
+        if sys.platform == 'darwin':
+            st, opts = CheckAccelerate(context, autoadd)
+            if st:
+                if st:
+                    add_info(env, 'lapack: Accelerate', opts)
+                return st
+
         else:
             env = context.env
 
@@ -99,6 +98,9 @@
                 if not CheckF77Clib(context):
                     return 0
 
+            # XXX: all the code below is a mess, refactor it with new code from
+            # support module.
+
             # Get the mangled name of our test function
             sgesv_string = env['F77_NAME_MANGLER']('sgesv')
             test_src = lapack_sgesv % sgesv_string



More information about the Numpy-svn mailing list