[Numpy-svn] r3769 - in branches/distutils-revamp: . command fcompiler tests tests/f2py_ext tests/f2py_f90_ext tests/gen_ext tests/pyrex_ext tests/swig_ext

numpy-svn at scipy.org numpy-svn at scipy.org
Wed May 16 11:27:35 EDT 2007 

Author: cookedm
Date: 2007-05-16 10:27:12 -0500 (Wed, 16 May 2007)
New Revision: 3769

Modified:
   branches/distutils-revamp/
   branches/distutils-revamp/command/build_clib.py
   branches/distutils-revamp/command/build_src.py
   branches/distutils-revamp/fcompiler/gnu.py
   branches/distutils-revamp/fcompiler/intel.py
   branches/distutils-revamp/misc_util.py
   branches/distutils-revamp/setup.py
   branches/distutils-revamp/system_info.py
   branches/distutils-revamp/tests/f2py_ext/setup.py
   branches/distutils-revamp/tests/f2py_f90_ext/setup.py
   branches/distutils-revamp/tests/gen_ext/setup.py
   branches/distutils-revamp/tests/pyrex_ext/setup.py
   branches/distutils-revamp/tests/setup.py
   branches/distutils-revamp/tests/swig_ext/setup.py
Log:
Merged revisions 3732-3768 via svnmerge from 
http://svn.scipy.org/svn/numpy/trunk/numpy/distutils

........
  r3740 | cookedm | 2007-05-10 13:26:20 -0400 (Thu, 10 May 2007) | 2 lines
  
  Use a try/finally instead of try/except Exception for cleanup in numpy/distutils/core.py
........
  r3745 | pearu | 2007-05-11 08:50:42 -0400 (Fri, 11 May 2007) | 1 line
  
  Clean up setup() calls.
........
  r3746 | pearu | 2007-05-11 08:58:31 -0400 (Fri, 11 May 2007) | 1 line
  
  Using meaningful NotFoundError exception for blas_opt and lapack_opt resources.
........
  r3747 | pearu | 2007-05-11 09:37:31 -0400 (Fri, 11 May 2007) | 1 line
  
  Raise exception when pyrex is required.
........
  r3759 | cookedm | 2007-05-14 05:25:11 -0400 (Mon, 14 May 2007) | 2 lines
  
  With gfortran, compile modern Xeon's with EM64T with -march=nocona (#515)
........
  r3763 | pearu | 2007-05-14 08:17:49 -0400 (Mon, 14 May 2007) | 1 line
  
  Workaround Python distutils bug sf 1718574.
........
  r3764 | cookedm | 2007-05-14 20:35:49 -0400 (Mon, 14 May 2007) | 2 lines
  
  #520: don't add arch-specific flags when linking with Intel Fortran
........



Property changes on: branches/distutils-revamp
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/distutils-revamp:1-2756 /trunk/numpy/distutils:1-3731
   + /branches/distutils-revamp:1-2756 /trunk/numpy/distutils:1-3768

Modified: branches/distutils-revamp/command/build_clib.py
===================================================================
--- branches/distutils-revamp/command/build_clib.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/command/build_clib.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -14,6 +14,13 @@
 except NameError:
     from sets import Set as set
 
+# Fix Python distutils bug sf #1718574:
+_l = old_build_clib.user_options
+for _i in range(len(_l)):
+    if _l[_i][0] in ['build-clib', 'build-temp']:
+        _l[_i] = (_l[_i][0]+'=',)+_l[_i][1:]
+#
+
 class build_clib(old_build_clib):
 
     description = "build C/C++/F libraries used by Python extensions"

Modified: branches/distutils-revamp/command/build_src.py
===================================================================
--- branches/distutils-revamp/command/build_src.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/command/build_src.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -356,10 +356,14 @@
                         if pyrex_result.num_errors != 0:
                             raise RuntimeError("%d errors in Pyrex compile" %
                                                pyrex_result.num_errors)
-                    else:
+                    elif os.path.isfile(target_file):
                         log.warn("Pyrex needed to compile %s but not available."\
                                  " Using old target %s"\
                                  % (source, target_file))
