rpms/numpy/FC-5 numpy-1.0.1-cpuinfo.patch, NONE, 1.1 numpy.spec, 1.8, 1.9

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/numpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14079

Modified Files:
	numpy.spec 
Added Files:
	numpy-1.0.1-cpuinfo.patch 
Log Message:
Fix cpuinfo bug (#229753)

numpy-1.0.1-cpuinfo.patch:

--- NEW FILE numpy-1.0.1-cpuinfo.patch ---
Index: trunk/numpy/distutils/fcompiler/gnu.py
===================================================================
--- trunk/numpy/distutils/fcompiler/gnu.py (revision 3523)
+++ trunk/numpy/distutils/fcompiler/gnu.py (revision 3538)
@@ -197,4 +197,6 @@
             elif cpu.is_Nocona():
                 march_opt = '-march=nocona'
+            elif cpu.is_Core2():
+                march_opt = '-march=nocona'
             elif cpu.is_Prescott():
                 march_opt = '-march=prescott'
@@ -217,5 +219,10 @@
             if cpu.is_PentiumM():
                 march_opt = '-march=pentium-m'
-
+        
+        # Future:
+        # if gnu_ver >= '4.3':
+        #    if cpu.is_Core2():
+        #        march_opt = '-march=core2'
+        
         # Note: gcc 3.2 on win32 has breakage with -march specified
         if '3.1.1' <= gnu_ver <= '3.4' and sys.platform=='win32':
Index: trunk/numpy/distutils/cpuinfo.py
===================================================================
--- trunk/numpy/distutils/cpuinfo.py (revision 3520)
+++ trunk/numpy/distutils/cpuinfo.py (revision 3538)
@@ -186,6 +186,11 @@
 
     def _is_Nocona(self):
-        return self.is_PentiumIV() and self.is_64bit()
-
+        return self.is_64bit() and self.is_i686()
+    
+    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',


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/numpy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- numpy.spec	4 Jan 2007 19:51:21 -0000	1.8
+++ numpy.spec	23 Feb 2007 22:24:02 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:           numpy
 Version:        1.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
 Group:          Development/Languages
@@ -13,6 +13,7 @@
 Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-1.0.1-f2py.patch
 Patch1:         numpy-1.0-gfortran.patch
+Patch2:         numpy-1.0.1-cpuinfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran
@@ -36,6 +37,7 @@
 %setup -q
 %patch0 -p1 -b .f2py
 %patch1 -p1 -b .gfortran
+%patch2 -p1 -b .cpuinfo
 
 %build
 env ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -74,6 +76,10 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Fri Feb 23 2007 Jarod Wilson <jwilson at redhat.com> 1.0.1-3
+- Fix up cpuinfo bug (#229753). Upstream bug/change:
+  http://projects.scipy.org/scipy/scipy/ticket/349
+
 * Thu Jan 04 2007 Jarod Wilson <jwilson at redhat.com> 1.0.1-2
 - Per discussion w/Jose Matos, Obsolete/Provide f2py, as the
   stand-alone one is no longer supported/maintained upstream