[Scipy-svn] r4535 - in trunk/scipy: sparse/linalg/dsolve sparse/linalg/dsolve/umfpack sparse/linalg/eigen/arpack sparse/linalg/isolve sparse/sparsetools special

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-07-09 07:34:18 -0500 (Wed, 09 Jul 2008)
New Revision: 4535

Modified:
   trunk/scipy/sparse/linalg/dsolve/SConscript
   trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
   trunk/scipy/sparse/linalg/isolve/SConscript
   trunk/scipy/sparse/sparsetools/SConscript
   trunk/scipy/special/SConscript
Log:
Use NumpyPythonExtension builder in sparse.

Modified: trunk/scipy/sparse/linalg/dsolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
+++ trunk/scipy/sparse/linalg/dsolve/SConscript	2008-07-09 12:34:18 UTC (rev 4535)
@@ -1,8 +1,6 @@
 from os.path import join as pjoin
 import sys
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77LAPACK
 from numscons import write_info
@@ -60,11 +58,11 @@
 
 # Build python extensions
 pyenv = env.Clone()
-pyenv.Append(CPPPATH = [get_numpy_include_dirs(), pjoin('SuperLU', 'SRC')])
+pyenv.Append(CPPPATH = [pjoin('SuperLU', 'SRC')])
 pyenv.Prepend(LIBS = superlu)
 common_src = ['_superlu_utils.c', '_superluobject.c']
 
 for prec in ['z', 'd', 'c', 's']:
-    pyenv.DistutilsPythonExtension('_%ssuperlu' % prec, 
+    pyenv.NumpyPythonExtension('_%ssuperlu' % prec, 
                                source = common_src + \
                                         ['_%ssuperlumodule.c' % prec]) 

Modified: trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
+++ trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript	2008-07-09 12:34:18 UTC (rev 4535)
@@ -1,7 +1,5 @@
 from os.path import join as pjoin
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77BLAS, CheckF77Clib, NumpyCheckLibAndHeader
 from numscons import write_info
@@ -31,5 +29,4 @@
 if has_umfpack:
     env.Append(SWIGFLAGS = '-python')
     env.Append(SWIGFLAGS = '$_CPPINCFLAGS')
-    env.Append(CPPPATH = get_numpy_include_dirs())
-    env.DistutilsPythonExtension('__umfpack', source = 'umfpack.i') 
+    env.NumpyPythonExtension('__umfpack', source = 'umfpack.i') 

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-07-09 12:34:18 UTC (rev 4535)
@@ -1,7 +1,5 @@
 from os.path import join as pjoin
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77LAPACK, CheckF77Clib
 from numscons import write_info
@@ -55,9 +53,6 @@
 arpack_lib = env.DistutilsStaticExtLibrary('arpack', source = src)
 
 # Build _arpack extension
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-
 env.FromFTemplate('arpack.pyf', 'arpack.pyf.src')
 env.Prepend(LIBS = 'arpack')
-env.DistutilsPythonExtension('_arpack', 'arpack.pyf')
+env.NumpyPythonExtension('_arpack', 'arpack.pyf')

Modified: trunk/scipy/sparse/linalg/isolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/isolve/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
+++ trunk/scipy/sparse/linalg/isolve/SConscript	2008-07-09 12:34:18 UTC (rev 4535)
@@ -3,7 +3,6 @@
 
 from os.path import join as pjoin, splitext
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77LAPACK
 
@@ -11,7 +10,6 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
-env.Append(CPPPATH = [get_numpy_include_dirs(), env['F2PYINCLUDEDIR']])
 #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
@@ -55,4 +53,4 @@
     res = env.FromFTemplate(target, pjoin('iterative', method))
     sources.append(res[0])
 
-env.DistutilsPythonExtension('_iterative', source = sources)
+env.NumpyPythonExtension('_iterative', source = sources)

Modified: trunk/scipy/sparse/sparsetools/SConscript
===================================================================
--- trunk/scipy/sparse/sparsetools/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
+++ trunk/scipy/sparse/sparsetools/SConscript	2008-07-09 12:34:18 UTC (rev 4535)
@@ -1,12 +1,9 @@
 # Last Change: Wed Mar 05 09:00 PM 2008 J
 # vim:syntax=python
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-
 for fmt in ['csr','csc','coo','bsr','dia']:
     sources = [ fmt + '_wrap.cxx' ]
-    env.DistutilsPythonExtension('_%s' % fmt, source = sources)
+    env.NumpyPythonExtension('_%s' % fmt, source = sources)

Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
+++ trunk/scipy/special/SConscript	2008-07-09 12:34:18 UTC (rev 4535)
@@ -20,6 +20,7 @@
     raise RuntimeError("Could not get C/F77 runtime information")
 config.Finish()
 
+env.AppendUnique(CPPPATH = env["PYEXTCPPPATH"]) 
 def build_lib(name, ext, libname = None):
     """ext should be .f or .c"""
     if not libname: