Skip to content

Commit

Permalink
BLD: fix up detection of Intel CPU on OS X in system_info.py.
Browse files Browse the repository at this point in the history
  • Loading branch information
rgommers committed Oct 17, 2011
1 parent 1dc1877 commit ec56ee1
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions numpy/distutils/system_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
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
Expand Down Expand Up @@ -1275,7 +1276,6 @@ def get_atlas_version(**config):
result = _cached_atlas_version[key] = atlas_version, info
return result

from distutils.util import get_platform

class lapack_opt_info(system_info):

Expand All @@ -1286,7 +1286,8 @@ def calc_info(self):
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
Expand Down Expand Up @@ -1373,7 +1374,8 @@ def calc_info(self):
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
Expand Down

0 comments on commit ec56ee1

Please sign in to comment.