diff options
| author | Pedro Lameiras <87664900+JLameiras@users.noreply.github.com> | 2023-03-28 10:31:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-28 11:31:54 +0200 |
| commit | 94d4f702017be274acb130cbe9cf163910137fbc (patch) | |
| tree | daf4886a782d7987ad56effdbb792f7b40aa6ab4 /numpy/core/src | |
| parent | 08e778407064c37d6f814e0c59065344dea1ec2a (diff) | |
| download | numpy-94d4f702017be274acb130cbe9cf163910137fbc.tar.gz | |
BUG: Use output when given on numpy.dot C-API branch (#23459)
Updated the dot function C-API so that it now calls `np.multiply` with `out=` and returns it on branch of the function where the correct behaviour was not in place. Added two tests regarding this issue.
Closes #21081.
Co-authored-by: Sebastian Berg <sebastian@sipsolutions.net>
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index adc1558da..98ca15ac4 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -1042,12 +1042,11 @@ PyArray_MatrixProduct2(PyObject *op1, PyObject *op2, PyArrayObject* out) #endif if (PyArray_NDIM(ap1) == 0 || PyArray_NDIM(ap2) == 0) { - result = (PyArray_NDIM(ap1) == 0 ? ap1 : ap2); - result = (PyArrayObject *)Py_TYPE(result)->tp_as_number->nb_multiply( - (PyObject *)ap1, (PyObject *)ap2); + PyObject *mul_res = PyObject_CallFunctionObjArgs( + n_ops.multiply, ap1, ap2, out, NULL); Py_DECREF(ap1); Py_DECREF(ap2); - return (PyObject *)result; + return mul_res; } l = PyArray_DIMS(ap1)[PyArray_NDIM(ap1) - 1]; if (PyArray_NDIM(ap2) > 1) { |