From fd1cbdfd4f32834e813391e546dbc31fb51287d9 Mon Sep 17 00:00:00 2001 From: David Cournapeau Date: Sat, 22 Mar 2008 07:04:43 +0000 Subject: Include patch from jsbronder to fix ticket #644 related to nocona cpu detection. --- numpy/distutils/cpuinfo.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'numpy/distutils/cpuinfo.py') 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 \ -- cgit v1.2.1