[Numpy-svn] r5373 - in branches/1.1.x/numpy: core distutils/command fft lib linalg numarray random

numpy-svn@scip... numpy-svn@scip...
Wed Jul 9 05:18:01 CDT 2008


Author: cdavid
Date: 2008-07-09 05:17:18 -0500 (Wed, 09 Jul 2008)
New Revision: 5373

Added:
   branches/1.1.x/numpy/core/SConscript
   branches/1.1.x/numpy/core/SConstruct
   branches/1.1.x/numpy/fft/SConscript
   branches/1.1.x/numpy/fft/SConstruct
   branches/1.1.x/numpy/lib/SConscript
   branches/1.1.x/numpy/lib/SConstruct
   branches/1.1.x/numpy/linalg/SConscript
   branches/1.1.x/numpy/linalg/SConstruct
   branches/1.1.x/numpy/numarray/SConscript
   branches/1.1.x/numpy/numarray/SConstruct
   branches/1.1.x/numpy/random/SConscript
   branches/1.1.x/numpy/random/SConstruct
Removed:
   branches/1.1.x/numpy/core/SConstruct
   branches/1.1.x/numpy/fft/SConstruct
   branches/1.1.x/numpy/lib/SConstruct
   branches/1.1.x/numpy/linalg/SConstruct
   branches/1.1.x/numpy/numarray/SConstruct
   branches/1.1.x/numpy/random/SConstruct
Modified:
   branches/1.1.x/numpy/core/scons_support.py
   branches/1.1.x/numpy/core/setupscons.py
   branches/1.1.x/numpy/distutils/command/scons.py
Log:
Merge revisions 5266:5288: update scons scripts to new variant_dir conventions
in numscons 0.8

    ------------------------------------------------------------------------
    r5267 | cdavid | 2008-06-12 08:35:22 +0200 (Thu, 12 Jun 2008) | 1 line
    
    scons command: set distutils libdir relatively to build directory.
    ------------------------------------------------------------------------
    r5268 | cdavid | 2008-06-12 09:20:28 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Remove distutils_dirs_emitter hacks: no need anymore since we use variant_dir.
    ------------------------------------------------------------------------
    r5269 | cdavid | 2008-06-12 09:23:31 +0200 (Thu, 12 Jun 2008) | 1 line
    
    variant_dir: Rename SConscript for numpy.core.
    ------------------------------------------------------------------------
    r5270 | cdavid | 2008-06-12 09:24:09 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Add boilerplate SConstruct to set variant dir transparantly.
    ------------------------------------------------------------------------
    r5271 | cdavid | 2008-06-12 09:28:27 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Adapt SConscript to new architecture for build dir.
    ------------------------------------------------------------------------
    r5272 | cdavid | 2008-06-12 09:43:27 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Adapt numpyconfig.h location in setup.py file.
    ------------------------------------------------------------------------
    r5273 | cdavid | 2008-06-12 10:59:20 +0200 (Thu, 12 Jun 2008) | 1 line
    
    When src_dir is not null, takes it into account to retrieve distutils libdir.
    ------------------------------------------------------------------------
    r5274 | cdavid | 2008-06-12 11:01:13 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Adapt numpy.lib to new scons build_dir behavior.
    ------------------------------------------------------------------------
    r5275 | cdavid | 2008-06-12 11:48:42 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Set numpy include path relatively to top setup callee when bootstrapping.
    ------------------------------------------------------------------------
    r5276 | cdavid | 2008-06-12 11:49:16 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Adapat numpy.lib scons build to new build_dir conventions.
    ------------------------------------------------------------------------
    r5277 | cdavid | 2008-06-12 11:55:30 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Adapt numpy.numarray to new build dir convention.
    ------------------------------------------------------------------------
    r5278 | cdavid | 2008-06-12 11:56:55 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Adapt numpy.fft to new build dir conventions.
    ------------------------------------------------------------------------
    r5279 | cdavid | 2008-06-12 12:00:37 +0200 (Thu, 12 Jun 2008) | 1 line
    
    adapt numpy.linalg to new scons build_dir architecture.
    ------------------------------------------------------------------------
    r5280 | cdavid | 2008-06-12 12:05:12 +0200 (Thu, 12 Jun 2008) | 1 line
    
    adapt numpy.random to new scons build_dir architecture.
    ------------------------------------------------------------------------
    r5281 | cdavid | 2008-06-12 12:56:20 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Make sure we are using numscons 0.8.0 or above.
    ------------------------------------------------------------------------
    r5282 | cdavid | 2008-06-12 17:16:07 +0200 (Thu, 12 Jun 2008) | 1 line
    
    Do not fail scons command when cxx compiler is not available.
    ------------------------------------------------------------------------
    r5283 | cdavid | 2008-06-14 08:06:13 +0200 (Sat, 14 Jun 2008) | 1 line
    
    Fix dotblas compilation on mac os X: scons scanner is not smart enough to interpret #include CPP_MACRO.


