diff options
| author | David Cournapeau <cournape@gmail.com> | 2008-03-22 07:04:43 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2008-03-22 07:04:43 +0000 |
| commit | fd1cbdfd4f32834e813391e546dbc31fb51287d9 (patch) | |
| tree | 41cacd5428fff285729a253a75ac01268087e53e /numpy/distutils/cpuinfo.py | |
| parent | b2bbe268dd106b5c8252cc0d9ebf31b26dc19c5b (diff) | |
| download | numpy-fd1cbdfd4f32834e813391e546dbc31fb51287d9.tar.gz | |
Include patch from jsbronder to fix ticket #644 related to nocona cpu detection.
Diffstat (limited to 'numpy/distutils/cpuinfo.py')
| -rw-r--r-- | numpy/distutils/cpuinfo.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py index 2404fec19..acc32a247 100644 --- a/numpy/distutils/cpuinfo.py +++ b/numpy/distutils/cpuinfo.py @@ -231,7 +231,11 @@ class LinuxCPUInfo(CPUInfoBase): return self.is_PentiumIV() and self.has_sse3() def _is_Nocona(self): - return self.is_64bit() and self.is_PentiumIV() + return self.is_Intel() \ + and (self.info[0]['cpu family'] == '6' \ + or self.info[0]['cpu family'] == '15' ) \ + and self.has_sse3() \ + and re.match(r'.*?\blm\b',self.info[0]['flags']) is not None def _is_Core2(self): return self.is_64bit() and self.is_Intel() and \ |