[Scipy-svn] r4534 - in trunk/scipy: cluster fftpack integrate interpolate io lib/blas lib/lapack linalg ndimage odr optimize signal special stats

scipy-svn@scip... scipy-svn@scip...
Wed Jul 9 07:06:00 CDT 2008


Author: cdavid
Date: 2008-07-09 07:05:31 -0500 (Wed, 09 Jul 2008)
New Revision: 4534

Modified:
   trunk/scipy/cluster/SConscript
   trunk/scipy/fftpack/SConscript
   trunk/scipy/integrate/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/io/SConscript
   trunk/scipy/lib/blas/SConscript
   trunk/scipy/lib/lapack/SConscript
   trunk/scipy/linalg/SConscript
   trunk/scipy/ndimage/SConscript
   trunk/scipy/odr/SConscript
   trunk/scipy/optimize/SConscript
   trunk/scipy/signal/SConscript
   trunk/scipy/special/SConscript
   trunk/scipy/stats/SConscript
Log:
Use NumpyPythonExtension builder.

Modified: trunk/scipy/cluster/SConscript
===================================================================
--- trunk/scipy/cluster/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/cluster/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -2,18 +2,15 @@
 # vim:syntax=python
 from os.path import join
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.DistutilsPythonExtension('_vq', source = [join('src', 'vq_module.c'),
+env.NumpyPythonExtension('_vq', source = [join('src', 'vq_module.c'),
                                           join('src', 'vq.c')])
 
-env.DistutilsPythonExtension('_hierarchy_wrap', source = [join('src', 'hierarchy_wrap.c'),
+env.NumpyPythonExtension('_hierarchy_wrap', source = [join('src', 'hierarchy_wrap.c'),
                                           join('src', 'hierarchy.c')])
 
-
-env.DistutilsPythonExtension('_distance_wrap', source = [join('src', 'distance_wrap.c'),
+env.NumpyPythonExtension('_distance_wrap', source = [join('src', 'distance_wrap.c'),
                                           join('src', 'distance.c')])

Modified: trunk/scipy/fftpack/SConscript
===================================================================
--- trunk/scipy/fftpack/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/fftpack/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -2,16 +2,12 @@
 # vim:syntax=python
 from os.path import join as pjoin
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, write_info
 from numscons import CheckFFT, IsMKL, IsFFTW2, IsFFTW3
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-
 # Check fft implementation
 config = env.NumpyConfigure(custom_tests = {'CheckFFT': CheckFFT})
 has_fft = config.CheckFFT()
@@ -41,8 +37,8 @@
 
 # Build _fftpack
 src = ['src/zfft.c','src/drfft.c','src/zrfft.c', 'src/zfftnd.c', 'fftpack.pyf']
-env.DistutilsPythonExtension('_fftpack', src)
+env.NumpyPythonExtension('_fftpack', src)
 
 # Build convolve
 src = ['src/convolve.c',  'convolve.pyf']
-env.DistutilsPythonExtension('convolve', src)
+env.NumpyPythonExtension('convolve', src)

Modified: trunk/scipy/integrate/SConscript
===================================================================
--- trunk/scipy/integrate/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/integrate/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -3,7 +3,6 @@
 from os.path import join as pjoin
 import warnings
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, CheckF77Clib, CheckF77BLAS
 
 env = GetNumpyEnvironment(ARGUMENTS)
@@ -20,9 +19,6 @@
 
 config.Finish()
 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-
 # XXX: lapack integration
 
 # Build linpack_lite
@@ -69,10 +65,10 @@
 odenv.Prepend(LIBS = ['odepack', 'linpack_lite', 'mach'])
 
 # Build _quadpack
-quadenv.DistutilsPythonExtension('_quadpack', source = '_quadpackmodule.c')
+quadenv.NumpyPythonExtension('_quadpack', source = '_quadpackmodule.c')
 
 # Build _odepack
-odenv.DistutilsPythonExtension('_odepack', source = '_odepackmodule.c')
+odenv.NumpyPythonExtension('_odepack', source = '_odepackmodule.c')
 
 # Build vode
-odenv.DistutilsPythonExtension('vode', source = 'vode.pyf')
+odenv.NumpyPythonExtension('vode', source = 'vode.pyf')

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/interpolate/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -2,7 +2,6 @@
 # vim:syntax=python
 from os.path import join as pjoin
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, CheckF77Clib
 
 env = GetNumpyEnvironment(ARGUMENTS)
@@ -13,8 +12,6 @@
     raise Exception("Could not check F77 runtime, needed for interpolate")
 config.Finish()
 
-env.PrependUnique(CPPPATH = get_numpy_include_dirs())
-env.PrependUnique(CPPPATH = env['F2PYINCLUDEDIR'])
 env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # Build fitpack
@@ -39,7 +36,7 @@
 env.PrependUnique(LIBPATH = ['.'])
 
 # Build _fitpack
-env.DistutilsPythonExtension('_fitpack', source = '_fitpackmodule.c')
+env.NumpyPythonExtension('_fitpack', source = '_fitpackmodule.c')
 
 # Build dfitpack
-env.DistutilsPythonExtension('dfitpack', source = 'fitpack.pyf')
+env.NumpyPythonExtension('dfitpack', source = 'fitpack.pyf')

Modified: trunk/scipy/io/SConscript
===================================================================
--- trunk/scipy/io/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/io/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -1,11 +1,7 @@
 # Last Change: Wed Mar 05 03:00 PM 2008 J
 # vim:syntax=python
-from os.path import join
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.DistutilsPythonExtension('numpyio', source = 'numpyiomodule.c')
+env.NumpyPythonExtension('numpyio', source = 'numpyiomodule.c')

Modified: trunk/scipy/lib/blas/SConscript
===================================================================
--- trunk/scipy/lib/blas/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/lib/blas/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -4,8 +4,6 @@
 import os
 from os.path import join as pjoin, splitext
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc#, get_pythonlib_dir
 from numscons import GetNumpyEnvironment
 from numscons import CheckCBLAS, CheckF77BLAS,\
                      IsVeclib, IsAccelerate, \
@@ -17,7 +15,6 @@
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
 
-env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
 #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
@@ -58,7 +55,6 @@
 #==========
 
 # XXX: handle cblas wrapper for complex (check in numpy.scons or here ?)
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
 env.AppendUnique(F2PYOPTIONS = '--quiet')
 
 #------------
@@ -72,7 +68,7 @@
 else:
     env.FromFTemplate('fblaswrap.f', 'fblaswrap.f.src')
     source.append('fblaswrap.f')
-env.DistutilsPythonExtension('fblas', source)
+env.NumpyPythonExtension('fblas', source)
 
 #------------
 #   cblas
@@ -82,4 +78,4 @@
     env.FromFTemplate('cblas.pyf', 'cblas.pyf.src')
 else:
     print env.GenerateFakePyf('cblas', 'cblas.pyf.src')
-env.DistutilsPythonExtension('cblas', source)
+env.NumpyPythonExtension('cblas', source)

Modified: trunk/scipy/lib/lapack/SConscript
===================================================================
--- trunk/scipy/lib/lapack/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/lib/lapack/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -4,8 +4,6 @@
 import os
 from os.path import join as pjoin, splitext
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77LAPACK,\
                                   CheckCLAPACK, \
@@ -18,7 +16,6 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
-env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
 #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
@@ -70,7 +67,7 @@
 #   flapack
 #------------
 yop = env.FromFTemplate('flapack.pyf', 'flapack.pyf.src')
-env.DistutilsPythonExtension('flapack', source = ['flapack.pyf'])
+env.NumpyPythonExtension('flapack', source = ['flapack.pyf'])
 
 #------------
 #   clapack
@@ -79,17 +76,17 @@
     env.FromFTemplate('clapack.pyf', 'clapack.pyf.src')
 else:
     env.GenerateFakePyf('clapack', 'clapack.pyf.src')
-env.DistutilsPythonExtension('clapack', source = 'clapack.pyf')
+env.NumpyPythonExtension('clapack', source = 'clapack.pyf')
 
 #----------------
 # calc_lwork:
 #----------------
 calc_src = env.F2py(pjoin('calc_lworkmodule.c'), 
                          source = pjoin('calc_lwork.f'))
-env.DistutilsPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'],
+env.NumpyPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'],
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 #--------------
 # Atlas version
 #--------------
-env.DistutilsPythonExtension('atlas_version', 'atlas_version.c')
+env.NumpyPythonExtension('atlas_version', 'atlas_version.c')

Modified: trunk/scipy/linalg/SConscript
===================================================================
--- trunk/scipy/linalg/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/linalg/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -4,8 +4,6 @@
 import os
 from os.path import join as pjoin, splitext
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc#, get_pythonlib_dir
 from numscons import GetNumpyEnvironment
 from numscons import CheckCBLAS, CheckF77BLAS, CheckF77LAPACK,\
                                   CheckCLAPACK, IsVeclib, IsAccelerate, \
@@ -20,10 +18,8 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
-env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
 
 # XXX: handle cblas wrapper for complex (check in numpy.scons or here ?)
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
 env.AppendUnique(F2PYOPTIONS = '--quiet')
 
 env['BUILDERS']['haha'] = Builder(action = do_generate_interface,
@@ -107,7 +103,7 @@
     source.append(pjoin('src', 'fblaswrap_veclib_c.c'))
 else:
     source.append(pjoin('src', 'fblaswrap.f'))
-fenv.DistutilsPythonExtension('fblas', source)
+fenv.NumpyPythonExtension('fblas', source)
 
 #------------
 #   cblas
@@ -116,7 +112,7 @@
     env.haha('cblas', 'generic_cblas.pyf')
 else:
     env.hihi('cblas', 'generic_cblas.pyf')
-env.DistutilsPythonExtension('cblas', source = 'cblas.pyf')
+env.NumpyPythonExtension('cblas', source = 'cblas.pyf')
 
 #------------
 #   flapack
@@ -124,7 +120,7 @@
 yop = fenv.haha('flapack', 'generic_flapack.pyf')
 # XXX: automatically scan dependency on flapack_user_routines.pyf ?
 fenv.Depends(yop, 'flapack_user_routines.pyf')
-fenv.DistutilsPythonExtension('flapack', 'flapack.pyf')
+fenv.NumpyPythonExtension('flapack', 'flapack.pyf')
 
 #------------
 #   clapack
@@ -133,7 +129,7 @@
     env.haha('clapack', 'generic_clapack.pyf')
 else:
     env.hihi('clapack', 'generic_clapack.pyf')
-env.DistutilsPythonExtension('clapack', source = 'clapack.pyf')
+env.NumpyPythonExtension('clapack', source = 'clapack.pyf')
 
 #----------------
 #   _flinalg
@@ -141,14 +137,14 @@
 flinalg_fsrc = [pjoin('src', i) for i in ['det.f', 'lu.f']]
 flinalg_src = fenv.F2py(pjoin('src', '_flinalgmodule.c'), flinalg_fsrc)
 
-fenv.DistutilsPythonExtension('_flinalg', source = flinalg_src + flinalg_fsrc)
+fenv.NumpyPythonExtension('_flinalg', source = flinalg_src + flinalg_fsrc)
 
 #----------------
 # calc_lwork:
 #----------------
 calc_fsrc = [pjoin('src', 'calc_lwork.f')]
 calc_src = env.F2py(pjoin('src', 'calc_lworkmodule.c'), calc_fsrc)
-fenv.DistutilsPythonExtension('calc_lwork', calc_src + calc_fsrc)
+fenv.NumpyPythonExtension('calc_lwork', calc_src + calc_fsrc)
 
 #--------------
 # Atlas version
@@ -156,4 +152,4 @@
 atlas_env = env.Clone()
 if not IsATLAS(env, 'cblas'):
     atlas_env.AppendUnique(CPPDEFINES = "NO_ATLAS_INFO")
-atlas_env.DistutilsPythonExtension('atlas_version', 'atlas_version.c')
+atlas_env.NumpyPythonExtension('atlas_version', 'atlas_version.c')

Modified: trunk/scipy/ndimage/SConscript
===================================================================
--- trunk/scipy/ndimage/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/ndimage/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -1,22 +1,20 @@
 # Last Change: Wed Mar 05 09:00 PM 2008 J
 from os.path import join
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
 env.AppendUnique(CPPPATH = 'src')
 
 ndimage_src = ["nd_image.c", "ni_filters.c", "ni_fourier.c", "ni_interpolation.c",
                "ni_measure.c", "ni_morphology.c", "ni_support.c"]
-env.DistutilsPythonExtension('_nd_image', source = [join('src', i) for i in ndimage_src])
+env.NumpyPythonExtension('_nd_image', source = [join('src', i) for i in ndimage_src])
 
 segment_src = ['Segmenter_EXT.c', 'Segmenter_IMPL.c']
-env.DistutilsPythonExtension('_segment', source = [join('src', 'segment', i) 
+env.NumpyPythonExtension('_segment', source = [join('src', 'segment', i) 
                                                for i in segment_src])
 
 register_src = ['Register_EXT.c', 'Register_IMPL.c']
-env.DistutilsPythonExtension('_register', source = [join('src', 'register', i) 
+env.NumpyPythonExtension('_register', source = [join('src', 'register', i) 
                                                 for i in register_src])

Modified: trunk/scipy/odr/SConscript
===================================================================
--- trunk/scipy/odr/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/odr/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -4,15 +4,12 @@
 import os
 from os.path import join as pjoin, splitext
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc#, get_pythonlib_dir
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77BLAS, CheckF77Clib
 
 from numscons import write_info
 
 env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
 #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
@@ -58,5 +55,5 @@
 env.PrependUnique(LIBPATH = '.')
 
 # odr pyextension
-env.DistutilsPythonExtension('__odrpack', '__odrpack.c',
+env.NumpyPythonExtension('__odrpack', '__odrpack.c',
                          LINKFLAGSEND = env['F77_LDFLAGS'])

Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/optimize/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -4,8 +4,6 @@
 import os
 from os.path import join as pjoin, splitext
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-from numscons import get_python_inc#, get_pythonlib_dir
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77LAPACK, CheckF77Clib
 
@@ -13,8 +11,7 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('f2py')
-env.Append(CPPPATH = get_numpy_include_dirs())
-env.Append(CPPPATH = [env['F2PYINCLUDEDIR'], 'Zeros'])
+env.Append(CPPPATH = ['Zeros'])
 #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
@@ -64,33 +61,33 @@
 env.AppendUnique(LIBPATH = '.')
 
 # _minpack pyextension
-env.DistutilsPythonExtension('_minpack', '_minpackmodule.c',
+env.NumpyPythonExtension('_minpack', '_minpackmodule.c',
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # _zeros pyextension
-env.DistutilsPythonExtension('_zeros', 'zeros.c')
+env.NumpyPythonExtension('_zeros', 'zeros.c')
 
 # _lbfgsb pyextension
 src = [pjoin('lbfgsb', i) for i in ['lbfgsb.pyf', 'routines.f']]
-env.DistutilsPythonExtension('_lbfgsb', source = src,
+env.NumpyPythonExtension('_lbfgsb', source = src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # _cobyla pyextension
 src = [pjoin('cobyla', i) for i in ['cobyla2.f', 'trstlp.f', 'cobyla.pyf']]
-env.DistutilsPythonExtension('_cobyla', source = src,
+env.NumpyPythonExtension('_cobyla', source = src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # _minpack2 pyextension
 src = [pjoin('minpack2', i) for i in ['dcsrch.f', 'dcstep.f', 'minpack2.pyf']]
-env.DistutilsPythonExtension('minpack2', source = src,
+env.NumpyPythonExtension('minpack2', source = src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # moduleTNC pyextension
-env.DistutilsPythonExtension('moduleTNC', 
+env.NumpyPythonExtension('moduleTNC', 
                          source = [pjoin('tnc', i) for i in \
                                                    ['moduleTNC.c', 'tnc.c']])
 
 # _slsqp pyextension
 src = [pjoin('slsqp', i) for i in ['slsqp_optmz.f', 'slsqp.pyf']]
-env.DistutilsPythonExtension('_slsqp', source = src,
+env.NumpyPythonExtension('_slsqp', source = src,
                          LINKFLAGSEND = env['F77_LDFLAGS'])

Modified: trunk/scipy/signal/SConscript
===================================================================
--- trunk/scipy/signal/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/signal/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -2,18 +2,16 @@
 # vim:syntax=python
 from os.path import join
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
-env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.DistutilsPythonExtension('sigtools', 
+env.NumpyPythonExtension('sigtools', 
                          source = ['sigtoolsmodule.c',\
                                    'firfilter.c', \
                                    'medianfilter.c'])
 
-env.DistutilsPythonExtension('spline', 
+env.NumpyPythonExtension('spline', 
                          source = ['splinemodule.c', 'S_bspline_util.c', 
                                    'D_bspline_util.c', 'C_bspline_util.c', 
                                    'Z_bspline_util.c','bspline_util.c'])

Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/special/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -3,9 +3,6 @@
 from os.path import join as pjoin, basename as pbasename
 import sys
 
-from distutils.sysconfig import get_python_inc
-
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment
 from numscons import CheckF77Clib
 
@@ -13,9 +10,6 @@
 
 env.Tool('f2py')
 
-env.AppendUnique(CPPPATH = [get_python_inc(), get_numpy_include_dirs()])
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-
 if sys.platform=='win32':
 #        define_macros.append(('NOINFINITIES',None))
 #        define_macros.append(('NONANS',None))
@@ -52,7 +46,7 @@
 src = ['_cephesmodule.c', 'amos_wrappers.c', 'specfun_wrappers.c', \
        'toms_wrappers.c','cdf_wrappers.c','ufunc_extras.c']
 
-env.DistutilsPythonExtension('_cephes', 
+env.NumpyPythonExtension('_cephes', 
                          source = src, 
                          LIBS = ['amos', 'toms', 'c_misc', 'cephes', 'mach',\
                                  'cdf', 'specfunlib'], 
@@ -60,6 +54,6 @@
 
 # Specfun extension
 env.Prepend(LIBS = ['specfunlib'])
-env.DistutilsPythonExtension('specfun', source = 'specfun.pyf',
+env.NumpyPythonExtension('specfun', source = 'specfun.pyf',
                          F2PYOPTIONS = ["--no-wrap-functions"],
                          LINKFLAGSEND = env['F77_LDFLAGS'])

Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript	2008-07-08 19:52:27 UTC (rev 4533)
+++ trunk/scipy/stats/SConscript	2008-07-09 12:05:31 UTC (rev 4534)
@@ -2,16 +2,12 @@
 # vim:syntax=python
 from os.path import join as pjoin
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, CheckF77Clib
 
 env = GetNumpyEnvironment(ARGUMENTS)
 
 t = env.Tool('f2py')
 
-env.AppendUnique(CPPPATH = [get_numpy_include_dirs()])
-env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
-
 config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
 if not config.CheckF77Clib():
     raise RuntimeError("Could not get C/F77 runtime information")
@@ -24,16 +20,16 @@
 env.AppendUnique(LIBPATH = '.')
 
 # Statlib extension
-env.DistutilsPythonExtension('statlib', source = 'statlib.pyf', 
+env.NumpyPythonExtension('statlib', source = 'statlib.pyf', 
                          F2PYOPTIONS = ["--no-wrap-functions"],
                          LIBS = 'statlibimp',
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # futil extension
 futil_src = env.F2py(pjoin('futilmodule.c'), pjoin('futil.f'))
-env.DistutilsPythonExtension('futil', source = futil_src + ['futil.f'],
+env.NumpyPythonExtension('futil', source = futil_src + ['futil.f'],
                          LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # mvn extension
-env.DistutilsPythonExtension('mvn', source = ['mvn.pyf', 'mvndst.f'],
+env.NumpyPythonExtension('mvn', source = ['mvn.pyf', 'mvndst.f'],
                          LINKFLAGSEND = env['F77_LDFLAGS'])



More information about the Scipy-svn mailing list