Copied: branches/1.1.x/numpy/core/SConscript (from rev 5283, trunk/numpy/core/SConscript)

Deleted: branches/1.1.x/numpy/core/SConstruct
===================================================================
--- branches/1.1.x/numpy/core/SConstruct	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/core/SConstruct	2008-07-09 10:17:18 UTC (rev 5373)
@@ -1,270 +0,0 @@
-# Last Change: Mon Apr 21 07:00 PM 2008 J
-# vim:syntax=python
-import os
-import sys
-from os.path import join as pjoin, basename as pbasename, dirname as pdirname
-from copy import deepcopy
-
-from numscons import get_python_inc, get_pythonlib_dir
-from numscons import GetNumpyEnvironment
-from numscons import CheckCBLAS 
-from numscons import write_info
-
-from scons_support import CheckBrokenMathlib, define_no_smp, \
-    check_mlib, check_mlibs, is_npy_no_signal
-from scons_support import array_api_gen_bld, ufunc_api_gen_bld, template_bld, \
-                          umath_bld
-
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = [get_python_inc()])
-if os.name == 'nt':
-    # NT needs the pythonlib to run any code importing Python.h, including
-    # simple code using only typedef and so on, so we need it for configuration
-    # checks
-    env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
-
-#=======================
-# Starting Configuration
-#=======================
-config = env.NumpyConfigure(custom_tests = {'CheckBrokenMathlib' : CheckBrokenMathlib,
-    'CheckCBLAS' : CheckCBLAS}, config_h = pjoin(env['build_dir'], 'config.h'))
-
-# numpyconfig_sym will keep the values of some configuration variables, the one
-# needed for the public numpy API.
- 
-# Convention: list of tuples (definition, value). value:
-# - 0: #undef definition
-# - 1: #define definition
-# - string: #define definition value
-numpyconfig_sym = []
-
-#---------------
-# Checking Types
-#---------------
-if not config.CheckHeader("Python.h"):
-    raise RuntimeError("Error: Python.h header is not found (or cannot be "
-"compiled). On linux, check that you have python-dev/python-devel packages. On"
-" windows, check \ that you have the platform SDK.")
-
-def check_type(type, include = None):
-    st = config.CheckTypeSize(type, includes = include)
-    type = type.replace(' ', '_')
-    if st:
-        numpyconfig_sym.append(('SIZEOF_%s' % type.upper(), '%d' % st))
-    else:
-        numpyconfig_sym.append(('SIZEOF_%s' % type.upper(), 0))
-
-for type in ('short', 'int', 'long', 'float', 'double', 'long double'):
-    check_type(type)
-
-for type in ('Py_intptr_t',):
-    check_type(type, include = "#include <Python.h>\n")
-
-# We check declaration AND type because that's how distutils does it.
-if config.CheckDeclaration('PY_LONG_LONG', includes = '#include <Python.h>\n'):
-    st = config.CheckTypeSize('PY_LONG_LONG', 
-                              includes = '#include <Python.h>\n')
-    assert not st == 0
-    numpyconfig_sym.append(('DEFINE_NPY_SIZEOF_LONGLONG', 
-                            '#define NPY_SIZEOF_LONGLONG %d' % st))
-    numpyconfig_sym.append(('DEFINE_NPY_SIZEOF_PY_LONG_LONG', 
-                            '#define NPY_SIZEOF_PY_LONG_LONG %d' % st))
-else:
-    numpyconfig_sym.append(('DEFINE_NPY_SIZEOF_LONGLONG', ''))
-    numpyconfig_sym.append(('DEFINE_NPY_SIZEOF_PY_LONG_LONG', ''))
-
-if not config.CheckDeclaration('CHAR_BIT', includes= '#include <Python.h>\n'):
-    raise RuntimeError(\
-"""Config wo CHAR_BIT is not supported with scons: please contact the
-maintainer (cdavid)""")
-
-#----------------------
-# Checking signal stuff
-#----------------------
-if is_npy_no_signal():
-    numpyconfig_sym.append(('DEFINE_NPY_NO_SIGNAL', '#define NPY_NO_SIGNAL\n'))
-    config.Define('__NPY_PRIVATE_NO_SIGNAL', 
-                  comment = "define to 1 to disable SMP support ")
-else:
-    numpyconfig_sym.append(('DEFINE_NPY_NO_SIGNAL', ''))
-
-#---------------------
-# Checking SMP option
-#---------------------
-if define_no_smp():
-    nosmp = 1
-else:
-    nosmp = 0
-numpyconfig_sym.append(('NPY_NO_SMP', nosmp))
-
-#----------------------
-# Checking the mathlib 
-#----------------------
-mlibs = [[], ['m'], ['cpml']]
-mathlib = os.environ.get('MATHLIB')
-if mathlib: 
-    mlibs.insert(0, mathlib)
-
-mlib = check_mlibs(config, mlibs)
-
-# XXX: this is ugly: mathlib has nothing to do in a public header file
-numpyconfig_sym.append(('MATHLIB', ','.join(mlib)))
-
-#----------------------------------
-# Checking the math funcs available
-#----------------------------------
-# Function to check:
-mfuncs = ('expl', 'expf', 'log1p', 'expm1', 'asinh', 'atanhf', 'atanhl',
-          'isnan', 'isinf', 'rint')
-
-# Set value to 1 for each defined function (in math lib)
-mfuncs_defined = dict([(f, 0) for f in mfuncs])
-
-# TODO: checklib vs checkfunc ?
-def check_func(f):
-    """Check that f is available in mlib, and add the symbol appropriately.  """
-    st = config.CheckDeclaration(f, language = 'C', includes = "#include <math.h>")
-    if st:
-        st = config.CheckFunc(f, language = 'C')
-    if st:
-        mfuncs_defined[f] = 1
-    else:
-        mfuncs_defined[f] = 0
-
-for f in mfuncs:
-    check_func(f)
-
-if mfuncs_defined['expl'] == 1:
-    config.Define('HAVE_LONGDOUBLE_FUNCS',
-                  comment = 'Define to 1 if long double funcs are available')
-if mfuncs_defined['expf'] == 1:
-    config.Define('HAVE_FLOAT_FUNCS',
-                  comment = 'Define to 1 if long double funcs are available')
-if mfuncs_defined['asinh'] == 1:
-    config.Define('HAVE_INVERSE_HYPERBOLIC',
-                  comment = 'Define to 1 if inverse hyperbolic funcs are '\
-                            'available')
-if mfuncs_defined['atanhf'] == 1:
-    config.Define('HAVE_INVERSE_HYPERBOLIC_FLOAT',
-                  comment = 'Define to 1 if inverse hyperbolic float funcs '\
-                            'are available')
-if mfuncs_defined['atanhl'] == 1:
-    config.Define('HAVE_INVERSE_HYPERBOLIC_LONGDOUBLE',
-                  comment = 'Define to 1 if inverse hyperbolic long double '\
-                            'funcs are available')
-
-#-------------------------------------------------------
-# Define the function PyOS_ascii_strod if not available
-#-------------------------------------------------------
-if not config.CheckDeclaration('PyOS_ascii_strtod', 
-                               includes = "#include <Python.h>"):
-    if config.CheckFunc('strtod'):
-        config.Define('PyOS_ascii_strtod', 'strtod', 
-                      "Define to a function to use as a replacement for "\
-                      "PyOS_ascii_strtod if not available in python header")
-
-#------------------------------------
-# DISTUTILS Hack on AMD64 on windows
-#------------------------------------
-# XXX: this is ugly
-if sys.platform=='win32' or os.name=='nt':
-    from distutils.msvccompiler import get_build_architecture
-    a = get_build_architecture()
-    print 'BUILD_ARCHITECTURE: %r, os.name=%r, sys.platform=%r' % \
-          (a, os.name, sys.platform)
-    if a == 'AMD64':
-        distutils_use_sdk = 1
-        config.Define('DISTUTILS_USE_SDK', distutils_use_sdk, 
-                      "define to 1 to disable SMP support ")
-
-#--------------
-# Checking Blas
-#--------------
-if config.CheckCBLAS():
-    build_blasdot = 1
-else:
-    build_blasdot = 0
-
-config.Finish()
-write_info(env)
-
-#==========
-#  Build
-#==========
-
-#---------------------------------------
-# Generate the public configuration file
-#---------------------------------------
-config_dict = {}
-# XXX: this is ugly, make the API for config.h and numpyconfig.h similar
-for key, value in numpyconfig_sym:
-    config_dict['@%s@' % key] = str(value)
-env['SUBST_DICT'] = config_dict
-
-include_dir = 'include/numpy'
-env.SubstInFile(pjoin(env['build_dir'], 'numpyconfig.h'), 
-                pjoin(env['src_dir'], include_dir, 'numpyconfig.h.in'))
-
-env['CONFIG_H_GEN'] = numpyconfig_sym
-
-#---------------------------
-# Builder for generated code
-#---------------------------
-env.Append(BUILDERS = {'GenerateMultiarrayApi' : array_api_gen_bld,
-                       'GenerateUfuncApi' : ufunc_api_gen_bld,
-                       'GenerateFromTemplate' : template_bld,
-                       'GenerateUmath' : umath_bld})
-
-#------------------------
-# Generate generated code
-#------------------------
-scalartypes_src = env.GenerateFromTemplate(pjoin('src', 'scalartypes.inc.src'))
-arraytypes_src = env.GenerateFromTemplate(pjoin('src', 'arraytypes.inc.src'))
-sortmodule_src = env.GenerateFromTemplate(pjoin('src', '_sortmodule.c.src'))
-umathmodule_src = env.GenerateFromTemplate(pjoin('src', 'umathmodule.c.src'))
-scalarmathmodule_src = env.GenerateFromTemplate(
-                            pjoin('src', 'scalarmathmodule.c.src'))
-
-umath = env.GenerateUmath('__umath_generated',
-                          pjoin('code_generators', 'generate_umath.py'))
-
-multiarray_api = env.GenerateMultiarrayApi('multiarray_api', 
-                        [ pjoin('code_generators', 'array_api_order.txt'),
-                          pjoin('code_generators', 'multiarray_api_order.txt')])
-
-ufunc_api = env.GenerateUfuncApi('ufunc_api', 
-                    pjoin('code_generators', 'ufunc_api_order.txt'))
-
-env.Append(CPPPATH = [pjoin(env['src_dir'], 'include'), env['build_dir']])
-
-#-----------------
-# Build multiarray
-#-----------------
-multiarray_src = [pjoin('src', 'multiarraymodule.c')]
-multiarray = env.NumpyPythonExtension('multiarray', source = multiarray_src)
-
-#------------------
-# Build sort module
-#------------------
-sort = env.NumpyPythonExtension('_sort', source = sortmodule_src)
-
-#-------------------
-# Build umath module
-#-------------------
-umathmodule = env.NumpyPythonExtension('umath', source = umathmodule_src)
-
-#------------------------
-# Build scalarmath module
-#------------------------
-scalarmathmodule = env.NumpyPythonExtension('scalarmath', 
-                                            source = scalarmathmodule_src)
-
-#----------------------
-# Build _dotblas module
-#----------------------
-if build_blasdot:
-    dotblas_src = [pjoin('blasdot', i) for i in ['_dotblas.c']]
-    blasenv = env.Clone()
-    blasenv.Append(CPPPATH = pjoin(env['src_dir'], 'blasdot'))
-    dotblas = blasenv.NumpyPythonExtension('_dotblas', source = dotblas_src)

