Jan 20, 2024 · Nov 10, 2023 · Dec 17, 2023 · Dec 17, 2023 · Dec 17, 2023 · Dec 17, 2023
diff --git a/numpy/_core/src/multiarray/arrayobject.c b/numpy/_core/src/multiarray/arrayobject.c

 #include "number.h"
 #include "usertypes.h"
 #include "arraywrap.h"
 #include "arraytypes.h"
 #include "scalartypes.h"
 #include "arrayobject.h"
             * already have deferred.  So use `self` for wrapping.  If users
             * need more, they need to override `==` and `!=`.
             */
            Py_SETREF(res, PyArray_SubclassWrap(self, res));
            PyObject *wrapped = npy_apply_wrap_simple(self, res);
            Py_DECREF(res);
            return wrapped;
        }
        return (PyObject *)res;
    }
diff --git a/numpy/_core/src/multiarray/arraywrap.c b/numpy/_core/src/multiarray/arraywrap.c
 * Apply the array wrapping to a result array.
 *
 * @param obj The object (should be an array) to wrap.
 * @param original_out NULL/None (both valid) orthe originalobjectpassed
 *in via `out=` (expected to be an array).
 *If given, its wrapping method is always preferred.
 * @param original_out NULL/None (both valid) oranobjectwho's wrapping
 *method is always used/preferred.  The naming comes because for an
 *`out=` argument we always trigger its own wrapping method.
 * @param wrap The array wrap function to call
 * @param wrap_type The type belonging to the wrap function, when it matches
 *        wrapping may be short-cut.
    Py_XDECREF(new_wrap);
    return res;
 }


 /*
 * Calls arr_of_subclass.__array_wrap__(towrap), in order to make 'towrap'
 * have the same ndarray subclass as 'arr_of_subclass'.
 * `towrap` should be a base-class ndarray.
 */
 NPY_NO_EXPORT PyObject *
 npy_apply_wrap_simple(PyArrayObject *arr_of_subclass, PyArrayObject *towrap)
 {
    /*
     * Same as apply-wrap, but when there is only a single other array we
     * can  `original_out` and not worry about passing a useful wrap.
     */
    return npy_apply_wrap(
            (PyObject *)towrap, (PyObject *)arr_of_subclass, Py_None, NULL,
            NULL, NPY_FALSE, NPY_TRUE);
 }
diff --git a/numpy/_core/src/multiarray/arraywrap.h b/numpy/_core/src/multiarray/arraywrap.h
        PyObject *wrap, PyObject *wrap_type,
        NpyUFuncContext *context, npy_bool return_scalar, npy_bool force_wrap);


 NPY_NO_EXPORT PyObject *
 npy_apply_wrap_simple(PyArrayObject *arr_of_subclass, PyArrayObject *towrap);


 NPY_NO_EXPORT int
 npy_find_array_wrap(
        int nin, PyObject *const *inputs,
        PyObject **out_wrap, PyObject **out_wrap_type);


 #endif  /* NUMPY_CORE_SRC_MULTIARRAY_ARRAYWRAP_H_ */
diff --git a/numpy/_core/src/multiarray/ctors.c b/numpy/_core/src/multiarray/ctors.c
    }
    return;
 }

 /*
 * Calls arr_of_subclass.__array_wrap__(towrap), in order to make 'towrap'
 * have the same ndarray subclass as 'arr_of_subclass'.
 */
 NPY_NO_EXPORT PyArrayObject *
 PyArray_SubclassWrap(PyArrayObject *arr_of_subclass, PyArrayObject *towrap)
 {
    PyObject *wrapped = PyObject_CallMethodObjArgs((PyObject *)arr_of_subclass,
            npy_ma_str_array_wrap, (PyObject *)towrap, NULL);
    if (wrapped == NULL) {
        return NULL;
    }
    if (!PyArray_Check(wrapped)) {
        PyErr_SetString(PyExc_RuntimeError,
                "ndarray subclass __array_wrap__ method returned an "
                "object which was not an instance of an ndarray subclass");
        Py_DECREF(wrapped);
        return NULL;
    }

    return (PyArrayObject *)wrapped;
 }
