MNT: move initialization of global tuples to global data struct

Author: ngoldbaum

numpy/_core/src/multiarray/ctors.c

@@ -2528,15 +2528,6 @@ PyArray_FromArrayAttr_int(PyObject *op, PyArray_Descr *descr, int copy,
         return Py_NotImplemented;
     }
 
-    static PyObject *kwnames_is_copy = NULL;
-    if (kwnames_is_copy == NULL) {
-        kwnames_is_copy = Py_BuildValue("(s)", "copy");
-        if (kwnames_is_copy == NULL) {
-            Py_DECREF(array_meth);
-            return NULL;
-        }
-    }
-
     Py_ssize_t nargs = 0;
     PyObject *arguments[2];
     PyObject *kwnames = NULL;
@@ -2552,7 +2543,7 @@ PyArray_FromArrayAttr_int(PyObject *op, PyArray_Descr *descr, int copy,
      * signature of the __array__ method being called does not have `copy`.
      */
     if (copy != -1) {
-        kwnames = kwnames_is_copy;
+        kwnames = npy_ma_global_data->kwnames_is_copy;
         arguments[nargs] = copy == 1 ? Py_True : Py_False;
     }
 

numpy/_core/src/multiarray/multiarraymodule.c

@@ -5008,6 +5008,11 @@ initialize_static_globals(void)
         }
     }
 
+    npy_ma_global_data->kwnames_is_copy = Py_BuildValue("(s)", "copy");
+    if (npy_ma_global_data->kwnames_is_copy == NULL) {
+        return -1;
+    }
+
     npy_ma_global_data->one_obj = PyLong_FromLong((long) 1);
     if (npy_ma_global_data->one_obj == NULL) {
         return -1;

numpy/_core/src/multiarray/multiarraymodule.h

@@ -89,6 +89,17 @@ typedef struct npy_ma_global_data_struct {
         npy_uint64 uint64;
     } unpack_lookup_big[256];
 
+    /*
+     * Used in the __array__ internals to avoid building a tuple inline
+     */
+    PyObject *kwnames_is_copy;
+
+    /*
+     * Used in __imatmul__ to avoid building tuples inline
+     */
+    PyObject *axes_1d_obj_kwargs;
+    PyObject *axes_2d_obj_kwargs;
+
     /*
      * Used for CPU feature detection and dispatch
      *

numpy/_core/src/multiarray/number.c

@@ -23,6 +23,10 @@
  ****************   Implement Number Protocol ****************************
  *************************************************************************/
 
+// this is not in the global data struct to avoid needing to include the
+// definition of the NumericOps struct in multiarraymodule.h
+//
+// it is filled in during module initialization in a thread-safe manner
 NPY_NO_EXPORT NumericOps n_ops; /* NB: static objects initialized to zero */
 
 /*
@@ -118,6 +122,20 @@ _PyArray_SetNumericOps(PyObject *dict)
     SET(conjugate);
     SET(matmul);
     SET(clip);
+
+    // initialize static globals needed for matmul
+    npy_ma_global_data->axes_1d_obj_kwargs = Py_BuildValue(
+            "{s, [(i), (i, i), (i)]}", "axes", -1, -2, -1, -1);
+    if (npy_ma_global_data->axes_1d_obj_kwargs == NULL) {
+        return -1;
+    }
+
+    npy_ma_global_data->axes_2d_obj_kwargs = Py_BuildValue(
+            "{s, [(i, i), (i, i), (i, i)]}", "axes", -2, -1, -2, -1, -2, -1);
+    if (npy_ma_global_data->axes_2d_obj_kwargs == NULL) {
+        return -1;
+    }
+
     return 0;
 }
 
@@ -271,6 +289,12 @@ array_inplace_matrix_multiply(PyArrayObject *self, PyObject *other)
     INPLACE_GIVE_UP_IF_NEEDED(self, other,
             nb_inplace_matrix_multiply, array_inplace_matrix_multiply);
 
+    PyObject *args = PyTuple_Pack(3, self, other, self);
+    if (args == NULL) {
+        return NULL;
+    }
+    PyObject *kwargs;
+
     /*
      * Unlike `matmul(a, b, out=a)` we ensure that the result is not broadcast
      * if the result without `out` would have less dimensions than `a`.
@@ -280,33 +304,11 @@ array_inplace_matrix_multiply(PyArrayObject *self, PyObject *other)
      * The error here will be confusing, but for now, we enforce this by
      * passing the correct `axes=`.
      */
-    static PyObject *axes_1d_obj_kwargs = NULL;
-    static PyObject *axes_2d_obj_kwargs = NULL;
-    if (NPY_UNLIKELY(axes_1d_obj_kwargs == NULL)) {
-        axes_1d_obj_kwargs = Py_BuildValue(
-                "{s, [(i), (i, i), (i)]}", "axes", -1, -2, -1, -1);
-        if (axes_1d_obj_kwargs == NULL) {
-            return NULL;
-        }
-    }
-    if (NPY_UNLIKELY(axes_2d_obj_kwargs == NULL)) {
-        axes_2d_obj_kwargs = Py_BuildValue(
-                "{s, [(i, i), (i, i), (i, i)]}", "axes", -2, -1, -2, -1, -2, -1);
-        if (axes_2d_obj_kwargs == NULL) {
-            return NULL;
-        }
-    }
-
-    PyObject *args = PyTuple_Pack(3, self, other, self);
-    if (args == NULL) {
-        return NULL;
-    }
-    PyObject *kwargs;
     if (PyArray_NDIM(self) == 1) {
-        kwargs = axes_1d_obj_kwargs;
+        kwargs = npy_ma_global_data->axes_1d_obj_kwargs;
     }
     else {
-        kwargs = axes_2d_obj_kwargs;
+        kwargs = npy_ma_global_data->axes_2d_obj_kwargs;
     }
     PyObject *res = PyObject_Call(n_ops.matmul, args, kwargs);
     Py_DECREF(args);

numpy/_core/src/umath/umathmodule.c

@@ -287,9 +287,12 @@ int initumath(PyObject *m)
 
     s = PyDict_GetItemString(d, "conjugate");
     s2 = PyDict_GetItemString(d, "remainder");
+
     /* Setup the array object's numerical structures with appropriate
        ufuncs in d*/
-    _PyArray_SetNumericOps(d);
+    if (_PyArray_SetNumericOps(d) < 0) {
+        return -1;
+    }
 
     PyDict_SetItemString(d, "conj", s);
     PyDict_SetItemString(d, "mod", s2);