Copied: branches/1.1.x/numpy/core/SConstruct (from rev 5283, trunk/numpy/core/SConstruct)

Modified: branches/1.1.x/numpy/core/scons_support.py
===================================================================
--- branches/1.1.x/numpy/core/scons_support.py	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/core/scons_support.py	2008-07-09 10:17:18 UTC (rev 5373)
@@ -1,4 +1,4 @@
-#! Last Change: Mon Apr 21 07:00 PM 2008 J
+#! Last Change: Thu Jun 12 02:00 PM 2008 J
 
 """Code to support special facilities to scons which are only useful for
 numpy.core, hence not put into numpy.distutils.scons"""
@@ -16,10 +16,6 @@
 
 from numscons.numdist import process_c_str as process_str
 from numscons.core.utils import rsplit, isstring
-try:
-    from numscons import distutils_dirs_emitter
-except ImportError:
-    raise ImportError("You need numscons >= 0.5.2")
 
 import SCons.Node
 import SCons
@@ -189,16 +185,14 @@
     return nosmp == 1
 
 array_api_gen_bld = Builder(action = Action(do_generate_array_api, '$ARRAPIGENCOMSTR'),
-                            emitter = [generate_api_emitter,
-                                       distutils_dirs_emitter])
+                            emitter = generate_api_emitter)
+                                       
 
 ufunc_api_gen_bld = Builder(action = Action(do_generate_ufunc_api, '$UFUNCAPIGENCOMSTR'),
-                            emitter = [generate_api_emitter,
-                                       distutils_dirs_emitter])
+                            emitter = generate_api_emitter)
 
 template_bld = Builder(action = Action(generate_from_template, '$TEMPLATECOMSTR'),
-                       emitter = [generate_from_template_emitter,
-                                  distutils_dirs_emitter])
+                       emitter = generate_from_template_emitter)
 
 umath_bld = Builder(action = Action(generate_umath, '$UMATHCOMSTR'),
-                    emitter = [generate_umath_emitter, distutils_dirs_emitter])
+                    emitter = generate_umath_emitter)