diff --git a/numpy/_core/src/multiarray/ctors.h b/numpy/_core/src/multiarray/ctors.h
 NPY_NO_EXPORT void
 byte_swap_vector(void *p, npy_intp n, int size);

 /*
 * Calls arr_of_subclass.__array_wrap__(towrap), in order to make 'towrap'
 * have the same ndarray subclass as 'arr_of_subclass'.
 */
 NPY_NO_EXPORT PyArrayObject *
 PyArray_SubclassWrap(PyArrayObject *arr_of_subclass, PyArrayObject *towrap);

 NPY_NO_EXPORT PyObject *
 PyArray_Zeros_int(int nd, npy_intp const *dims, PyArray_Descr *descr,
                  PyArray_DTypeMeta *dtype, int is_f_order);
diff --git a/numpy/_core/src/multiarray/shape.c b/numpy/_core/src/multiarray/shape.c

 #include "npy_pycompat.h"

 #include "arraywrap.h"
 #include "ctors.h"

 #include "shape.h"
     * __array_wrap__ method
     */
    if (Py_TYPE(self) != &PyArray_Type) {
 PyArrayObject *tmp =PyArray_SubclassWrap(self, ret);
 PyObject *wrapped =npy_apply_wrap_simple(self, ret);
        Py_DECREF(ret);
 ret = tmp;
 return wrapped;
    }

    return (PyObject *)ret;
     * __array_wrap__ method
     */
    if (Py_TYPE(self) != &PyArray_Type) {
 PyArrayObject *tmp =PyArray_SubclassWrap(self, ret);
 PyObject *wrapped =npy_apply_wrap_simple(self, ret);
        Py_DECREF(ret);
 ret = tmp;
 return wrapped;
    }

    return (PyObject *)ret;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,6 +38,7 @@ maintainer email: oliphant.travis@ieee.org

		#include "number.h"
		#include "usertypes.h"
		#include "arraywrap.h"
		#include "arraytypes.h"
		#include "scalartypes.h"
		#include "arrayobject.h"
