diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-04 11:49:24 -0800 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-09 01:55:01 -0800 |
| commit | b3efccc0e7de4c73f3bd009714f3586360baeecb (patch) | |
| tree | 78546a97b2ae8bc44445b2ecd0a63713fc28b7fc /numpy/core/numeric.py | |
| parent | fe791db7b96ca4f19d490f43cf3dc5157d7e325f (diff) | |
| download | numpy-b3efccc0e7de4c73f3bd009714f3586360baeecb.tar.gz | |
ENH: iter: Change nested iteration pattern and add nested_iters Python function
Nested iteration now uses a function NpyIter_ResetBasePointers, and the
NPY_ITER_OFFSETS flag which was the previous way to do this has been
removed.
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 915dc10fd..62fbd4186 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -1,4 +1,4 @@ -__all__ = ['newaxis', 'ndarray', 'flatiter', 'newiter', 'ufunc', +__all__ = ['newaxis', 'ndarray', 'flatiter', 'newiter', 'nested_iters', 'ufunc', 'arange', 'array', 'zeros', 'empty', 'broadcast', 'dtype', 'fromstring', 'fromfile', 'frombuffer', 'int_asbuffer', 'where', 'argwhere', @@ -55,6 +55,7 @@ BUFSIZE = multiarray.BUFSIZE ndarray = multiarray.ndarray flatiter = multiarray.flatiter newiter = multiarray.newiter +nested_iters = multiarray.nested_iters broadcast = multiarray.broadcast dtype = multiarray.dtype ufunc = type(sin) |