diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2011-10-17 22:54:18 +0200 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2011-10-17 23:16:44 +0200 |
| commit | ec56ee1c4ef750c9db7b2ab6ab4bf1658971a070 (patch) | |
| tree | 363f063a04830aa841021ea06aab68521d10d129 | |
| parent | 1dc1877493312eb5fe107729a9309e8636968891 (diff) | |
| download | numpy-ec56ee1c4ef750c9db7b2ab6ab4bf1658971a070.tar.gz | |
BLD: fix up detection of Intel CPU on OS X in system_info.py.
| -rw-r--r-- | numpy/distutils/system_info.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 9d3d9d079..7994583f0 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -125,6 +125,7 @@ from distutils.errors import DistutilsError from distutils.dist import Distribution import distutils.sysconfig from distutils import log +from distutils.util import get_platform from numpy.distutils.exec_command import \ find_executable, exec_command, get_pythonexe @@ -1275,7 +1276,6 @@ Make sure that -lgfortran is used for C++ extensions. result = _cached_atlas_version[key] = atlas_version, info return result -from distutils.util import get_platform class lapack_opt_info(system_info): @@ -1286,7 +1286,8 @@ class lapack_opt_info(system_info): if sys.platform=='darwin' and not os.environ.get('ATLAS',None): args = [] link_args = [] - if get_platform()[-4:] == 'i386': + if get_platform()[-4:] == 'i386' or 'intel' in get_platform() or \ + 'i386' in platform.platform(): intel = 1 else: intel = 0 @@ -1373,7 +1374,8 @@ class blas_opt_info(system_info): if sys.platform=='darwin' and not os.environ.get('ATLAS',None): args = [] link_args = [] - if get_platform()[-4:] == 'i386': + if get_platform()[-4:] == 'i386' or 'intel' in get_platform() or \ + 'i386' in platform.platform(): intel = 1 else: intel = 0 |