diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-04-16 19:57:43 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-04-21 10:29:10 -0600 |
| commit | 243ab1e394b2d2a7a3714d56e309785654373c5c (patch) | |
| tree | 790a3f96ab1a48b776ca6d93e9c7fc563d94327d | |
| parent | 416e1abb102ab3fd5fe266853109c370e74070cf (diff) | |
| download | numpy-243ab1e394b2d2a7a3714d56e309785654373c5c.tar.gz | |
ENH: Fix bento script to always include ucsnarray.h and ucsnarrow.c.
This fix is kept separate to facilitate cherry picking for a backport.
| -rw-r--r-- | numpy/core/bscript | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/numpy/core/bscript b/numpy/core/bscript index 61ee3b6c3..19ab200bf 100644 --- a/numpy/core/bscript +++ b/numpy/core/bscript @@ -416,49 +416,48 @@ def pbuild(context): pattern="multiarray_api") multiarray_templates = ["src/multiarray/scalartypes.c.src", - "src/multiarray/arraytypes.c.src", + "src/multiarray/arraytypes.c.src", "src/multiarray/nditer_templ.c.src", - "src/multiarray/lowlevel_strided_loops.c.src", + "src/multiarray/lowlevel_strided_loops.c.src", "src/multiarray/einsum.c.src", "src/multiarray/boolean_ops.c.src"] bld(target="multiarray_templates", source=multiarray_templates) if ENABLE_SEPARATE_COMPILATION: - sources = [pjoin('src', 'multiarray', 'multiarraymodule.c'), + sources = [pjoin('src', 'multiarray', 'arrayobject.c'), + pjoin('src', 'multiarray', 'arraytypes.c.src'), pjoin('src', 'multiarray', 'boolean_ops.c.src'), - pjoin('src', 'multiarray', 'hashdescr.c'), - pjoin('src', 'multiarray', 'arrayobject.c'), - pjoin('src', 'multiarray', 'numpymemoryview.c'), pjoin('src', 'multiarray', 'buffer.c'), - pjoin('src', 'multiarray', 'datetime.c'), - pjoin('src', 'multiarray', 'numpyos.c'), + pjoin('src', 'multiarray', 'calculation.c'), + pjoin('src', 'multiarray', 'common.c'), pjoin('src', 'multiarray', 'conversion_utils.c'), - pjoin('src', 'multiarray', 'flagsobject.c'), + pjoin('src', 'multiarray', 'convert.c'), + pjoin('src', 'multiarray', 'convert_datatype.c'), + pjoin('src', 'multiarray', 'ctors.c'), + pjoin('src', 'multiarray', 'datetime.c'), pjoin('src', 'multiarray', 'descriptor.c'), + pjoin('src', 'multiarray', 'dtype_transfer.c'), + pjoin('src', 'multiarray', 'einsum.c.src'), + pjoin('src', 'multiarray', 'flagsobject.c'), + pjoin('src', 'multiarray', 'getset.c'), + pjoin('src', 'multiarray', 'hashdescr.c'), + pjoin('src', 'multiarray', 'item_selection.c'), pjoin('src', 'multiarray', 'iterators.c'), + pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src'), pjoin('src', 'multiarray', 'mapping.c'), + pjoin('src', 'multiarray', 'methods.c'), + pjoin('src', 'multiarray', 'multiarraymodule.c'), + pjoin('src', 'multiarray', 'nditer_pywrap.c'), + pjoin('src', 'multiarray', 'nditer_templ.c.src'), pjoin('src', 'multiarray', 'number.c'), - pjoin('src', 'multiarray', 'getset.c'), + pjoin('src', 'multiarray', 'numpymemoryview.c'), + pjoin('src', 'multiarray', 'numpyos.c'), + pjoin('src', 'multiarray', 'refcount.c'), + pjoin('src', 'multiarray', 'scalarapi.c'), + pjoin('src', 'multiarray', 'scalartypes.c.src'), pjoin('src', 'multiarray', 'sequence.c'), - pjoin('src', 'multiarray', 'methods.c'), - pjoin('src', 'multiarray', 'ctors.c'), - pjoin('src', 'multiarray', 'convert_datatype.c'), - pjoin('src', 'multiarray', 'convert.c'), pjoin('src', 'multiarray', 'shape.c'), - pjoin('src', 'multiarray', 'item_selection.c'), - pjoin('src', 'multiarray', 'calculation.c'), - pjoin('src', 'multiarray', 'common.c'), + pjoin('src', 'multiarray', 'ucsnarrow.c')] pjoin('src', 'multiarray', 'usertypes.c'), - pjoin('src', 'multiarray', 'scalarapi.c'), - pjoin('src', 'multiarray', 'refcount.c'), - pjoin('src', 'multiarray', 'arraytypes.c.src'), - pjoin('src', 'multiarray', 'scalartypes.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'), - pjoin('src', 'multiarray', 'einsum.c.src')] - if PYTHON_HAS_UNICODE_WIDE: - sources.append(pjoin('src', 'multiarray', 'ucsnarrow.c')) else: sources = extension.sources includes = ["src/multiarray", "src/private"] |