summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/code_generators/cversions.txt3
-rw-r--r--numpy/core/code_generators/numpy_api.py2
-rw-r--r--numpy/core/setup_common.py4
-rw-r--r--numpy/core/src/multiarray/_multiarray_tests.c.src73
-rw-r--r--numpy/core/src/multiarray/arrayobject.c3
-rw-r--r--numpy/core/src/multiarray/einsum.c.src2
-rw-r--r--numpy/core/src/multiarray/nditer_api.c60
-rw-r--r--numpy/core/src/multiarray/nditer_constr.c23
-rw-r--r--numpy/core/src/multiarray/nditer_pywrap.c104
-rw-r--r--numpy/core/src/umath/ufunc_object.c51
-rw-r--r--numpy/core/tests/test_nditer.py13
11 files changed, 84 insertions, 254 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt
index cc6c3a5fb..43c32eac6 100644
--- a/numpy/core/code_generators/cversions.txt
+++ b/numpy/core/code_generators/cversions.txt
@@ -39,8 +39,7 @@
0x0000000b = edb1ba83730c650fd9bc5772a919cda7
# Version 12 (NumPy 1.14) Added PyArray_ResolveWritebackIfCopy,
+# Version 12 (NumPy 1.15) No change.
# PyArray_SetWritebackIfCopyBase and deprecated PyArray_SetUpdateIfCopyBase.
0x0000000c = a1bc756c5782853ec2e3616cf66869d8
-# Version 13 (NumPy 1.15) Added NpyIter_Close
-0x0000000d = 4386e829d65aafce6bd09a85b142d585
diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py
index 6cfbbbcc7..d8a9ee6b4 100644
--- a/numpy/core/code_generators/numpy_api.py
+++ b/numpy/core/code_generators/numpy_api.py
@@ -350,8 +350,6 @@ multiarray_funcs_api = {
'PyArray_ResolveWritebackIfCopy': (302,),
'PyArray_SetWritebackIfCopyBase': (303,),
# End 1.14 API
- 'NpyIter_Close': (304,),
- # End 1.15 API
}
ufunc_types_api = {
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
index 70a43046c..356482b07 100644
--- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py
@@ -40,8 +40,8 @@ C_ABI_VERSION = 0x01000009
# 0x0000000a - 1.12.x
# 0x0000000b - 1.13.x
# 0x0000000c - 1.14.x
-# 0x0000000d - 1.15.x
-C_API_VERSION = 0x0000000d
+# 0x0000000c - 1.15.x
+C_API_VERSION = 0x0000000c
class MismatchCAPIWarning(Warning):
pass
diff --git a/numpy/core/src/multiarray/_multiarray_tests.c.src b/numpy/core/src/multiarray/_multiarray_tests.c.src
index cba96a4c2..67c9a333c 100644
--- a/numpy/core/src/multiarray/_multiarray_tests.c.src
+++ b/numpy/core/src/multiarray/_multiarray_tests.c.src
@@ -1042,76 +1042,6 @@ test_nditer_too_large(PyObject *NPY_UNUSED(self), PyObject *args) {
}
static PyObject *
-test_nditer_writeback(PyObject *NPY_UNUSED(ignored), PyObject *args, PyObject *kwds)
-{
- /* like npyiter_init */
- PyObject *op_in = NULL, *op_dtypes_in = NULL, *value = NULL;
- PyArrayObject * opview;
- int iop, nop = 0;
- PyArrayObject *op[NPY_MAXARGS];
- npy_uint32 flags = 0;
- NPY_ORDER order = NPY_KEEPORDER;
- NPY_CASTING casting = NPY_EQUIV_CASTING;
- npy_uint32 op_flags[NPY_MAXARGS];
- PyArray_Descr *op_request_dtypes[NPY_MAXARGS];
- int retval;
- unsigned char do_close;
- int buffersize = 0;
- NpyIter *iter = NULL;
- static char *kwlist[] = {"value", "do_close", "input", "op_dtypes", NULL};
-
- if (!PyArg_ParseTupleAndKeywords(args, kwds,
- "ObO|O:test_nditer_writeback", kwlist,
- &value,
- &do_close,
- &op_in,
- &op_dtypes_in)) {
- return NULL;
- }
- /* op and op_flags */
- if (! PyArray_Check(op_in)) {
- return NULL;
- }
- nop = 1;
- op[0] = (PyArrayObject*)op_in;
- op_flags[0] = NPY_ITER_READWRITE|NPY_ITER_UPDATEIFCOPY;
-
- /* Set the dtypes */
- for (iop=0; iop<nop; iop++) {
- PyObject *dtype = PySequence_GetItem(op_dtypes_in, iop);
- PyArray_DescrConverter2(dtype, &op_request_dtypes[iop]);
- }
-
- iter = NpyIter_AdvancedNew(nop, op, flags, order, casting, op_flags,
- op_request_dtypes,
- -1, NULL, NULL,
- buffersize);
- if (iter == NULL) {
- goto fail;
- }
-
- opview = NpyIter_GetIterView(iter, 0);
- retval = PyArray_FillWithScalar(opview, value);
- Py_DECREF(opview);
- if (retval < 0) {
- NpyIter_Deallocate(iter);
- return NULL;
- }
- if (do_close != 0) {
- NpyIter_Close(iter);
- }
- NpyIter_Deallocate(iter);
- Py_RETURN_NONE;
-
-fail:
- for (iop = 0; iop < nop; ++iop) {
- Py_XDECREF(op[iop]);
- Py_XDECREF(op_request_dtypes[iop]);
- }
- return NULL;
-}
-
-static PyObject *
array_solve_diophantine(PyObject *NPY_UNUSED(ignored), PyObject *args, PyObject *kwds)
{
PyObject *A = NULL;
@@ -1948,9 +1878,6 @@ static PyMethodDef Multiarray_TestsMethods[] = {
{"test_nditer_too_large",
test_nditer_too_large,
METH_VARARGS, NULL},
- {"test_nditer_writeback",
- (PyCFunction)test_nditer_writeback,
- METH_VARARGS | METH_KEYWORDS, NULL},
{"solve_diophantine",
(PyCFunction)array_solve_diophantine,
METH_VARARGS | METH_KEYWORDS, NULL},
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
index 943edc772..41748c714 100644
--- a/numpy/core/src/multiarray/arrayobject.c
+++ b/numpy/core/src/multiarray/arrayobject.c
@@ -482,8 +482,7 @@ array_dealloc(PyArrayObject *self)
{
char const * msg = "WRITEBACKIFCOPY detected in array_dealloc. "
" Required call to PyArray_ResolveWritebackIfCopy or "
- "PyArray_DiscardWritebackIfCopy is missing. This could also "
- "be caused by using a nditer without a context manager";
+ "PyArray_DiscardWritebackIfCopy is missing.";
Py_INCREF(self); /* hold on to self in next call since if
* refcount == 0 it will recurse back into
*array_dealloc
diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src
index 039bcc15e..33184d99a 100644
--- a/numpy/core/src/multiarray/einsum.c.src
+++ b/numpy/core/src/multiarray/einsum.c.src
@@ -2857,7 +2857,6 @@ PyArray_EinsteinSum(char *subscripts, npy_intp nop,
iternext = NpyIter_GetIterNext(iter, NULL);
if (iternext == NULL) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
Py_DECREF(ret);
goto fail;
@@ -2881,7 +2880,6 @@ PyArray_EinsteinSum(char *subscripts, npy_intp nop,
}
finish:
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
for (iop = 0; iop < nop; ++iop) {
Py_DECREF(op[iop]);
diff --git a/numpy/core/src/multiarray/nditer_api.c b/numpy/core/src/multiarray/nditer_api.c
index ba9e9f273..7a33ac05e 100644
--- a/numpy/core/src/multiarray/nditer_api.c
+++ b/numpy/core/src/multiarray/nditer_api.c
@@ -1381,47 +1381,6 @@ NpyIter_GetInnerLoopSizePtr(NpyIter *iter)
}
/*NUMPY_API
- * Resolves all writebackifcopy scratch buffers, not safe to use iterator
- * operands after this call, in this iterator as well as any copies.
- * Returns 0 on success, -1 on failure
- */
-NPY_NO_EXPORT int
-NpyIter_Close(NpyIter *iter)
-{
- int ret=0, iop, nop;
- PyArrayObject ** operands;
- npyiter_opitflags *op_itflags;
- if (iter == NULL) {
- return 0;
- }
- nop = NIT_NOP(iter);
- operands = NIT_OPERANDS(iter);
- op_itflags = NIT_OPITFLAGS(iter);
- /* If NPY_OP_ITFLAG_HAS_WRITEBACK flag set on operand, resolve it.
- * If the resolution fails (should never happen), continue from the
- * next operand and discard the writeback scratch buffers, and return
- * failure status
- */
- for (iop=0; iop<nop; iop++) {
- if (op_itflags[iop] & NPY_OP_ITFLAG_HAS_WRITEBACK) {
- op_itflags[iop] &= ~NPY_OP_ITFLAG_HAS_WRITEBACK;
- if (PyArray_ResolveWritebackIfCopy(operands[iop]) < 0) {
- ret = -1;
- iop++;
- break;
- }
- }
- }
- for (; iop<nop; iop++) {
- if (op_itflags[iop] & NPY_OP_ITFLAG_HAS_WRITEBACK) {
- op_itflags[iop] &= ~NPY_OP_ITFLAG_HAS_WRITEBACK;
- PyArray_DiscardWritebackIfCopy(operands[iop]);
- }
- }
- return ret;
-}
-
-/*NUMPY_API
* For debugging
*/
NPY_NO_EXPORT void
@@ -2830,4 +2789,23 @@ npyiter_checkreducesize(NpyIter *iter, npy_intp count,
}
return count * (*reduce_innersize);
}
+
+NPY_NO_EXPORT npy_bool
+npyiter_has_writeback(NpyIter *iter)
+{
+ int iop, nop;
+ npyiter_opitflags *op_itflags;
+ if (iter == NULL) {
+ return 0;
+ }
+ nop = NIT_NOP(iter);
+ op_itflags = NIT_OPITFLAGS(iter);
+
+ for (iop=0; iop<nop; iop++) {
+ if (op_itflags[iop] & NPY_OP_ITFLAG_HAS_WRITEBACK) {
+ return NPY_TRUE;
+ }
+ }
+ return NPY_FALSE;
+}
#undef NPY_ITERATOR_IMPLEMENTATION_CODE
diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c
index b07137858..c56376f58 100644
--- a/numpy/core/src/multiarray/nditer_constr.c
+++ b/numpy/core/src/multiarray/nditer_constr.c
@@ -403,7 +403,6 @@ NpyIter_AdvancedNew(int nop, PyArrayObject **op_in, npy_uint32 flags,
*/
if (!npyiter_allocate_arrays(iter, flags, op_dtype, subtype, op_flags,
op_itflags, op_axes)) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return NULL;
}
@@ -465,14 +464,12 @@ NpyIter_AdvancedNew(int nop, PyArrayObject **op_in, npy_uint32 flags,
/* If buffering is set without delayed allocation */
if (itflags & NPY_ITFLAG_BUFFER) {
if (!npyiter_allocate_transfer_functions(iter)) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return NULL;
}
if (!(itflags & NPY_ITFLAG_DELAYBUF)) {
/* Allocate the buffers */
if (!npyiter_allocate_buffers(iter, NULL)) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return NULL;
}
@@ -654,6 +651,8 @@ NpyIter_Deallocate(NpyIter *iter)
int iop, nop;
PyArray_Descr **dtype;
PyArrayObject **object;
+ npyiter_opitflags *op_itflags;
+ npy_bool resolve = 1;
if (iter == NULL) {
return NPY_SUCCEED;
@@ -663,6 +662,7 @@ NpyIter_Deallocate(NpyIter *iter)
nop = NIT_NOP(iter);
dtype = NIT_DTYPES(iter);
object = NIT_OPERANDS(iter);
+ op_itflags = NIT_OPITFLAGS(iter);
/* Deallocate any buffers and buffering data */
if (itflags & NPY_ITFLAG_BUFFER) {
@@ -691,15 +691,28 @@ NpyIter_Deallocate(NpyIter *iter)
}
}
- /* Deallocate all the dtypes and objects that were iterated */
+ /*
+ * Deallocate all the dtypes and objects that were iterated and resolve
+ * any writeback buffers created by the iterator
+ */
for(iop = 0; iop < nop; ++iop, ++dtype, ++object) {
+ if (op_itflags[iop] & NPY_OP_ITFLAG_HAS_WRITEBACK) {
+ if (resolve && PyArray_ResolveWritebackIfCopy(*object) < 0) {
+ resolve = 0;
+ }
+ else {
+ PyArray_DiscardWritebackIfCopy(*object);
+ }
+ }
Py_XDECREF(*dtype);
Py_XDECREF(*object);
}
/* Deallocate the iterator memory */
PyObject_Free(iter);
-
+ if (resolve == 0) {
+ return NPY_FAIL;
+ }
return NPY_SUCCEED;
}
diff --git a/numpy/core/src/multiarray/nditer_pywrap.c b/numpy/core/src/multiarray/nditer_pywrap.c
index 0b6c80c8a..5a9f3c5fa 100644
--- a/numpy/core/src/multiarray/nditer_pywrap.c
+++ b/numpy/core/src/multiarray/nditer_pywrap.c
@@ -1,5 +1,5 @@
/*
- * This file implements the CPython wrapper of the new NumPy iterator.
+ * This file implements the CPython wrapper of NpyIter
*
* Copyright (c) 2010 by Mark Wiebe (mwwiebe@gmail.com)
* The University of British Columbia
@@ -19,6 +19,10 @@
#include "common.h"
#include "ctors.h"
+/* Functions not part of the public NumPy C API */
+npy_bool npyiter_has_writeback(NpyIter *iter);
+
+
typedef struct NewNpyArrayIterObject_tag NewNpyArrayIterObject;
struct NewNpyArrayIterObject_tag {
@@ -27,8 +31,6 @@ struct NewNpyArrayIterObject_tag {
NpyIter *iter;
/* Flag indicating iteration started/stopped */
char started, finished;
- /* iter operands cannot be referenced if iter is closed */
- npy_bool is_closed;
/* Child to update for nested iteration */
NewNpyArrayIterObject *nested_child;
/* Cached values from the iterator */
@@ -88,7 +90,6 @@ npyiter_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
if (self != NULL) {
self->iter = NULL;
self->nested_child = NULL;
- self->is_closed = 0;
}
return (PyObject *)self;
@@ -1173,10 +1174,29 @@ fail:
return NULL;
}
+
static void
npyiter_dealloc(NewNpyArrayIterObject *self)
{
if (self->iter) {
+ if (npyiter_has_writeback(self->iter)) {
+ if (PyErr_WarnEx(PyExc_RuntimeWarning,
+ "Temporary data has not been written back to one of the "
+ "operands. Typically nditer is used as a context manager "
+ "otherwise 'close' must be called before reading iteration "
+ "results.", 1) < 0) {
+ PyObject *s;
+
+ s = PyUString_FromString("npyiter_dealloc");
+ if (s) {
+ PyErr_WriteUnraisable(s);
+ Py_DECREF(s);
+ }
+ else {
+ PyErr_WriteUnraisable(Py_None);
+ }
+ }
+ }
NpyIter_Deallocate(self->iter);
self->iter = NULL;
Py_XDECREF(self->nested_child);
@@ -1418,12 +1438,6 @@ static PyObject *npyiter_value_get(NewNpyArrayIterObject *self)
ret = npyiter_seq_item(self, 0);
}
else {
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return NULL;
- }
-
ret = PyTuple_New(nop);
if (ret == NULL) {
return NULL;
@@ -1453,12 +1467,6 @@ static PyObject *npyiter_operands_get(NewNpyArrayIterObject *self)
"Iterator is invalid");
return NULL;
}
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return NULL;
- }
-
nop = NpyIter_GetNOp(self->iter);
operands = self->operands;
@@ -1487,13 +1495,6 @@ static PyObject *npyiter_itviews_get(NewNpyArrayIterObject *self)
"Iterator is invalid");
return NULL;
}
-
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return NULL;
- }
-
nop = NpyIter_GetNOp(self->iter);
ret = PyTuple_New(nop);
@@ -1517,7 +1518,7 @@ static PyObject *
npyiter_next(NewNpyArrayIterObject *self)
{
if (self->iter == NULL || self->iternext == NULL ||
- self->finished || self->is_closed) {
+ self->finished) {
return NULL;
}
@@ -1911,13 +1912,6 @@ static PyObject *npyiter_dtypes_get(NewNpyArrayIterObject *self)
"Iterator is invalid");
return NULL;
}
-
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return NULL;
- }
-
nop = NpyIter_GetNOp(self->iter);
ret = PyTuple_New(nop);
@@ -2011,13 +2005,6 @@ npyiter_seq_item(NewNpyArrayIterObject *self, Py_ssize_t i)
"and no reset has been done yet");
return NULL;
}
-
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return NULL;
- }
-
nop = NpyIter_GetNOp(self->iter);
/* Negative indexing */
@@ -2090,13 +2077,6 @@ npyiter_seq_slice(NewNpyArrayIterObject *self,
"and no reset has been done yet");
return NULL;
}
-
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return NULL;
- }
-
nop = NpyIter_GetNOp(self->iter);
if (ilow < 0) {
ilow = 0;
@@ -2156,13 +2136,6 @@ npyiter_seq_ass_item(NewNpyArrayIterObject *self, Py_ssize_t i, PyObject *v)
"and no reset has been done yet");
return -1;
}
-
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return -1;
- }
-
nop = NpyIter_GetNOp(self->iter);
/* Negative indexing */
@@ -2234,13 +2207,6 @@ npyiter_seq_ass_slice(NewNpyArrayIterObject *self, Py_ssize_t ilow,
"and no reset has been done yet");
return -1;
}
-
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return -1;
- }
-
nop = NpyIter_GetNOp(self->iter);
if (ilow < 0) {
ilow = 0;
@@ -2292,12 +2258,6 @@ npyiter_subscript(NewNpyArrayIterObject *self, PyObject *op)
return NULL;
}
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return NULL;
- }
-
if (PyInt_Check(op) || PyLong_Check(op) ||
(PyIndex_Check(op) && !PySequence_Check(op))) {
npy_intp i = PyArray_PyIntAsIntp(op);
@@ -2347,12 +2307,6 @@ npyiter_ass_subscript(NewNpyArrayIterObject *self, PyObject *op,
return -1;
}
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError,
- "Iterator is closed");
- return -1;
- }
-
if (PyInt_Check(op) || PyLong_Check(op) ||
(PyIndex_Check(op) && !PySequence_Check(op))) {
npy_intp i = PyArray_PyIntAsIntp(op);
@@ -2387,10 +2341,6 @@ npyiter_enter(NewNpyArrayIterObject *self)
PyErr_SetString(PyExc_RuntimeError, "operation on non-initialized iterator");
return NULL;
}
- if (self->is_closed) {
- PyErr_SetString(PyExc_ValueError, "cannot reuse closed iterator");
- return NULL;
- }
Py_INCREF(self);
return (PyObject *)self;
}
@@ -2403,8 +2353,8 @@ npyiter_close(NewNpyArrayIterObject *self)
if (self->iter == NULL) {
Py_RETURN_NONE;
}
- ret = NpyIter_Close(iter);
- self->is_closed = 1;
+ ret = NpyIter_Deallocate(iter);
+ self->iter = NULL;
if (ret < 0) {
return NULL;
}
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
index 5e92bc991..59fc5aa20 100644
--- a/numpy/core/src/umath/ufunc_object.c
+++ b/numpy/core/src/umath/ufunc_object.c
@@ -1281,7 +1281,6 @@ iterator_loop(PyUFuncObject *ufunc,
PyArrayObject **op_it;
npy_uint32 iter_flags;
- int retval;
NPY_BEGIN_THREADS_DEF;
@@ -1355,7 +1354,6 @@ iterator_loop(PyUFuncObject *ufunc,
/* Call the __array_prepare__ functions for the new array */
if (prepare_ufunc_output(ufunc, &op[nin+i],
arr_prep[i], full_args, i) < 0) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return -1;
}
@@ -1384,7 +1382,6 @@ iterator_loop(PyUFuncObject *ufunc,
baseptrs[i] = PyArray_BYTES(op_it[i]);
}
if (NpyIter_ResetBasePointers(iter, baseptrs, NULL) != NPY_SUCCEED) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return -1;
}
@@ -1392,7 +1389,6 @@ iterator_loop(PyUFuncObject *ufunc,
/* Get the variables needed for the loop */
iternext = NpyIter_GetIterNext(iter, NULL);
if (iternext == NULL) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return -1;
}
@@ -1410,9 +1406,7 @@ iterator_loop(PyUFuncObject *ufunc,
NPY_END_THREADS;
}
- retval = NpyIter_Close(iter);
- NpyIter_Deallocate(iter);
- return retval;
+ return NpyIter_Deallocate(iter);
}
/*
@@ -1597,7 +1591,7 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
PyObject **arr_prep,
ufunc_full_args full_args)
{
- int retval, i, nin = ufunc->nin, nout = ufunc->nout;
+ int i, nin = ufunc->nin, nout = ufunc->nout;
int nop = nin + nout;
npy_uint32 op_flags[NPY_MAXARGS];
NpyIter *iter;
@@ -1709,7 +1703,6 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
if (prepare_ufunc_output(ufunc, &op_tmp,
arr_prep[i], full_args, i) < 0) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return -1;
}
@@ -1720,7 +1713,6 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
"The __array_prepare__ functions modified the data "
"pointer addresses in an invalid fashion");
Py_DECREF(op_tmp);
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return -1;
}
@@ -1755,7 +1747,6 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
wheremask != NULL ? fixed_strides[nop]
: fixed_strides[nop + nin],
&innerloop, &innerloopdata, &needs_api) < 0) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return -1;
}
@@ -1763,7 +1754,6 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
/* Get the variables needed for the loop */
iternext = NpyIter_GetIterNext(iter, NULL);
if (iternext == NULL) {
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
return -1;
}
@@ -1787,9 +1777,7 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
NPY_AUXDATA_FREE(innerloopdata);
}
- retval = NpyIter_Close(iter);
- NpyIter_Deallocate(iter);
- return retval;
+ return NpyIter_Deallocate(iter);
}
static npy_bool
@@ -2300,7 +2288,7 @@ PyUFunc_GeneralizedFunction(PyUFuncObject *ufunc,
int nin, nout;
int i, j, idim, nop;
const char *ufunc_name;
- int retval = 0, subok = 1;
+ int retval, subok = 1;
int needs_api = 0;
PyArray_Descr *dtypes[NPY_MAXARGS];
@@ -2809,16 +2797,11 @@ PyUFunc_GeneralizedFunction(PyUFuncObject *ufunc,
goto fail;
}
- /* Write back any temporary data from PyArray_SetWritebackIfCopyBase */
- if (NpyIter_Close(iter) < 0) {
- goto fail;
- }
-
PyArray_free(inner_strides);
- if (NpyIter_Close(iter) < 0) {
- goto fail;
+ if (NpyIter_Deallocate(iter) < 0) {
+ retval = -1;
}
- NpyIter_Deallocate(iter);
+
/* The caller takes ownership of all the references in op */
for (i = 0; i < nop; ++i) {
Py_XDECREF(dtypes[i]);
@@ -2831,14 +2814,13 @@ PyUFunc_GeneralizedFunction(PyUFuncObject *ufunc,
Py_XDECREF(full_args.in);
Py_XDECREF(full_args.out);
- NPY_UF_DBG_PRINT("Returning Success\n");
+ NPY_UF_DBG_PRINT1("Returning code %d\n", reval);
- return 0;
+ return retval;
fail:
NPY_UF_DBG_PRINT1("Returning failure code %d\n", retval);
PyArray_free(inner_strides);
- NpyIter_Close(iter);
NpyIter_Deallocate(iter);
for (i = 0; i < nop; ++i) {
Py_XDECREF(op[i]);
@@ -3031,7 +3013,7 @@ PyUFunc_GenericFunction(PyUFuncObject *ufunc,
Py_XDECREF(full_args.out);
Py_XDECREF(wheremask);
- NPY_UF_DBG_PRINT("Returning Success\n");
+ NPY_UF_DBG_PRINT("Returning success code 0\n");
return 0;
@@ -3722,12 +3704,6 @@ PyUFunc_Accumulate(PyUFuncObject *ufunc, PyArrayObject *arr, PyArrayObject *out,
}
finish:
- if (NpyIter_Close(iter) < 0) {
- goto fail;
- }
- if (NpyIter_Close(iter_inner) < 0) {
- goto fail;
- }
Py_XDECREF(op_dtypes[0]);
NpyIter_Deallocate(iter);
NpyIter_Deallocate(iter_inner);
@@ -4110,9 +4086,6 @@ PyUFunc_Reduceat(PyUFuncObject *ufunc, PyArrayObject *arr, PyArrayObject *ind,
}
finish:
- if (NpyIter_Close(iter) < 0) {
- goto fail;
- }
Py_XDECREF(op_dtypes[0]);
NpyIter_Deallocate(iter);
@@ -5544,7 +5517,6 @@ ufunc_at(PyUFuncObject *ufunc, PyObject *args)
iternext = NpyIter_GetIterNext(iter_buffer, NULL);
if (iternext == NULL) {
- NpyIter_Close(iter_buffer);
NpyIter_Deallocate(iter_buffer);
goto fail;
}
@@ -5614,7 +5586,6 @@ ufunc_at(PyUFuncObject *ufunc, PyObject *args)
PyErr_SetString(PyExc_ValueError, err_msg);
}
- NpyIter_Close(iter_buffer);
NpyIter_Deallocate(iter_buffer);
Py_XDECREF(op2_array);
@@ -5632,7 +5603,7 @@ ufunc_at(PyUFuncObject *ufunc, PyObject *args)
}
fail:
- /* iter_buffer has already been deallocated, don't use NpyIter_Close */
+ /* iter_buffer has already been deallocated, don't use NpyIter_Dealloc */
if (op1_array != (PyArrayObject*)op1) {
PyArray_DiscardWritebackIfCopy(op1_array);
}
diff --git a/numpy/core/tests/test_nditer.py b/numpy/core/tests/test_nditer.py
index a0096efdb..13bc6b34a 100644
--- a/numpy/core/tests/test_nditer.py
+++ b/numpy/core/tests/test_nditer.py
@@ -2830,10 +2830,6 @@ def test_writebacks():
x[:] = 123 # x.data still valid
assert_equal(au, 6) # but not connected to au
- do_close = 1
- # test like above, only in C, and with an option to skip the NpyIter_Close
- _multiarray_tests.test_nditer_writeback(3, do_close, au, op_dtypes=[np.dtype('f4')])
- assert_equal(au, 3)
it = nditer(au, [],
[['readwrite', 'updateifcopy']],
casting='equiv', op_dtypes=[np.dtype('f4')])
@@ -2862,7 +2858,7 @@ def test_writebacks():
x[...] = 123
# make sure we cannot reenter the closed iterator
enter = it.__enter__
- assert_raises(ValueError, enter)
+ assert_raises(RuntimeError, enter)
def test_close_equivalent():
''' using a context amanger and using nditer.close are equivalent
@@ -2897,12 +2893,13 @@ def test_close_raises():
assert_raises(StopIteration, next, it)
assert_raises(ValueError, getattr, it, 'operands')
+@pytest.mark.skipif(not HAS_REFCOUNT, reason="Python lacks refcounts")
def test_warn_noclose():
a = np.arange(6, dtype='f4')
au = a.byteswap().newbyteorder()
- do_close = 0
with suppress_warnings() as sup:
sup.record(RuntimeWarning)
- # test like above, only in C, and with an option to skip the NpyIter_Close
- _multiarray_tests.test_nditer_writeback(3, do_close, au, op_dtypes=[np.dtype('f4')])
+ it = np.nditer(au, [], [['readwrite', 'updateifcopy']],
+ casting='equiv', op_dtypes=[np.dtype('f4')])
+ del it
assert len(sup.log) == 1
View Lorry Controller Status