Expand DownExpand Up		@@ -988,7 +989,9 @@ array_richcompare(PyArrayObject self, PyObject other, int cmp_op)
		* already have deferred. So use `self` for wrapping. If users
		* need more, they need to override `==` and `!=`.
		*/
		Py_SETREF(res, PyArray_SubclassWrap(self, res));
		PyObject *wrapped = npy_apply_wrap_simple(self, res);
		Py_DECREF(res);
		return wrapped;
		}
		return (PyObject *)res;
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -118,9 +118,9 @@ _get_wrap_prepare_args(NpyUFuncContext *context) {
		* Apply the array wrapping to a result array.
		*
		* @param obj The object (should be an array) to wrap.
		* @param original_out NULL/None (both valid) orthe originalobjectpassed
		*in via `out=` (expected to be an array).
		*If given, its wrapping method is always preferred.
		* @param original_out NULL/None (both valid) oranobjectwho's wrapping
		*method is always used/preferred. The naming comes because for an
		*`out=` argument we always trigger its own wrapping method.
		* @param wrap The array wrap function to call
		* @param wrap_type The type belonging to the wrap function, when it matches
		* wrapping may be short-cut.
Expand DownExpand Up		@@ -256,3 +256,21 @@ npy_apply_wrap(
		Py_XDECREF(new_wrap);
		return res;
		}


		/*
		* Calls arr_of_subclass.__array_wrap__(towrap), in order to make 'towrap'
		* have the same ndarray subclass as 'arr_of_subclass'.
		* `towrap` should be a base-class ndarray.
		*/
		NPY_NO_EXPORT PyObject *
		npy_apply_wrap_simple(PyArrayObject arr_of_subclass, PyArrayObject towrap)
		{
		/*
		* Same as apply-wrap, but when there is only a single other array we
		* can `original_out` and not worry about passing a useful wrap.
		*/
		return npy_apply_wrap(
		(PyObject )towrap, (PyObject )arr_of_subclass, Py_None, NULL,
		NULL, NPY_FALSE, NPY_TRUE);
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,9 +16,15 @@ npy_apply_wrap(
		PyObject wrap, PyObject wrap_type,
		NpyUFuncContext *context, npy_bool return_scalar, npy_bool force_wrap);


		NPY_NO_EXPORT PyObject *
		npy_apply_wrap_simple(PyArrayObject arr_of_subclass, PyArrayObject towrap);


		NPY_NO_EXPORT int
		npy_find_array_wrap(
		int nin, PyObject const inputs,
		PyObject out_wrap, PyObject out_wrap_type);


		#endif /* NUMPY_CORE_SRC_MULTIARRAY_ARRAYWRAP_H_ */
Copy link Contributor mhvkJan 7, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Missing end of line
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4073,26 +4073,3 @@ _array_fill_strides(npy_intp strides, npy_intp const dims, int nd, size_t item
		}
		return;
		}

		/*
		* Calls arr_of_subclass.__array_wrap__(towrap), in order to make 'towrap'
		* have the same ndarray subclass as 'arr_of_subclass'.
		*/
		NPY_NO_EXPORT PyArrayObject *
		PyArray_SubclassWrap(PyArrayObject arr_of_subclass, PyArrayObject towrap)
		{
		PyObject wrapped = PyObject_CallMethodObjArgs((PyObject )arr_of_subclass,
		npy_ma_str_array_wrap, (PyObject *)towrap, NULL);
		if (wrapped == NULL) {
		return NULL;
		}
		if (!PyArray_Check(wrapped)) {
		PyErr_SetString(PyExc_RuntimeError,
		"ndarray subclass __array_wrap__ method returned an "
		"object which was not an instance of an ndarray subclass");
		Py_DECREF(wrapped);
		return NULL;
		}

		return (PyArrayObject *)wrapped;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -124,13 +124,6 @@ copy_and_swap(void dst, void src, int itemsize, npy_intp numitems,
		NPY_NO_EXPORT void
		byte_swap_vector(void *p, npy_intp n, int size);

		/*
		* Calls arr_of_subclass.__array_wrap__(towrap), in order to make 'towrap'
		* have the same ndarray subclass as 'arr_of_subclass'.
		*/
		NPY_NO_EXPORT PyArrayObject *
		PyArray_SubclassWrap(PyArrayObject arr_of_subclass, PyArrayObject towrap);

		NPY_NO_EXPORT PyObject *
		PyArray_Zeros_int(int nd, npy_intp const dims, PyArray_Descr descr,
		PyArray_DTypeMeta *dtype, int is_f_order);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,6 +14,7 @@

		#include "npy_pycompat.h"

		#include "arraywrap.h"
		#include "ctors.h"

		#include "shape.h"
Expand DownExpand Up		@@ -567,9 +568,9 @@ PyArray_Squeeze(PyArrayObject *self)
		* __array_wrap__ method
		*/
		if (Py_TYPE(self) != &PyArray_Type) {
		PyArrayObject *tmp =PyArray_SubclassWrap(self, ret);
		PyObject *wrapped =npy_apply_wrap_simple(self, ret);
		Py_DECREF(ret);
		ret = tmp;
		return wrapped;
		}

		return (PyObject *)ret;
Expand DownExpand Up		@@ -623,9 +624,9 @@ PyArray_SqueezeSelected(PyArrayObject self, npy_bool axis_flags)
		* __array_wrap__ method
		*/
		if (Py_TYPE(self) != &PyArray_Type) {
		PyArrayObject *tmp =PyArray_SubclassWrap(self, ret);
		PyObject *wrapped =npy_apply_wrap_simple(self, ret);
		Py_DECREF(ret);
		ret = tmp;
		return wrapped;
		}

		return (PyObject *)ret;
Expand Down