[Scipy-svn] r4430 - in trunk/scipy: cluster fftpack integrate interpolate io lib/blas lib/lapack linalg ndimage odr optimize signal sparse/linalg/dsolve sparse/linalg/dsolve/umfpack sparse/linalg/eigen/arpack sparse/linalg/isolve sparse/sparsetools special stats stsci/convolve stsci/image
scipy-svn at scipy.org
scipy-svn at scipy.org
Thu Jun 12 06:19:21 EDT 2008
Author: cdavid
Date: 2008-06-12 05:18:28 -0500 (Thu, 12 Jun 2008)
New Revision: 4430
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/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
trunk/scipy/stats/SConscript
trunk/scipy/stsci/convolve/SConscript
trunk/scipy/stsci/image/SConscript
Log:
Renamve NumpyPythonExtension to DistutilsPythonExtension.
Modified: trunk/scipy/cluster/SConscript
===================================================================
--- trunk/scipy/cluster/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/cluster/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -8,12 +8,12 @@
env = GetNumpyEnvironment(ARGUMENTS)
env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.NumpyPythonExtension('_vq', source = [join('src', 'vq_module.c'),
+env.DistutilsPythonExtension('_vq', source = [join('src', 'vq_module.c'),
join('src', 'vq.c')])
-env.NumpyPythonExtension('_hierarchy_wrap', source = [join('src', 'hierarchy_wrap.c'),
+env.DistutilsPythonExtension('_hierarchy_wrap', source = [join('src', 'hierarchy_wrap.c'),
join('src', 'hierarchy.c')])
-env.NumpyPythonExtension('_distance_wrap', source = [join('src', 'distance_wrap.c'),
+env.DistutilsPythonExtension('_distance_wrap', source = [join('src', 'distance_wrap.c'),
join('src', 'distance.c')])
Modified: trunk/scipy/fftpack/SConscript
===================================================================
--- trunk/scipy/fftpack/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/fftpack/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -37,8 +37,8 @@
# Build _fftpack
src = ['src/zfft.c','src/drfft.c','src/zrfft.c', 'src/zfftnd.c', 'fftpack.pyf']
-env.NumpyPythonExtension('_fftpack', src)
+env.DistutilsPythonExtension('_fftpack', src)
# Build convolve
src = ['src/convolve.c', 'convolve.pyf']
-env.NumpyPythonExtension('convolve', src)
+env.DistutilsPythonExtension('convolve', src)
Modified: trunk/scipy/integrate/SConscript
===================================================================
--- trunk/scipy/integrate/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/integrate/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -52,10 +52,10 @@
odenv.Prepend(LIBS = ['odepack', 'linpack_lite', 'mach'])
# Build _quadpack
-quadenv.NumpyPythonExtension('_quadpack', source = '_quadpackmodule.c')
+quadenv.DistutilsPythonExtension('_quadpack', source = '_quadpackmodule.c')
# Build _odepack
-odenv.NumpyPythonExtension('_odepack', source = '_odepackmodule.c')
+odenv.DistutilsPythonExtension('_odepack', source = '_odepackmodule.c')
# Build vode
-odenv.NumpyPythonExtension('vode', source = 'vode.pyf')
+odenv.DistutilsPythonExtension('vode', source = 'vode.pyf')
Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/interpolate/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -25,7 +25,7 @@
env.PrependUnique(LIBPATH = [env['build_dir']])
# Build _fitpack
-env.NumpyPythonExtension('_fitpack', source = '_fitpackmodule.c')
+env.DistutilsPythonExtension('_fitpack', source = '_fitpackmodule.c')
# Build dfitpack
-env.NumpyPythonExtension('dfitpack', source = 'fitpack.pyf')
+env.DistutilsPythonExtension('dfitpack', source = 'fitpack.pyf')
Modified: trunk/scipy/io/SConscript
===================================================================
--- trunk/scipy/io/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/io/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -8,4 +8,4 @@
env = GetNumpyEnvironment(ARGUMENTS)
env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.NumpyPythonExtension('numpyio', source = 'numpyiomodule.c')
+env.DistutilsPythonExtension('numpyio', source = 'numpyiomodule.c')
Modified: trunk/scipy/lib/blas/SConscript
===================================================================
--- trunk/scipy/lib/blas/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/lib/blas/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -72,7 +72,7 @@
else:
env.NumpyFromFTemplate('fblaswrap.f', 'fblaswrap.f.src')
source.append('fblaswrap.f')
-env.NumpyPythonExtension('fblas', source)
+env.DistutilsPythonExtension('fblas', source)
#------------
# cblas
@@ -82,4 +82,4 @@
env.NumpyFromFTemplate('cblas.pyf', 'cblas.pyf.src')
else:
print env.GenerateFakePyf('cblas', 'cblas.pyf.src')
-env.NumpyPythonExtension('cblas', source)
+env.DistutilsPythonExtension('cblas', source)
Modified: trunk/scipy/lib/lapack/SConscript
===================================================================
--- trunk/scipy/lib/lapack/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/lib/lapack/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -70,7 +70,7 @@
# flapack
#------------
yop = env.NumpyFromFTemplate('flapack.pyf', 'flapack.pyf.src')
-env.NumpyPythonExtension('flapack', source = ['flapack.pyf'])
+env.DistutilsPythonExtension('flapack', source = ['flapack.pyf'])
#------------
# clapack
@@ -79,17 +79,17 @@
env.NumpyFromFTemplate('clapack.pyf', 'clapack.pyf.src')
else:
env.GenerateFakePyf('clapack', 'clapack.pyf.src')
-env.NumpyPythonExtension('clapack', source = 'clapack.pyf')
+env.DistutilsPythonExtension('clapack', source = 'clapack.pyf')
#----------------
# calc_lwork:
#----------------
calc_src = env.NumpyF2py(pjoin('calc_lworkmodule.c'),
source = pjoin('calc_lwork.f'))
-env.NumpyPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'],
+env.DistutilsPythonExtension('calc_lwork', source = calc_src + ['calc_lwork.f'],
LINKFLAGSEND = env['F77_LDFLAGS'])
#--------------
# Atlas version
#--------------
-env.NumpyPythonExtension('atlas_version', 'atlas_version.c')
+env.DistutilsPythonExtension('atlas_version', 'atlas_version.c')
Modified: trunk/scipy/linalg/SConscript
===================================================================
--- trunk/scipy/linalg/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/linalg/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -107,7 +107,7 @@
source.append(pjoin('src', 'fblaswrap_veclib_c.c'))
else:
source.append(pjoin('src', 'fblaswrap.f'))
-fenv.NumpyPythonExtension('fblas', source)
+fenv.DistutilsPythonExtension('fblas', source)
#------------
# cblas
@@ -116,7 +116,7 @@
env.haha('cblas', 'generic_cblas.pyf')
else:
env.hihi('cblas', 'generic_cblas.pyf')
-env.NumpyPythonExtension('cblas', source = 'cblas.pyf')
+env.DistutilsPythonExtension('cblas', source = 'cblas.pyf')
#------------
# flapack
@@ -124,7 +124,7 @@
yop = fenv.haha('flapack', 'generic_flapack.pyf')
# XXX: automatically scan dependency on flapack_user_routines.pyf ?
fenv.Depends(yop, pjoin(env['build_dir'], 'flapack_user_routines.pyf'))
-fenv.NumpyPythonExtension('flapack', 'flapack.pyf')
+fenv.DistutilsPythonExtension('flapack', 'flapack.pyf')
#------------
# clapack
@@ -133,7 +133,7 @@
env.haha('clapack', 'generic_clapack.pyf')
else:
env.hihi('clapack', 'generic_clapack.pyf')
-env.NumpyPythonExtension('clapack', source = 'clapack.pyf')
+env.DistutilsPythonExtension('clapack', source = 'clapack.pyf')
#----------------
# _flinalg
@@ -141,14 +141,14 @@
flinalg_fsrc = [pjoin('src', i) for i in ['det.f', 'lu.f']]
flinalg_src = fenv.NumpyF2py(pjoin('src', '_flinalgmodule.c'), flinalg_fsrc)
-fenv.NumpyPythonExtension('_flinalg', source = flinalg_src + flinalg_fsrc)
+fenv.DistutilsPythonExtension('_flinalg', source = flinalg_src + flinalg_fsrc)
#----------------
# calc_lwork:
#----------------
calc_fsrc = [pjoin('src', 'calc_lwork.f')]
calc_src = env.NumpyF2py(pjoin('src', 'calc_lworkmodule.c'), calc_fsrc)
-fenv.NumpyPythonExtension('calc_lwork', calc_src + calc_fsrc)
+fenv.DistutilsPythonExtension('calc_lwork', calc_src + calc_fsrc)
#--------------
# Atlas version
@@ -156,4 +156,4 @@
atlas_env = env.Clone()
if not IsATLAS(env, 'cblas'):
atlas_env.AppendUnique(CPPDEFINES = "NO_ATLAS_INFO")
-atlas_env.NumpyPythonExtension('atlas_version', 'atlas_version.c')
+atlas_env.DistutilsPythonExtension('atlas_version', 'atlas_version.c')
Modified: trunk/scipy/ndimage/SConscript
===================================================================
--- trunk/scipy/ndimage/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/ndimage/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -11,12 +11,12 @@
ndimage_src = ["nd_image.c", "ni_filters.c", "ni_fourier.c", "ni_interpolation.c",
"ni_measure.c", "ni_morphology.c", "ni_support.c"]
-env.NumpyPythonExtension('_nd_image', source = [join('src', i) for i in ndimage_src])
+env.DistutilsPythonExtension('_nd_image', source = [join('src', i) for i in ndimage_src])
segment_src = ['Segmenter_EXT.c', 'Segmenter_IMPL.c']
-env.NumpyPythonExtension('_segment', source = [join('src', 'segment', i)
+env.DistutilsPythonExtension('_segment', source = [join('src', 'segment', i)
for i in segment_src])
register_src = ['Register_EXT.c', 'Register_IMPL.c']
-env.NumpyPythonExtension('_register', source = [join('src', 'register', i)
+env.DistutilsPythonExtension('_register', source = [join('src', 'register', i)
for i in register_src])
Modified: trunk/scipy/odr/SConscript
===================================================================
--- trunk/scipy/odr/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/odr/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -58,5 +58,5 @@
env.PrependUnique(LIBPATH = env['build_dir'])
# odr pyextension
-env.NumpyPythonExtension('__odrpack', '__odrpack.c',
+env.DistutilsPythonExtension('__odrpack', '__odrpack.c',
LINKFLAGSEND = env['F77_LDFLAGS'])
Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/optimize/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -59,33 +59,33 @@
env.AppendUnique(LIBPATH = env['build_dir'])
# _minpack pyextension
-env.NumpyPythonExtension('_minpack', '_minpackmodule.c',
+env.DistutilsPythonExtension('_minpack', '_minpackmodule.c',
LINKFLAGSEND = env['F77_LDFLAGS'])
# _zeros pyextension
-env.NumpyPythonExtension('_zeros', 'zeros.c')
+env.DistutilsPythonExtension('_zeros', 'zeros.c')
# _lbfgsb pyextension
src = [pjoin('lbfgsb', i) for i in ['lbfgsb.pyf', 'routines.f']]
-env.NumpyPythonExtension('_lbfgsb', source = src,
+env.DistutilsPythonExtension('_lbfgsb', source = src,
LINKFLAGSEND = env['F77_LDFLAGS'])
# _cobyla pyextension
src = [pjoin('cobyla', i) for i in ['cobyla2.f', 'trstlp.f', 'cobyla.pyf']]
-env.NumpyPythonExtension('_cobyla', source = src,
+env.DistutilsPythonExtension('_cobyla', source = src,
LINKFLAGSEND = env['F77_LDFLAGS'])
# _minpack2 pyextension
src = [pjoin('minpack2', i) for i in ['dcsrch.f', 'dcstep.f', 'minpack2.pyf']]
-env.NumpyPythonExtension('minpack2', source = src,
+env.DistutilsPythonExtension('minpack2', source = src,
LINKFLAGSEND = env['F77_LDFLAGS'])
# moduleTNC pyextension
-env.NumpyPythonExtension('moduleTNC',
+env.DistutilsPythonExtension('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.NumpyPythonExtension('_slsqp', source = src,
+env.DistutilsPythonExtension('_slsqp', source = src,
LINKFLAGSEND = env['F77_LDFLAGS'])
Modified: trunk/scipy/signal/SConscript
===================================================================
--- trunk/scipy/signal/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/signal/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -8,12 +8,12 @@
env = GetNumpyEnvironment(ARGUMENTS)
env.AppendUnique(CPPPATH = get_numpy_include_dirs())
-env.NumpyPythonExtension('sigtools',
+env.DistutilsPythonExtension('sigtools',
source = ['sigtoolsmodule.c',\
'firfilter.c', \
'medianfilter.c'])
-env.NumpyPythonExtension('spline',
+env.DistutilsPythonExtension('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/sparse/linalg/dsolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/sparse/linalg/dsolve/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -42,6 +42,6 @@
common_src = ['_superlu_utils.c', '_superluobject.c']
for prec in ['z', 'd', 'c', 's']:
- pyenv.NumpyPythonExtension('_%ssuperlu' % prec,
+ pyenv.DistutilsPythonExtension('_%ssuperlu' % prec,
source = common_src + \
['_%ssuperlumodule.c' % prec])
Modified: trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/sparse/linalg/dsolve/umfpack/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -32,4 +32,4 @@
env.Append(SWIGFLAGS = '-python')
env.Append(SWIGFLAGS = '$_CPPINCFLAGS')
env.Append(CPPPATH = get_numpy_include_dirs())
- env.NumpyPythonExtension('__umfpack', source = 'umfpack.i')
+ env.DistutilsPythonExtension('__umfpack', source = 'umfpack.i')
Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -44,4 +44,4 @@
env.NumpyFromFTemplate('arpack.pyf', 'arpack.pyf.src')
env.Prepend(LIBS = 'arpack')
-env.NumpyPythonExtension('_arpack', 'arpack.pyf')
+env.DistutilsPythonExtension('_arpack', 'arpack.pyf')
Modified: trunk/scipy/sparse/linalg/isolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/isolve/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/sparse/linalg/isolve/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -55,4 +55,4 @@
res = env.NumpyFromFTemplate(target, pjoin('iterative', method))
sources.append(res[0])
-env.NumpyPythonExtension('_iterative', source = sources)
+env.DistutilsPythonExtension('_iterative', source = sources)
Modified: trunk/scipy/sparse/sparsetools/SConscript
===================================================================
--- trunk/scipy/sparse/sparsetools/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/sparse/sparsetools/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -9,4 +9,4 @@
for fmt in ['csr','csc','coo','bsr','dia']:
sources = [ fmt + '_wrap.cxx' ]
- env.NumpyPythonExtension('_%s' % fmt, source = sources)
+ env.DistutilsPythonExtension('_%s' % fmt, source = sources)
Modified: trunk/scipy/special/SConscript
===================================================================
--- trunk/scipy/special/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/special/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -52,7 +52,7 @@
src = ['_cephesmodule.c', 'amos_wrappers.c', 'specfun_wrappers.c', \
'toms_wrappers.c','cdf_wrappers.c','ufunc_extras.c']
-env.NumpyPythonExtension('_cephes',
+env.DistutilsPythonExtension('_cephes',
source = src,
LIBS = ['amos', 'toms', 'c_misc', 'cephes', 'mach',\
'cdf', 'specfunlib'],
@@ -60,6 +60,6 @@
# Specfun extension
env.Prepend(LIBS = ['specfunlib'])
-env.NumpyPythonExtension('specfun', source = 'specfun.pyf',
+env.DistutilsPythonExtension('specfun', source = 'specfun.pyf',
F2PYOPTIONS = ["--no-wrap-functions"],
LINKFLAGSEND = env['F77_LDFLAGS'])
Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/stats/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -24,16 +24,16 @@
env.AppendUnique(LIBPATH = [env['build_dir']])
# Statlib extension
-env.NumpyPythonExtension('statlib', source = 'statlib.pyf',
+env.DistutilsPythonExtension('statlib', source = 'statlib.pyf',
F2PYOPTIONS = ["--no-wrap-functions"],
LIBS = 'statlibimp',
LINKFLAGSEND = env['F77_LDFLAGS'])
# futil extension
futil_src = env.NumpyF2py(pjoin('futilmodule.c'), pjoin('futil.f'))
-env.NumpyPythonExtension('futil', source = futil_src + ['futil.f'],
+env.DistutilsPythonExtension('futil', source = futil_src + ['futil.f'],
LINKFLAGSEND = env['F77_LDFLAGS'])
# mvn extension
-env.NumpyPythonExtension('mvn', source = ['mvn.pyf', 'mvndst.f'],
+env.DistutilsPythonExtension('mvn', source = ['mvn.pyf', 'mvndst.f'],
LINKFLAGSEND = env['F77_LDFLAGS'])
Modified: trunk/scipy/stsci/convolve/SConscript
===================================================================
--- trunk/scipy/stsci/convolve/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/stsci/convolve/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -9,5 +9,5 @@
env.AppendUnique(CPPDEFINES = {'NUMPY': '1'})
# _correlate extension
-env.NumpyPythonExtension('_correlate', source = 'src/_correlatemodule.c')
-env.NumpyPythonExtension('_lineshape', source = 'src/_lineshapemodule.c')
+env.DistutilsPythonExtension('_correlate', source = 'src/_correlatemodule.c')
+env.DistutilsPythonExtension('_lineshape', source = 'src/_lineshapemodule.c')
Modified: trunk/scipy/stsci/image/SConscript
===================================================================
--- trunk/scipy/stsci/image/SConscript 2008-06-12 10:16:21 UTC (rev 4429)
+++ trunk/scipy/stsci/image/SConscript 2008-06-12 10:18:28 UTC (rev 4430)
@@ -8,4 +8,4 @@
env.AppendUnique(CPPPATH = [get_numpy_include_dirs(), get_numarray_include()])
env.AppendUnique(CPPDEFINES = {'NUMPY': '1'})
-env.NumpyPythonExtension('_combine', source = 'src/_combinemodule.c')
+env.DistutilsPythonExtension('_combine', source = 'src/_combinemodule.c')
More information about the Scipy-svn
mailing list