diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-11-20 09:40:34 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-11-20 09:40:34 -0500 |
| commit | 31b94e85a99db998bd6156d2b800386973fef3e1 (patch) | |
| tree | 6d11dafd6c90b884cfa2453698d1a2a92a37225a /numpy/core/bscript | |
| parent | fb037eba5432d401f4c85d97051b09147b20d5c4 (diff) | |
| parent | 261de3f0c9a525ba8893ecc8ad4328e474798bdd (diff) | |
| download | numpy-31b94e85a99db998bd6156d2b800386973fef3e1.tar.gz | |
Merge pull request #5162 from juliantaylor/scalarmath-merge
MAINT: merge scalarmathmodule into umath module
Diffstat (limited to 'numpy/core/bscript')
| -rw-r--r-- | numpy/core/bscript | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/bscript b/numpy/core/bscript index 61d0b93b8..5df5a3f8a 100644 --- a/numpy/core/bscript +++ b/numpy/core/bscript @@ -426,7 +426,7 @@ def pre_build(context): "src/multiarray/arraytypes.c.src", "src/multiarray/nditer_templ.c.src", "src/multiarray/lowlevel_strided_loops.c.src", - "src/multiarray/templ_common.h.src", + "src/private/templ_common.h.src", "src/multiarray/einsum.c.src"] bld(target="multiarray_templates", source=multiarray_templates) if ENABLE_SEPARATE_COMPILATION: @@ -440,7 +440,6 @@ def pre_build(context): pjoin('src', 'multiarray', 'buffer.c'), pjoin('src', 'multiarray', 'calculation.c'), pjoin('src', 'multiarray', 'common.c'), - pjoin('src', 'multiarray', 'templ_common.h.src'), pjoin('src', 'multiarray', 'conversion_utils.c'), pjoin('src', 'multiarray', 'convert.c'), pjoin('src', 'multiarray', 'convert_datatype.c'), @@ -476,6 +475,7 @@ def pre_build(context): pjoin('src', 'multiarray', 'ucsnarrow.c'), pjoin('src', 'multiarray', 'usertypes.c'), pjoin('src', 'multiarray', 'vdot.c'), + pjoin('src', 'private', 'templ_common.h.src'), ] if bld.env.HAS_CBLAS: @@ -508,6 +508,7 @@ def pre_build(context): name="ufunc_api") ufunc_templates = [ + "src/umath/scalarmath.c.src", "src/umath/loops.h.src", "src/umath/loops.c.src", "src/umath/funcs.inc.src", @@ -521,6 +522,7 @@ def pre_build(context): includes = ["src/umath", "src/multiarray", "src/private"] if ENABLE_SEPARATE_COMPILATION: sources = [ + pjoin("src", "umath", "scalarmath.c.src"), pjoin("src", "umath", "loops.h.src"), pjoin("src", "umath", "loops.c.src"), pjoin('src', 'umath', 'reduction.c'), @@ -536,6 +538,5 @@ def pre_build(context): use="npymath") context.register_builder("umath", build_ufunc) - context.tweak_extension("scalarmath", use="npymath", includes=["src/private"]) context.tweak_extension("multiarray_tests", use="npymath", includes=["src/private"]) context.tweak_extension("umath_tests", use="npymath", includes=["src/private"]) |