diff options
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 41 | ||||
| -rw-r--r-- | numpy/core/src/umath/umath_tests.c.src | 6 | ||||
| -rw-r--r-- | numpy/core/tests/test_ufunc.py | 15 |
3 files changed, 50 insertions, 12 deletions
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index 7e7a74c28..58df5e3f8 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -1752,6 +1752,7 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc, npy_intp *strides; npy_intp *countptr; + PyArrayObject **op_it; npy_uint32 iter_flags; if (wheremask != NULL) { @@ -1783,12 +1784,13 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc, for (i = nin; i < nop; ++i) { /* * We don't write to all elements, and the iterator may make - * UPDATEIFCOPY temporary copies. The output arrays must be considered - * READWRITE by the iterator, so that the elements we don't write to are - * copied to the possible temporary array. + * UPDATEIFCOPY temporary copies. The output arrays (unless they are + * allocated by the iterator itself) must be considered READWRITE by the + * iterator, so that the elements we don't write to are copied to the + * possible temporary array. */ op_flags[i] = default_op_out_flags | - NPY_ITER_READWRITE | + (op[i] != NULL ? NPY_ITER_READWRITE : NPY_ITER_WRITEONLY) | NPY_ITER_ALIGNED | NPY_ITER_ALLOCATE | NPY_ITER_NO_BROADCAST | @@ -1828,11 +1830,24 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc, needs_api = NpyIter_IterationNeedsAPI(iter); /* Call the __array_prepare__ functions where necessary */ + op_it = NpyIter_GetOperandArray(iter); for (i = nin; i < nop; ++i) { - PyArrayObject *op_tmp; + PyArrayObject *op_tmp, *orig_op_tmp; + + /* + * The array can be allocated by the iterator -- it is placed in op[i] + * and returned to the caller, and this needs an extra incref. + */ + if (op[i] == NULL) { + op_tmp = op_it[i]; + Py_INCREF(op_tmp); + } + else { + op_tmp = op[i]; + } - /* prepare_ufunc_output may decref & replace pointer */ - op_tmp = op[i]; + /* prepare_ufunc_output may decref & replace the pointer */ + orig_op_tmp = op_tmp; Py_INCREF(op_tmp); if (prepare_ufunc_output(ufunc, &op_tmp, @@ -1842,7 +1857,7 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc, } /* Validate that the prepare_ufunc_output didn't mess with pointers */ - if (PyArray_BYTES(op_tmp) != PyArray_BYTES(op[i])) { + if (PyArray_BYTES(op_tmp) != PyArray_BYTES(orig_op_tmp)) { PyErr_SetString(PyExc_ValueError, "The __array_prepare__ functions modified the data " "pointer addresses in an invalid fashion"); @@ -1853,8 +1868,8 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc, /* * Put the updated operand back and undo the DECREF above. If - * COPY_IF_OVERLAP made a temporary copy, the output will be copied in - * by UPDATEIFCOPY even if op[i] was changed. + * COPY_IF_OVERLAP made a temporary copy, the output will be copied + * by UPDATEIFCOPY even if op[i] was changed by prepare_ufunc_output. */ op[i] = op_tmp; Py_DECREF(op_tmp); @@ -5598,8 +5613,10 @@ ufunc_get_doc(PyUFuncObject *ufunc) if (doc == NULL) { return NULL; } - PyUString_ConcatAndDel(&doc, - PyUString_FromFormat("\n\n%s", ufunc->doc)); + if (ufunc->doc != NULL) { + PyUString_ConcatAndDel(&doc, + PyUString_FromFormat("\n\n%s", ufunc->doc)); + } return doc; } diff --git a/numpy/core/src/umath/umath_tests.c.src b/numpy/core/src/umath/umath_tests.c.src index 6cd181897..8d9009a1a 100644 --- a/numpy/core/src/umath/umath_tests.c.src +++ b/numpy/core/src/umath/umath_tests.c.src @@ -305,6 +305,12 @@ addUfuncs(PyObject *dictionary) { 0, euclidean_pdist_signature); PyDict_SetItemString(dictionary, "euclidean_pdist", f); Py_DECREF(f); + f = PyUFunc_FromFuncAndDataAndSignature(inner1d_functions, inner1d_data, + inner1d_signatures, 2, 2, 1, PyUFunc_None, "inner1d_no_doc", + NULL, + 0, inner1d_signature); + PyDict_SetItemString(dictionary, "inner1d_no_doc", f); + Py_DECREF(f); } diff --git a/numpy/core/tests/test_ufunc.py b/numpy/core/tests/test_ufunc.py index 3d6251253..9c49932e0 100644 --- a/numpy/core/tests/test_ufunc.py +++ b/numpy/core/tests/test_ufunc.py @@ -784,6 +784,17 @@ class TestUfunc(TestCase): np.add(a, b, out=c, where=[1, 0, 0, 1, 0, 0, 1, 1, 1, 0]) assert_equal(c, [2, 1.5, 1.5, 2, 1.5, 1.5, 2, 2, 2, 1.5]) + def test_where_param_alloc(self): + # With casting and allocated output + a = np.array([1], dtype=np.int64) + m = np.array([True], dtype=bool) + assert_equal(np.sqrt(a, where=m), [1]) + + # No casting and allocated output + a = np.array([1], dtype=np.float64) + m = np.array([True], dtype=bool) + assert_equal(np.sqrt(a, where=m), [1]) + def check_identityless_reduction(self, a): # np.minimum.reduce is a identityless reduction @@ -1283,6 +1294,10 @@ class TestUfunc(TestCase): assert_equal(y_base[1,:], y_base_copy[1,:]) assert_equal(y_base[3,:], y_base_copy[3,:]) + def test_no_doc_string(self): + # gh-9337 + assert_('\n' not in umt.inner1d_no_doc.__doc__) + if __name__ == "__main__": run_module_suite() |