Modified: branches/1.1.x/numpy/core/setupscons.py
===================================================================
--- branches/1.1.x/numpy/core/setupscons.py	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/core/setupscons.py	2008-07-09 10:17:18 UTC (rev 5373)
@@ -50,7 +50,7 @@
         # XXX: I really have to think about how to communicate path info
         # between scons and distutils, and set the options at one single
         # location.
-        target = join(scons_build_dir, local_dir, 'numpyconfig.h')
+        target = join(scons_build_dir, local_dir, 'include/numpy/numpyconfig.h')
         incl_dir = os.path.dirname(target)
         if incl_dir not in config.numpy_include_dirs:
             config.numpy_include_dirs.append(incl_dir)

Modified: branches/1.1.x/numpy/distutils/command/scons.py
===================================================================
--- branches/1.1.x/numpy/distutils/command/scons.py	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/distutils/command/scons.py	2008-07-09 10:17:18 UTC (rev 5373)
@@ -10,7 +10,6 @@
 from numpy.distutils.fcompiler import FCompiler
 from numpy.distutils.exec_command import find_executable
 from numpy.distutils import log
-from numpy.distutils.misc_util import get_numpy_include_dirs
 
 def get_scons_build_dir():
     """Return the top path where everything produced by scons will be put.
@@ -38,6 +37,14 @@
     from numscons import get_scons_path
     return get_scons_path()
 
+def get_distutils_libdir(cmd, sconscript_path):
+    """Returns the path where distutils install libraries, relatively to the
+    scons build directory."""
+    from numscons import get_scons_build_dir
+    scdir = pjoin(get_scons_build_dir(), pdirname(sconscript_path))
+    n = scdir.count(os.sep)
+    return pjoin(os.sep.join([os.pardir for i in range(n+1)]), cmd.build_lib)
+
 def get_python_exec_invoc():
     """This returns the python executable from which this file is invocated."""
     # Do we  need to take into account the PYTHONPATH, in a cross platform way,
@@ -49,6 +56,21 @@
     import sys
     return sys.executable
 
+def get_numpy_include_dirs(sconscript_path):
+    """Return include dirs for numpy.
+
+    The paths are relatively to the setup.py script path."""
+    from numpy.distutils.misc_util import get_numpy_include_dirs as _incdir
+    from numscons import get_scons_build_dir
+    scdir = pjoin(get_scons_build_dir(), pdirname(sconscript_path))
+    n = scdir.count(os.sep)
+
+    dirs = _incdir()
+    rdirs = []
+    for d in dirs:
+        rdirs.append(pjoin(os.sep.join([os.pardir for i in range(n+1)]), d))
+    return rdirs
+
 def dirl_to_str(dirlist):
     """Given a list of directories, returns a string where the paths are
     concatenated by the path separator.
