Jun 21, 2023 · May 15, 2023 · May 15, 2023 · May 15, 2023 · May 17, 2023 · May 17, 2023
diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py
    'PyDataMem_SetHandler':                 (304, MinVersion("1.22")),
    'PyDataMem_GetHandler':                 (305, MinVersion("1.22")),
    # End 1.22 API
    'PyArray_MatrixTranspose':              (306, MinVersion("1.25")),  # TODO: What does `MinVersion` do?
    # End 1.25 API
 }

 ufunc_types_api = {
diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c
 static PyObject *
 array_matrix_transpose_get(PyArrayObject *self, void *NPY_UNUSED(ignored))
 {
    int ndim = PyArray_NDIM(self);

    if (ndim < 2) {
        PyErr_SetString(PyExc_ValueError,
                        "matrix transpose with ndim < 2 is undefined");
        return NULL;
    }
    return PyArray_SwapAxes(self, ndim - 2, ndim - 1);
    return PyArray_MatrixTranspose(self);
 }

 NPY_NO_EXPORT PyGetSetDef array_getsetlist[] = {
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
    return ret;
 }

 static PyObject *
 array_matrix_transpose(PyArrayObject *self)
 {
    return PyArray_MatrixTranspose(self);
 }

 #define _CHKTYPENUM(typ) ((typ) ? (typ)->type_num : NPY_NOTYPE)

 static PyObject *
    {"transpose",
        (PyCFunction)array_transpose,
        METH_VARARGS, NULL},
    {"matrix_transpose",
        (PyCFunction)array_matrix_transpose,
        NULL, NULL},
    {"var",
        (PyCFunction)array_variance,
        METH_VARARGS | METH_KEYWORDS, NULL},
diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c
    return (PyObject *)ret;
 }

 /*NUMPY_API
 * Return Matrix Transpose.
 */
 NPY_NO_EXPORT PyObject *
 PyArray_MatrixTranspose(PyArrayObject *ap)
 {
    int ndim = PyArray_NDIM(self);

    if (ndim < 2) {
        PyErr_SetString(PyExc_ValueError,
                        "matrix transpose with ndim < 2 is undefined");
        return NULL;
    }
    return PyArray_SwapAxes(self, ndim - 2, ndim - 1);
 }

 /*
 * Sorts items so stride is descending, because C-order
 * is the default in the face of ambiguity.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -370,6 +370,8 @@ def get_annotations():
		'PyDataMem_SetHandler': (304, MinVersion("1.22")),
		'PyDataMem_GetHandler': (305, MinVersion("1.22")),
		# End 1.22 API
		'PyArray_MatrixTranspose': (306, MinVersion("1.25")), # TODO: What does `MinVersion` do?
Kai-Striega marked this conversation as resolved. OutdatedShow resolvedHide resolved
		# End 1.25 API
		}

		ufunc_types_api = {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -934,14 +934,7 @@ array_transpose_get(PyArrayObject self, void NPY_UNUSED(ignored))
		static PyObject *
		array_matrix_transpose_get(PyArrayObject self, void NPY_UNUSED(ignored))
		{
		int ndim = PyArray_NDIM(self);

		if (ndim < 2) {
		PyErr_SetString(PyExc_ValueError,
		"matrix transpose with ndim < 2 is undefined");
		return NULL;
		}
		return PyArray_SwapAxes(self, ndim - 2, ndim - 1);
		return PyArray_MatrixTranspose(self);
		}

		NPY_NO_EXPORT PyGetSetDef array_getsetlist[] = {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2399,6 +2399,12 @@ array_transpose(PyArrayObject self, PyObject args)
		return ret;
		}

		static PyObject *
		array_matrix_transpose(PyArrayObject *self)
		{
		return PyArray_MatrixTranspose(self);
Kai-Striega marked this conversation as resolved. OutdatedShow resolvedHide resolved
		}

		#define _CHKTYPENUM(typ) ((typ) ? (typ)->type_num : NPY_NOTYPE)

		static PyObject *
Expand DownExpand Up		@@ -3081,6 +3087,9 @@ NPY_NO_EXPORT PyMethodDef array_methods[] = {
		{"transpose",
		(PyCFunction)array_transpose,
		METH_VARARGS, NULL},
		{"matrix_transpose",
		(PyCFunction)array_matrix_transpose,
		NULL, NULL},
		{"var",
		(PyCFunction)array_variance,
		METH_VARARGS \| METH_KEYWORDS, NULL},
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -731,6 +731,22 @@ PyArray_Transpose(PyArrayObject ap, PyArray_Dims permute)
		return (PyObject *)ret;
		}

		/*NUMPY_API
		* Return Matrix Transpose.
		*/
		NPY_NO_EXPORT PyObject *
		PyArray_MatrixTranspose(PyArrayObject *ap)
		{
		int ndim = PyArray_NDIM(self);

		if (ndim < 2) {
		PyErr_SetString(PyExc_ValueError,
		"matrix transpose with ndim < 2 is undefined");
		return NULL;
		}
		return PyArray_SwapAxes(self, ndim - 2, ndim - 1);
		}

		/*
		* Sorts items so stride is descending, because C-order
		* is the default in the face of ambiguity.
Expand Down