MNT: move static data structs into their own file

Author: ngoldbaum

numpy/_core/meson.build

@@ -1101,6 +1101,7 @@ src_multiarray = multiarray_gen_headers + [
   'src/multiarray/nditer_constr.c',
   'src/multiarray/nditer_pywrap.c',
   src_file.process('src/multiarray/nditer_templ.c.src'),
+  'src/multiarray/npy_static_data.c',
   'src/multiarray/number.c',
   'src/multiarray/refcount.c',
   src_file.process('src/multiarray/scalartypes.c.src'),

numpy/_core/src/common/binop_override.h

@@ -6,6 +6,7 @@
 #include "numpy/arrayobject.h"
 
 #include "get_attr_string.h"
+#include "npy_static_data.h"
 
 /*
  * Logic for deciding when binops should return NotImplemented versus when
@@ -128,7 +129,7 @@ binop_should_defer(PyObject *self, PyObject *other, int inplace)
      * Classes with __array_ufunc__ are living in the future, and only need to
      * check whether __array_ufunc__ equals None.
      */
-    attr = PyArray_LookupSpecial(other, npy_um_str_array_ufunc);
+    attr = PyArray_LookupSpecial(other, npy_interned_str.array_ufunc);
     if (attr != NULL) {
         defer = !inplace && (attr == Py_None);
         Py_DECREF(attr);

numpy/_core/src/common/npy_cpu_dispatch.c

@@ -3,7 +3,7 @@
 
 #include "npy_cpu_dispatch.h"
 #include "numpy/ndarraytypes.h"
-#include "multiarraymodule.h"
+#include "npy_static_data.h"
 
 NPY_VISIBILITY_HIDDEN int
 npy_cpu_dispatch_tracer_init(PyObject *mod)

numpy/_core/src/common/ufunc_override.c

@@ -7,7 +7,7 @@
 #include "npy_import.h"
 #include "ufunc_override.h"
 #include "scalartypes.h"
-#include "multiarraymodule.h"
+#include "npy_static_data.h"
 
 /*
  * Check whether an object has __array_ufunc__ defined on its class and it
@@ -35,7 +35,7 @@ PyUFuncOverride_GetNonDefaultArrayUfunc(PyObject *obj)
      * Does the class define __array_ufunc__? (Note that LookupSpecial has fast
      * return for basic python types, so no need to worry about those here)
      */
-    cls_array_ufunc = PyArray_LookupSpecial(obj, npy_um_str_array_ufunc);
+    cls_array_ufunc = PyArray_LookupSpecial(obj, npy_interned_str.array_ufunc);
     if (cls_array_ufunc == NULL) {
         if (PyErr_Occurred()) {
             PyErr_Clear(); /* TODO[gh-14801]: propagate crashes during attribute access? */

numpy/_core/src/multiarray/alloc.c

@@ -11,6 +11,7 @@
 #include "numpy/npy_common.h"
 #include "npy_config.h"
 #include "alloc.h"
+#include "npy_static_data.h"
 #include "multiarraymodule.h"
 
 #include <assert.h>

numpy/_core/src/multiarray/array_converter.c

@@ -21,7 +21,7 @@
 #include "abstractdtypes.h"
 #include "convert_datatype.h"
 #include "descriptor.h"
-#include "multiarraymodule.h"
+#include "npy_static_data.h"
 #include "ctors.h"
 
 #include "npy_config.h"

numpy/_core/src/multiarray/arrayfunction_override.c

@@ -7,6 +7,7 @@
 #include "numpy/ndarraytypes.h"
 #include "get_attr_string.h"
 #include "npy_import.h"
+#include "npy_static_data.h"
 #include "multiarraymodule.h"
 
 #include "arrayfunction_override.h"

numpy/_core/src/multiarray/arraytypes.c.src

@@ -42,6 +42,7 @@
 #include "arraytypes.h"
 
 #include "umathmodule.h"
+#include "npy_static_data.h"
 
 /*
  * Define a stack allocated dummy array with only the minimum information set:

numpy/_core/src/multiarray/arraywrap.c

@@ -12,7 +12,7 @@
 #include "get_attr_string.h"
 
 #include "arraywrap.h"
-#include "multiarraymodule.h"
+#include "npy_static_data.h"
 
 
 /*

numpy/_core/src/multiarray/common.h

@@ -8,7 +8,7 @@
 #include "npy_cpu_dispatch.h"
 #include "numpy/npy_cpu.h"
 
-#include "multiarraymodule.h"
+#include "npy_static_data.h"
 #include "npy_import.h"
 #include <limits.h>