@@ -298,7 +320,10 @@
             cxxcompiler.customize(self.distribution, need_cxx = 1)
             cxxcompiler.customize_cmd(self)
             self.cxxcompiler = cxxcompiler.cxx_compiler()
-            #print self.cxxcompiler.compiler_cxx[0]
+            try:
+                get_cxx_tool_path(self.cxxcompiler)
+            except DistutilsSetupError:
+                self.cxxcompiler = None
 
         if self.package_list:
             self.package_list = parse_package_list(self.package_list)
@@ -311,6 +336,16 @@
                 raise RuntimeError("importing numscons failed (error was %s), using " \
                                    "scons within distutils is not possible without "
                                    "this package " % str(e))
+
+            try:
+                from numscons import get_version
+                if get_version() < '0.8.0':
+                    raise ValueError()
+            except ImportError, ValueError:
+                raise RuntimeError("You need numscons >= 0.8.0 to build numpy "\
+                                   "with numscons (imported numscons path " \
+                                   "is %s)." % numscons.__file__)
+                
         else:
             # nothing to do, just leave it here.
             return
@@ -358,7 +393,8 @@
             cmd.append('pkg_name="%s"' % pkg_name)
             #cmd.append('distutils_libdir=%s' % protect_path(pjoin(self.build_lib,
             #                                                    pdirname(sconscript))))
