diff options
| author | David Cournapeau <cournape@gmail.com> | 2011-08-21 16:47:20 +0200 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2011-08-29 00:32:27 +0200 |
| commit | ec59e5af21046dfdcdc5639ca2f06fad260f2d41 (patch) | |
| tree | 7ecb1b932fbaaa1684f869c6141f1541732543a5 | |
| parent | 4ed5624b0d2ee3de95087cd51aec0f98a7c6c2c6 (diff) | |
| download | numpy-ec59e5af21046dfdcdc5639ca2f06fad260f2d41.tar.gz | |
ENH: update bento build to recent changes in numpy.core.
| -rw-r--r-- | numpy/core/bento.info | 6 | ||||
| -rw-r--r-- | numpy/core/bscript | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/numpy/core/bento.info b/numpy/core/bento.info index 609f0d211..292f9b5d9 100644 --- a/numpy/core/bento.info +++ b/numpy/core/bento.info @@ -8,15 +8,15 @@ Library: src/npymath/npy_math.c.src, src/npymath/npy_math_complex.c.src, src/npymath/halffloat.c + CompiledLibrary: npysort + Sources: + src/npysort/sort.c.src Extension: multiarray Sources: src/multiarray/multiarraymodule_onefile.c Extension: multiarray_tests Sources: src/multiarray/multiarray_tests.c.src - Extension: _sort - Sources: - src/_sortmodule.c.src Extension: umath Sources: src/umath/umathmodule_onefile.c diff --git a/numpy/core/bscript b/numpy/core/bscript index 05a6b10a8..9e9529197 100644 --- a/numpy/core/bscript +++ b/numpy/core/bscript @@ -389,6 +389,12 @@ def pbuild(context): use="cloadable") context.register_compiled_library_builder("npymath", builder) + def builder_sort(library): + return context.default_library_builder(library, + includes=[".", "src/private", "src/npysort"], + use="npymath") + context.register_compiled_library_builder("npysort", builder_sort) + def builder_multiarray(extension): bld(name="multiarray_api", features="numpy_api_gen", @@ -397,7 +403,7 @@ def pbuild(context): multiarray_templates = ["src/multiarray/scalartypes.c.src", "src/multiarray/arraytypes.c.src", - "src/multiarray/nditer.c.src", + "src/multiarray/nditer_templ.c.src", "src/multiarray/lowlevel_strided_loops.c.src", "src/multiarray/einsum.c.src"] bld(target="multiarray_templates", source=multiarray_templates) @@ -430,7 +436,7 @@ def pbuild(context): pjoin('src', 'multiarray', 'refcount.c'), pjoin('src', 'multiarray', 'arraytypes.c.src'), pjoin('src', 'multiarray', 'scalartypes.c.src'), - pjoin('src', 'multiarray', 'nditer.c.src'), + pjoin('src', 'multiarray', 'nditer_templ.c.src'), pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src'), pjoin('src', 'multiarray', 'dtype_transfer.c'), pjoin('src', 'multiarray', 'nditer_pywrap.c'), @@ -443,15 +449,9 @@ def pbuild(context): return context.default_builder(extension, includes=includes, source=sources, - use="npymath") + use="npysort npymath") context.register_builder("multiarray", builder_multiarray) - def builder_sort(extension): - return context.default_builder(extension, - includes=[".", "src/private"], - use="npymath") - context.register_builder("_sort", builder_sort) - def build_ufunc(extension): bld(features="ufunc_api_gen", api_tuple=ufunc_api, |