[Numpy-svn] r3615 - trunk/numpy/distutils

numpy-svn@scip... numpy-svn@scip...
Thu Mar 29 16:38:01 CDT 2007


Author: cookedm
Date: 2007-03-29 16:37:58 -0500 (Thu, 29 Mar 2007)
New Revision: 3615

Modified:
   trunk/numpy/distutils/cpuinfo.py
Log:
cpuinfo: Nocona is a PentiumIV, not 686. Fixes #438

Modified: trunk/numpy/distutils/cpuinfo.py
===================================================================
--- trunk/numpy/distutils/cpuinfo.py	2007-03-29 20:47:40 UTC (rev 3614)
+++ trunk/numpy/distutils/cpuinfo.py	2007-03-29 21:37:58 UTC (rev 3615)
@@ -185,13 +185,13 @@
         return self.is_PentiumIV() and self.has_sse3()
 
     def _is_Nocona(self):
-        return self.is_64bit() and self.is_i686()
-    
+        return self.is_64bit() and self.is_PentiumIV()
+
     def _is_Core2(self):
         return self.is_64bit() and self.is_Intel() and \
                re.match(r'.*?Core\(TM\)2\b', \
                         self.info[0]['model name']) is not None
-    
+
     def _is_Itanium(self):
         return re.match(r'.*?Itanium\b',
                         self.info[0]['family']) is not None



More information about the Numpy-svn mailing list