diff options
| author | Pauli Virtanen <pav@iki.fi> | 2017-01-19 22:40:09 +0100 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2017-01-19 22:47:19 +0100 |
| commit | acedf6860823234460facf7957e42dc65ab5efad (patch) | |
| tree | c055bb8cd417691ef67ba722563d7728ffec22d4 /numpy/add_newdocs.py | |
| parent | e4af3fd9f485e9f8d923339d4a632bc83f9ad8d7 (diff) | |
| download | numpy-acedf6860823234460facf7957e42dc65ab5efad.tar.gz | |
ENH: core: change NPY_ITER_OVERLAP_NOT_SAME to NPY_ITER_OVERLAP_ALLOW_SAME
It's clearer to explicitly specify which operands are accessed
elementwise, rather than to list exceptions.
Diffstat (limited to 'numpy/add_newdocs.py')
| -rw-r--r-- | numpy/add_newdocs.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py index b7b000376..9fc28a4ae 100644 --- a/numpy/add_newdocs.py +++ b/numpy/add_newdocs.py @@ -170,9 +170,8 @@ add_newdoc('numpy.core', 'nditer', * "common_dtype" causes all the operands to be converted to a common data type, with copying or buffering as necessary. * "copy_if_overlap" causes the iterator to determine if read - operands have overlap with write operands (except if - the arrays are exactly the same), and make temporary copies - as necessary to avoid overlap. False positives (needless + operands have overlap with write operands, and make temporary + copies as necessary to avoid overlap. False positives (needless copying) are possible in some cases. * "delay_bufalloc" delays allocation of the buffers until a reset() call is made. Allows "allocate" operands to @@ -213,6 +212,9 @@ add_newdoc('numpy.core', 'nditer', copies those elements indicated by this mask. * 'writemasked' indicates that only elements where the chosen 'arraymask' operand is True will be written to. + * "overlap_allow_same" can be used to mark operands that are + accessed only in the iterator order, to allow less conservative + copying when "copy_if_overlap" is present. op_dtypes : dtype or tuple of dtype(s), optional The required data type(s) of the operands. If copying or buffering is enabled, the data will be converted to/from their original types. |