[Numpy-svn] r5258 - in trunk: . numpy/distutils/command numpy/fft numpy/lib numpy/linalg numpy/numarray numpy/random

Sat Jun 7 11:58:07 EDT 2008

Author: cdavid
Date: 2008-06-07 10:57:45 -0500 (Sat, 07 Jun 2008)
New Revision: 5258

Modified:
   trunk/
   trunk/numpy/distutils/command/scons.py
   trunk/numpy/fft/SConstruct
   trunk/numpy/lib/SConstruct
   trunk/numpy/linalg/SConstruct
   trunk/numpy/numarray/SConstruct
   trunk/numpy/random/SConstruct
Log:
Merged revisions 5204-5257 via svnmerge from 
http://svn.scipy.org/svn/numpy/branches/cdavid

........
  r5205 | cdavid | 2008-05-20 17:14:30 +0900 (Tue, 20 May 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-5204" from 
  http://svn.scipy.org/svn/numpy/trunk
........
  r5206 | cdavid | 2008-05-20 17:17:27 +0900 (Tue, 20 May 2008) | 7 lines
  
  
  Current handling of bootstrapping is flawed: I should handle it at the
  distutils level, not at the scons level. This is the first step to detect
  bootstrapping at distutils level, and pass its state to scons through command
  line.
........
  r5207 | cdavid | 2008-05-20 17:35:01 +0900 (Tue, 20 May 2008) | 1 line
  
  Fix typo when passing bootstrapping option to scons.
........
  r5208 | cdavid | 2008-05-20 17:41:11 +0900 (Tue, 20 May 2008) | 5 lines
  
  
  Do not mess with __NUMPY_SETUP__ in scons scripts anymore: this is handled in
  numscons.
........
  r5209 | cdavid | 2008-05-20 17:43:46 +0900 (Tue, 20 May 2008) | 1 line
  
  Forgot one file in lapack_lite when no LAPACK is available.
........
  r5210 | cdavid | 2008-05-20 18:24:38 +0900 (Tue, 20 May 2008) | 1 line
  
  Handle fortran compiler on open-solaris
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/aligned_alloca:1-5127 /branches/build_with_scons:1-4676 /branches/cdavid:1-5203 /branches/cleanconfig_rtm:1-4677 /branches/distutils-revamp:1-2752 /branches/distutils_scons_command:1-4619 /branches/multicore:1-3687 /branches/numpy.scons:1-4484 /trunk:1-2871
   + /branches/aligned_alloca:1-5127 /branches/build_with_scons:1-4676 /branches/cdavid:1-5257 /branches/cleanconfig_rtm:1-4677 /branches/distutils-revamp:1-2752 /branches/distutils_scons_command:1-4619 /branches/multicore:1-3687 /branches/numpy.scons:1-4484 /trunk:1-2871

Modified: trunk/numpy/distutils/command/scons.py
===================================================================

--- trunk/numpy/distutils/command/scons.py	2008-06-07 05:08:06 UTC (rev 5257)
+++ trunk/numpy/distutils/command/scons.py	2008-06-07 15:57:45 UTC (rev 5258)
@@ -85,6 +85,8 @@
         return 'g77'
     elif compiler.compiler_type == 'gnu95':
         return 'gfortran'
+    elif compiler.compiler_type == 'sun':
+        return 'sunf77'
     else:
         # XXX: Just give up for now, and use generic fortran compiler
         return 'fortran'
@@ -196,6 +198,15 @@
         raise ValueError(msg)
     return common
 
+def is_bootstrapping():
+    import __builtin__
+    try:
+        __builtin__.__NUMPY_SETUP__
+        return True
+    except AttributeError:
+        return False
+        __NUMPY_SETUP__ = False
+
 class scons(old_build_ext):
     # XXX: add an option to the scons command for configuration (auto/force/cache).
     description = "Scons builder"
@@ -303,6 +314,8 @@
         else:
             # nothing to do, just leave it here.
             return
+
+        print "is bootstrapping ? %s" % is_bootstrapping()
         # XXX: when a scons script is missing, scons only prints warnings, and
         # does not return a failure (status is 0). We have to detect this from
         # distutils (this cannot work for recursive scons builds...)
@@ -326,6 +339,11 @@
             post_hooks = self.post_hooks
             pkg_names = self.pkg_names
 
+        if is_bootstrapping():
+            bootstrap = 1
+        else:
+            bootstrap = 0
+
         for sconscript, pre_hook, post_hook, pkg_name in zip(sconscripts,
                                                    pre_hooks, post_hooks,
                                                    pkg_names):
@@ -364,6 +382,7 @@
                 elif int(self.silent) == 3:
                     cmd.append('-s')
             cmd.append('silent=%d' % int(self.silent))
+            cmd.append('bootstrapping=%d' % bootstrap)
             cmdstr = ' '.join(cmd)
             if int(self.silent) < 1:
                 log.info("Executing scons command (pkg is %s): %s ", pkg_name, cmdstr)

Modified: trunk/numpy/fft/SConstruct
===================================================================
--- trunk/numpy/fft/SConstruct	2008-06-07 05:08:06 UTC (rev 5257)
+++ trunk/numpy/fft/SConstruct	2008-06-07 15:57:45 UTC (rev 5258)
@@ -1,8 +1,5 @@
-# Last Change: Thu Oct 18 09:00 PM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, scons_get_paths
 
 env = GetNumpyEnvironment(ARGUMENTS)

Modified: trunk/numpy/lib/SConstruct
===================================================================
--- trunk/numpy/lib/SConstruct	2008-06-07 05:08:06 UTC (rev 5257)
+++ trunk/numpy/lib/SConstruct	2008-06-07 15:57:45 UTC (rev 5258)
@@ -1,8 +1,5 @@
-# Last Change: Thu Oct 18 09:00 PM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, scons_get_paths
 
 env = GetNumpyEnvironment(ARGUMENTS)

Modified: trunk/numpy/linalg/SConstruct
===================================================================
--- trunk/numpy/linalg/SConstruct	2008-06-07 05:08:06 UTC (rev 5257)
+++ trunk/numpy/linalg/SConstruct	2008-06-07 15:57:45 UTC (rev 5258)
@@ -1,11 +1,7 @@
-# Last Change: Fri Nov 16 05:00 PM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
 import os.path
 
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-
-from numpy.distutils.misc_util import get_numpy_include_dirs, get_mathlibs
 from numscons import GetNumpyEnvironment, scons_get_paths, \
                      scons_get_mathlib
 from numscons import CheckF77LAPACK
@@ -27,7 +23,7 @@
 
 sources = ['lapack_litemodule.c']
 if not use_lapack:
-    sources.extend(['zlapack_lite.c', 'dlapack_lite.c', 'blas_lite.c',
-                    'dlamch.c', 'f2c_lite.c'])
+    sources.extend(['python_xerbla.c', 'zlapack_lite.c', 'dlapack_lite.c',
+                    'blas_lite.c', 'dlamch.c', 'f2c_lite.c'])
 lapack_lite = env.NumpyPythonExtension('lapack_lite', source = sources)
             

Modified: trunk/numpy/numarray/SConstruct
===================================================================
--- trunk/numpy/numarray/SConstruct	2008-06-07 05:08:06 UTC (rev 5257)
+++ trunk/numpy/numarray/SConstruct	2008-06-07 15:57:45 UTC (rev 5258)
@@ -1,8 +1,5 @@
-# Last Change: Fri Oct 19 09:00 AM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, scons_get_paths
 
 env = GetNumpyEnvironment(ARGUMENTS)

Modified: trunk/numpy/random/SConstruct
===================================================================
--- trunk/numpy/random/SConstruct	2008-06-07 05:08:06 UTC (rev 5257)
+++ trunk/numpy/random/SConstruct	2008-06-07 15:57:45 UTC (rev 5258)
@@ -1,11 +1,7 @@
-# Last Change: Tue Nov 13 11:00 PM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
 import os
 
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-
-from numpy.distutils.misc_util import get_numpy_include_dirs, get_mathlibs
 from numscons import GetNumpyEnvironment, scons_get_paths, \
                                   scons_get_mathlib
 


