diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-08-20 12:39:40 -0600 |
|---|---|---|
| committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2014-09-04 21:47:14 +0200 |
| commit | 9c1d5538b5bf8682b82f0290615d3e9d7f97d746 (patch) | |
| tree | ca1cfd222cf5b822511cec0ae223804c95faa80f /numpy/core/setup.py | |
| parent | 2079469b151fa4719fdce10d4324497aad45ded5 (diff) | |
| download | numpy-9c1d5538b5bf8682b82f0290615d3e9d7f97d746.tar.gz | |
ENH: Move vdot to multiarray.
Remove vdot from _dotblas and implement it in multiarray.
Remove the files in core/blasdot as they are no longer needed.
Fix tests and build to reflect the changes.
The vdot function is now a bit faster in the common case as ravel
is used instead of flatten. There is also no need to conjugate the
files for clongdouble.
Diffstat (limited to 'numpy/core/setup.py')
| -rw-r--r-- | numpy/core/setup.py | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 48d5c255b..2da2e837a 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -772,6 +772,7 @@ def configuration(parent_package='',top_path=None): join('src', 'multiarray', 'shape.h'), join('src', 'multiarray', 'ucsnarrow.h'), join('src', 'multiarray', 'usertypes.h'), + join('src', 'multiarray', 'vdot.h'), join('src', 'private', 'lowlevel_strided_loops.h'), join('include', 'numpy', 'arrayobject.h'), join('include', 'numpy', '_neighborhood_iterator_imp.h'), @@ -838,7 +839,9 @@ def configuration(parent_package='',top_path=None): join('src', 'multiarray', 'scalarapi.c'), join('src', 'multiarray', 'scalartypes.c.src'), join('src', 'multiarray', 'usertypes.c'), - join('src', 'multiarray', 'ucsnarrow.c')] + join('src', 'multiarray', 'ucsnarrow.c'), + join('src', 'multiarray', 'vdot.c'), + ] blas_info = get_info('blas_opt', 0) if blas_info and ('HAVE_CBLAS', None) in blas_info.get('define_macros', []): @@ -950,28 +953,6 @@ def configuration(parent_package='',top_path=None): libraries = ['npymath'], ) - ####################################################################### - # _dotblas module # - ####################################################################### - - # Configure blasdot - blas_info = get_info('blas_opt', 0) - #blas_info = {} - def get_dotblas_sources(ext, build_dir): - if blas_info: - if ('HAVE_CBLAS', None) in blas_info.get('define_macros', []): - return ext.depends[:1] - # dotblas needs CBLAS, Fortran compiled BLAS will not work. - return None - - config.add_extension('_dotblas', - sources = [get_dotblas_sources], - depends = [join('blasdot', '_dotblas.c'), - join('blasdot', 'cblas.h'), - ], - include_dirs = ['blasdot'], - extra_info = blas_info - ) ####################################################################### # umath_tests module # |