diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-07 12:23:20 -0800 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-09 01:55:04 -0800 |
| commit | eff3118c9a8b1a08a43a437947f12143bb544ff4 (patch) | |
| tree | f3398d0ee6bbaa2f3ff89a26f7342eb251fc59c6 /numpy | |
| parent | e8101f5d55541fcd25c5fe0d3dd5f37a5c66a3fc (diff) | |
| download | numpy-eff3118c9a8b1a08a43a437947f12143bb544ff4.tar.gz | |
ENH: iter: Move new_iterator.h to the include directory
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/include/numpy/new_iterator.h (renamed from numpy/core/src/multiarray/new_iterator.h) | 0 | ||||
| -rw-r--r-- | numpy/core/setup.py | 1 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/new_iterator.c.src | 6 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/new_iterator_pywrap.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/numpy/core/src/multiarray/new_iterator.h b/numpy/core/include/numpy/new_iterator.h index 2d54a31af..2d54a31af 100644 --- a/numpy/core/src/multiarray/new_iterator.h +++ b/numpy/core/include/numpy/new_iterator.h diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 442bcee57..ca19abb5b 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -738,7 +738,6 @@ 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', 'new_iterator.h'), join('src', 'multiarray', 'lowlevel_strided_loops.h')] multiarray_src = [join('src', 'multiarray', 'multiarraymodule.c'), diff --git a/numpy/core/src/multiarray/new_iterator.c.src b/numpy/core/src/multiarray/new_iterator.c.src index 8b9cafb26..4eaf6518e 100644 --- a/numpy/core/src/multiarray/new_iterator.c.src +++ b/numpy/core/src/multiarray/new_iterator.c.src @@ -5,7 +5,7 @@ #define _MULTIARRAYMODULE #include <numpy/ndarrayobject.h> -#include "new_iterator.h" +#include <numpy/new_iterator.h> #include "lowlevel_strided_loops.h" /* Rounds up a number of bytes to be divisible by sizeof intp */ @@ -51,9 +51,9 @@ /* The operand needs type conversion/byte swapping/alignment */ #define NPY_OP_ITFLAG_CAST 0x08 /* The operand never needs buffering */ -#define NPY_OP_ITFLAG_BUFNEVER 0x20 +#define NPY_OP_ITFLAG_BUFNEVER 0x10 /* The operand is aligned */ -#define NPY_OP_ITFLAG_ALIGNED 0x40 +#define NPY_OP_ITFLAG_ALIGNED 0x20 /* * The data layout of the iterator is fully specified by diff --git a/numpy/core/src/multiarray/new_iterator_pywrap.c b/numpy/core/src/multiarray/new_iterator_pywrap.c index 871ab33b7..1d1936fd1 100644 --- a/numpy/core/src/multiarray/new_iterator_pywrap.c +++ b/numpy/core/src/multiarray/new_iterator_pywrap.c @@ -9,7 +9,7 @@ #include "numpy/npy_3kcompat.h" -#include "new_iterator.h" +#include <numpy/new_iterator.h> typedef struct NewNpyArrayIterObject_tag NewNpyArrayIterObject; |