+                    else:
+                        raise SystemError,"Non-existing target %r. "\
+                              "Perhaps you need to install Pyrex."\
+                              % (target_file)
                 new_sources.append(target_file)
             else:
                 new_sources.append(source)

Modified: branches/distutils-revamp/fcompiler/gnu.py
===================================================================
--- branches/distutils-revamp/fcompiler/gnu.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/fcompiler/gnu.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -218,6 +218,8 @@
                 march_opt = '-march=nocona'
             elif cpu.is_Core2():
                 march_opt = '-march=nocona'
+            elif cpu.is_Xeon() and cpu.is_64bit():
+                march_opt = '-march=nocona'
             elif cpu.is_Prescott():
                 march_opt = '-march=prescott'
             elif cpu.is_PentiumIV():

Modified: branches/distutils-revamp/fcompiler/intel.py
===================================================================
--- branches/distutils-revamp/fcompiler/intel.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/fcompiler/intel.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -79,7 +79,6 @@
         v = self.get_version()
         if v and v >= '8.0':
             opt.append('-nofor_main')
-        opt.extend(self.get_flags_arch())
         return opt
 
 class IntelItaniumFCompiler(IntelFCompiler):

Modified: branches/distutils-revamp/misc_util.py
===================================================================
--- branches/distutils-revamp/misc_util.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/misc_util.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -530,9 +530,10 @@
         caller_frame = get_frame(caller_level)
         caller_name = eval('__name__',caller_frame.f_globals,caller_frame.f_locals)
         self.local_path = get_path(caller_name, top_path)
+        # local_path -- directory of a file (usually setup.py) that
+        #               defines a configuration() function.
         if top_path is None:
             top_path = self.local_path
-            self.local_path = '.'
         if package_path is None:
             package_path = self.local_path
         elif os.path.isdir(njoin(self.local_path,package_path)):

Modified: branches/distutils-revamp/setup.py
===================================================================
--- branches/distutils-revamp/setup.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/setup.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -12,4 +12,4 @@
 
 if __name__ == '__main__':
     from numpy.distutils.core      import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)

Modified: branches/distutils-revamp/system_info.py
===================================================================
--- branches/distutils-revamp/system_info.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/system_info.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -1158,6 +1158,8 @@
 
 class lapack_opt_info(system_info):
 
+    notfounderror = LapackNotFoundError
+
     def calc_info(self):
 
         if sys.platform=='darwin' and not os.environ.get('ATLAS',None):
@@ -1253,6 +1255,8 @@
 
 class blas_opt_info(system_info):
 
+    notfounderror = BlasNotFoundError
+
     def calc_info(self):
 
         if sys.platform=='darwin' and not os.environ.get('ATLAS',None):

Modified: branches/distutils-revamp/tests/f2py_ext/setup.py
===================================================================
--- branches/distutils-revamp/tests/f2py_ext/setup.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/tests/f2py_ext/setup.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -8,4 +8,4 @@
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)

Modified: branches/distutils-revamp/tests/f2py_f90_ext/setup.py
===================================================================
--- branches/distutils-revamp/tests/f2py_f90_ext/setup.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/tests/f2py_f90_ext/setup.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -13,4 +13,4 @@
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)

Modified: branches/distutils-revamp/tests/gen_ext/setup.py
===================================================================
--- branches/distutils-revamp/tests/gen_ext/setup.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/tests/gen_ext/setup.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -44,4 +44,4 @@
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)

Modified: branches/distutils-revamp/tests/pyrex_ext/setup.py
===================================================================
--- branches/distutils-revamp/tests/pyrex_ext/setup.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/tests/pyrex_ext/setup.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -9,4 +9,4 @@
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)

Modified: branches/distutils-revamp/tests/setup.py
===================================================================
--- branches/distutils-revamp/tests/setup.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/tests/setup.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -11,4 +11,4 @@
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)

Modified: branches/distutils-revamp/tests/swig_ext/setup.py
===================================================================
--- branches/distutils-revamp/tests/swig_ext/setup.py	2007-05-16 07:10:37 UTC (rev 3768)
+++ branches/distutils-revamp/tests/swig_ext/setup.py	2007-05-16 15:27:12 UTC (rev 3769)
@@ -15,4 +15,4 @@
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)

More information about the Numpy-svn mailing list