[Python-checkins] CVS: distutils/examples numpy_setup.py,1.8,1.9
Greg Ward
python-dev@python.org
2000年5月30日 19:27:26 -0700
Update of /cvsroot/python/distutils/examples
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21852
Modified Files:
numpy_setup.py
Log Message:
Changed to use the new Extension class, instead of defining hairy nested
data structures to describe all the extensions to build.
Index: numpy_setup.py
===================================================================
RCS file: /cvsroot/python/distutils/examples/numpy_setup.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** numpy_setup.py 2000年05月30日 03:02:02 1.8
--- numpy_setup.py 2000年05月31日 02:27:23 1.9
***************
*** 15,19 ****
from glob import glob
from distutils.command.install import install
! from distutils.core import setup
from distutils.sysconfig import get_python_inc
--- 15,19 ----
from glob import glob
from distutils.command.install import install
! from distutils.core import setup, Extension
from distutils.sysconfig import get_python_inc
***************
*** 32,74 ****
include_dirs = ['Include'],
headers = headers,
! ext_modules = [('_numpy',
! { 'sources' : ['Src/_numpymodule.c',
! 'Src/arrayobject.c',
! 'Src/ufuncobject.c'],
! }
! ),
!
! ('multiarray',
! { 'sources' : ['Src/multiarraymodule.c'],
! }
! ),
!
! ('umath',
! { 'sources': ['Src/umathmodule.c'], }
! ),
!
! ('fftpack',
! { 'sources': ['Src/fftpackmodule.c',
! 'Src/fftpack.c'], }
! ),
!
! ('lapack_lite',
! { 'sources' : ['Src/lapack_litemodule.c',
! 'Src/dlapack_lite.c',
! 'Src/zlapack_lite.c',
! 'Src/blas_lite.c',
! 'Src/f2c_lite.c'], }
! ),
!
! ('ranlib',
! { 'sources': ['Src/ranlibmodule.c',
! 'Src/ranlib.c',
! 'Src/com.c',
! 'Src/linpack.c'], }
! ),
!
! ('arrayfns',
! { 'sources': ['Src/arrayfnsmodule.c'],}
! )
]
)
--- 32,57 ----
include_dirs = ['Include'],
headers = headers,
! ext_modules = [Extension('_numpy',
! ['Src/_numpymodule.c',
! 'Src/arrayobject.c',
! 'Src/ufuncobject.c']),
! Extension('multiarray', ['Src/multiarraymodule.c']),
! Extension('umath', ['Src/umathmodule.c']),
! Extension('fftpack',
! ['Src/fftpackmodule.c',
! 'Src/fftpack.c']),
! Extension('lapack_lite',
! ['Src/lapack_litemodule.c',
! 'Src/dlapack_lite.c',
! 'Src/zlapack_lite.c',
! 'Src/blas_lite.c',
! 'Src/f2c_lite.c']),
! Extension('ranlib',
! ['Src/ranlibmodule.c',
! 'Src/ranlib.c',
! 'Src/com.c',
! 'Src/linpack.c']),
! Extension('arrayfns',
! ['Src/arrayfnsmodule.c'])
]
)