diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-02-02 09:51:17 -0800 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-02-02 09:51:17 -0800 |
| commit | a7ffc7acbbdcaa6ab596b638b27210c01ef259eb (patch) | |
| tree | 8d285c13ab8999d8179939a2a1478edab8d60f84 | |
| parent | bad160788d264aa92ce3e28e6d8feafb419f0b89 (diff) | |
| download | numpy-a7ffc7acbbdcaa6ab596b638b27210c01ef259eb.tar.gz | |
BLD: Fix scons and setup.py build
Moving lowlevel_strided_loops.h to private needed a setup.py update.
Added the rest of the needed files in the scons configuration.
| -rw-r--r-- | numpy/core/SConscript | 7 | ||||
| -rw-r--r-- | numpy/core/setup.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index 717f660df..5bf6bc5a4 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -460,9 +460,14 @@ if ENABLE_SEPARATE_COMPILATION: pjoin('src', 'multiarray', 'usertypes.c'), pjoin('src', 'multiarray', 'buffer.c'), pjoin('src', 'multiarray', 'numpymemoryview.c'), - pjoin('src', 'multiarray', 'scalarapi.c')] + pjoin('src', 'multiarray', 'scalarapi.c'), + pjoin('src', 'multiarray', 'new_iterator_pywrap.c'), + pjoin('src', 'multiarray', 'dtype_transfer.c')] multiarray_src.extend(arraytypes_src) multiarray_src.extend(scalartypes_src) + multiarray_src.extend(lowlevel_strided_loops_src) + multiarray_src.extend(new_iterator_src) + multiarray_src.extend(einsum_src) if PYTHON_HAS_UNICODE_WIDE: multiarray_src.extend([pjoin("src", "multiarray", "ucsnarrow.c")]) else: diff --git a/numpy/core/setup.py b/numpy/core/setup.py index cd726d09c..b03150309 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -739,7 +739,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', 'lowlevel_strided_loops.h')] + join('src', 'private', 'lowlevel_strided_loops.h')] multiarray_src = [join('src', 'multiarray', 'multiarraymodule.c'), join('src', 'multiarray', 'hashdescr.c'), |