diff options
| author | David Cournapeau <cournape@gmail.com> | 2012-06-01 00:14:14 +0900 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2012-06-01 03:11:14 +0900 |
| commit | fd78546183651fc47c2d3429d03bed0a4299d475 (patch) | |
| tree | 7b8a99c03fd93c51c31aed3a1e151972ca8582a1 /bscript | |
| parent | 7ec6cf4216abbe3539ce0cca3d53a436c1e6deb5 (diff) | |
| download | numpy-fd78546183651fc47c2d3429d03bed0a4299d475.tar.gz | |
BUG: fix CBLAS/LAPACK detection logic.
Diffstat (limited to 'bscript')
| -rw-r--r-- | bscript | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -45,32 +45,42 @@ def check_blas_lapack(conf): conf.check_cc(lib=mkl_libs, msg="Checking for MKL (CBLAS)", uselib_store="CBLAS") conf.env.HAS_CBLAS = True + except waflib.Errors.ConfigurationError: + conf.env.HAS_LAPACK = False + try: conf.check_cc(lib=mkl_libs, msg="Checking for MKL (LAPACK)", uselib_store="LAPACK") conf.env.HAS_LAPACK = True except waflib.Errors.ConfigurationError: - pass + conf.env.HAS_LAPACK = False + elif sys.platform == "darwin": try: - conf.check(framework="Accelerate", msg="Checking for framework Accelerate", uselib_store="CBLAS") + conf.check(framework="Accelerate", msg="Checking for framework Accelerate (CBLAS)", uselib_store="CBLAS") conf.env.HAS_CBLAS = True + except waflib.Errors.ConfigurationError: + conf.env.HAS_CBLAS = False - conf.check(framework="Accelerate", msg="Checking for framework Accelerate", uselib_store="LAPACK") + try: + conf.check(framework="Accelerate", msg="Checking for framework Accelerate (LAPACK)", uselib_store="LAPACK") conf.env.HAS_LAPACK = True except waflib.Errors.ConfigurationError: - pass + conf.env.HAS_LAPACK = False else: try: conf.check_cc(lib=["cblas", "atlas"], uselib_store="CBLAS") conf.env.HAS_CBLAS = True + except waflib.Errors.ConfigurationError: + conf.env.HAS_CBLAS = False + try: conf.check_cc(lib=["lapack", "f77blas", "cblas", "atlas"], uselib_store="LAPACK") conf.env.HAS_LAPACK = True except waflib.Errors.ConfigurationError: - pass + conf.env.HAS_LAPACK = False # You can manually set up blas/lapack as follows: #conf.env.HAS_CBLAS = True |