-            cmd.append('distutils_libdir=%s' % protect_path(pjoin(self.build_lib)))
+            cmd.append('distutils_libdir=%s' % 
+                         protect_path(get_distutils_libdir(self, sconscript)))
 
             if not self._bypass_distutils_cc:
                 cmd.append('cc_opt=%s' % self.scons_compiler)
@@ -375,7 +411,7 @@
                 cmd.append('cxx_opt=%s' % dist2sconscxx(self.cxxcompiler))
                 cmd.append('cxx_opt_path=%s' % protect_path(get_cxx_tool_path(self.cxxcompiler)))
 
-            cmd.append('include_bootstrap=%s' % dirl_to_str(get_numpy_include_dirs()))
+            cmd.append('include_bootstrap=%s' % dirl_to_str(get_numpy_include_dirs(sconscript)))
             if self.silent:
                 if int(self.silent) == 2:
                     cmd.append('-Q')

Copied: branches/1.1.x/numpy/fft/SConscript (from rev 5283, trunk/numpy/fft/SConscript)

Deleted: branches/1.1.x/numpy/fft/SConstruct
===================================================================
--- branches/1.1.x/numpy/fft/SConstruct	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/fft/SConstruct	2008-07-09 10:17:18 UTC (rev 5373)
@@ -1,10 +0,0 @@
-# Last Change: Tue May 20 05:00 PM 2008 J
-# vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-
-fftpack_lite = env.NumpyPythonExtension('fftpack_lite', 
-                                        source = ['fftpack_litemodule.c', 
-                                                  'fftpack.c'])

Copied: branches/1.1.x/numpy/fft/SConstruct (from rev 5283, trunk/numpy/fft/SConstruct)

Copied: branches/1.1.x/numpy/lib/SConscript (from rev 5283, trunk/numpy/lib/SConscript)

Deleted: branches/1.1.x/numpy/lib/SConstruct
===================================================================
--- branches/1.1.x/numpy/lib/SConstruct	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/lib/SConstruct	2008-07-09 10:17:18 UTC (rev 5373)
@@ -1,9 +0,0 @@
-# Last Change: Tue May 20 05:00 PM 2008 J
-# vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-
-_compiled_base = env.NumpyPythonExtension('_compiled_base', 
-                                        source = ['src/_compiled_base.c'])

Copied: branches/1.1.x/numpy/lib/SConstruct (from rev 5283, trunk/numpy/lib/SConstruct)

Copied: branches/1.1.x/numpy/linalg/SConscript (from rev 5283, trunk/numpy/linalg/SConscript)

Deleted: branches/1.1.x/numpy/linalg/SConstruct
===================================================================
--- branches/1.1.x/numpy/linalg/SConstruct	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/linalg/SConstruct	2008-07-09 10:17:18 UTC (rev 5373)
@@ -1,29 +0,0 @@
-# Last Change: Tue May 20 05:00 PM 2008 J
-# vim:syntax=python
-import os.path
-
-from numscons import GetNumpyEnvironment, scons_get_paths, \
-                     scons_get_mathlib
-from numscons import CheckF77LAPACK
-from numscons import write_info
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-
-config = env.NumpyConfigure(custom_tests = 
-    {'CheckLAPACK' : CheckF77LAPACK})
-
-use_lapack = config.CheckLAPACK()
-
-mlib = scons_get_mathlib(env)
-env.AppendUnique(LIBS = mlib)
-
-config.Finish()
-write_info(env)
-
-sources = ['lapack_litemodule.c']
-if not use_lapack:
-    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)
-            

Copied: branches/1.1.x/numpy/linalg/SConstruct (from rev 5283, trunk/numpy/linalg/SConstruct)

Copied: branches/1.1.x/numpy/numarray/SConscript (from rev 5283, trunk/numpy/numarray/SConscript)

Deleted: branches/1.1.x/numpy/numarray/SConstruct
===================================================================
--- branches/1.1.x/numpy/numarray/SConstruct	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/numarray/SConstruct	2008-07-09 10:17:18 UTC (rev 5373)
@@ -1,9 +0,0 @@
-# Last Change: Tue May 20 05:00 PM 2008 J
-# vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-env.Append(CPPPATH = env['src_dir'])
-
-_capi = env.NumpyPythonExtension('_capi', source = ['_capi.c'])

Copied: branches/1.1.x/numpy/numarray/SConstruct (from rev 5283, trunk/numpy/numarray/SConstruct)

Copied: branches/1.1.x/numpy/random/SConscript (from rev 5283, trunk/numpy/random/SConscript)

Deleted: branches/1.1.x/numpy/random/SConstruct
===================================================================
--- branches/1.1.x/numpy/random/SConstruct	2008-07-09 08:49:28 UTC (rev 5372)
+++ branches/1.1.x/numpy/random/SConstruct	2008-07-09 10:17:18 UTC (rev 5373)
@@ -1,46 +0,0 @@
-# Last Change: Tue May 20 05:00 PM 2008 J
-# vim:syntax=python
-import os
-
-from numscons import GetNumpyEnvironment, scons_get_paths, \
-                                  scons_get_mathlib
-
-def CheckWincrypt(context):
-    from copy import deepcopy
-    src = """\
-/* check to see if _WIN32 is defined */
-int main(int argc, char *argv[])
-{
-#ifdef _WIN32
-    return 0;
-#else
-    return 1;
-#endif
-}
-"""
-
-    context.Message("Checking if using wincrypt ... ")
-    st = context.env.TryRun(src, '.C')
-    if st[0] == 0:
-        context.Result('No')
-    else:
-        context.Result('Yes')
-    return st[0]
-    
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-
-mlib = scons_get_mathlib(env)
-env.AppendUnique(LIBS = mlib)
-
-# On windows, see if we should use Advapi32
-if os.name == 'nt':
-    config = env.NumpyConfigure(custom_tests = {'CheckWincrypt' : CheckWincrypt})
-    if config.CheckWincrypt:
-        config.env.AppendUnique(LIBS = 'Advapi32')
-
-sources = [os.path.join('mtrand', x) for x in 
-           ['mtrand.c', 'randomkit.c', 'initarray.c', 'distributions.c']]
-
-# XXX: Pyrex dependency
-mtrand = env.NumpyPythonExtension('mtrand', source = sources)

Copied: branches/1.1.x/numpy/random/SConstruct (from rev 5283, trunk/numpy/random/SConstruct)



More information about the Numpy-svn mailing list