MNT: Add more global state I missed to the thread_unsafe_state struct

Author: ngoldbaum

numpy/_core/src/multiarray/arrayobject.c

@@ -62,9 +62,7 @@ maintainer email:  [email protected]
 
 #include "binop_override.h"
 #include "array_coercion.h"
-
-
-NPY_NO_EXPORT npy_bool numpy_warn_if_no_mem_policy = 0;
+#include "multiarraymodule.h"
 
 /*NUMPY_API
   Compute the size of an array (in number of items)
@@ -429,7 +427,7 @@ array_dealloc(PyArrayObject *self)
             }
         }
         if (fa->mem_handler == NULL) {
-            if (numpy_warn_if_no_mem_policy) {
+            if (npy_thread_unsafe_state.warn_if_no_mem_policy) {
                 char const *msg = "Trying to dealloc data, but a memory policy "
                     "is not set. If you take ownership of the data, you must "
                     "set a base owning the data (e.g. a PyCapsule).";

numpy/_core/src/multiarray/arrayobject.h

@@ -9,8 +9,6 @@
 extern "C" {
 #endif
 
-extern NPY_NO_EXPORT npy_bool numpy_warn_if_no_mem_policy;
-
 NPY_NO_EXPORT PyObject *
 _strings_richcompare(PyArrayObject *self, PyArrayObject *other, int cmp_op,
                      int rstrip);

numpy/_core/src/multiarray/descriptor.c

@@ -23,7 +23,7 @@
 #include "templ_common.h" /* for npy_mul_sizes_with_overflow */
 #include "descriptor.h"
 #include "npy_static_data.h"
-#include "multiarraymodule.h"
+#include "multiarraymodule.h"  // for thread unsafe state access
 #include "alloc.h"
 #include "assert.h"
 #include "npy_buffer.h"

numpy/_core/src/multiarray/multiarraymodule.c

@@ -98,24 +98,15 @@ NPY_NO_EXPORT PyObject *
 _umath_strings_richcompare(
         PyArrayObject *self, PyArrayObject *other, int cmp_op, int rstrip);
 
-/*
- * global variable to determine if legacy printing is enabled, accessible from
- * C. For simplicity the mode is encoded as an integer where INT_MAX means no
- * legacy mode, and '113'/'121' means 1.13/1.21 legacy mode; and 0 maps to
- * INT_MAX. We can upgrade this if we have more complex requirements in the
- * future.
- */
-int npy_legacy_print_mode = INT_MAX;
-
 
 static PyObject *
 set_legacy_print_mode(PyObject *NPY_UNUSED(self), PyObject *args)
 {
-    if (!PyArg_ParseTuple(args, "i", &npy_legacy_print_mode)) {
+    if (!PyArg_ParseTuple(args, "i", &npy_thread_unsafe_state.legacy_print_mode)) {
         return NULL;
     }
-    if (!npy_legacy_print_mode) {
-        npy_legacy_print_mode = INT_MAX;
+    if (!npy_thread_unsafe_state.legacy_print_mode) {
+        npy_thread_unsafe_state.legacy_print_mode = INT_MAX;
     }
     Py_RETURN_NONE;
 }
@@ -4333,8 +4324,8 @@ _set_numpy_warn_if_no_mem_policy(PyObject *NPY_UNUSED(self), PyObject *arg)
     if (res < 0) {
         return NULL;
     }
-    int old_value = numpy_warn_if_no_mem_policy;
-    numpy_warn_if_no_mem_policy = res;
+    int old_value = npy_thread_unsafe_state.warn_if_no_mem_policy;
+    npy_thread_unsafe_state.warn_if_no_mem_policy = res;
     if (old_value) {
         Py_RETURN_TRUE;
     }
@@ -4774,69 +4765,13 @@ static int
 initialize_thread_unsafe_state(void) {
     char *env = getenv("NUMPY_WARN_IF_NO_MEM_POLICY");
     if ((env != NULL) && (strncmp(env, "1", 1) == 0)) {
-        numpy_warn_if_no_mem_policy = 1;
+        npy_thread_unsafe_state.warn_if_no_mem_policy = 1;
     }
     else {
-        numpy_warn_if_no_mem_policy = 0;
-    }
-
-    // default_truediv_type_tup
-    PyArray_Descr *tmp = PyArray_DescrFromType(NPY_DOUBLE);
-    if (tmp == NULL) {
-        return -1;
-    }
-
-    npy_static_pydata.default_truediv_type_tup =
-            PyTuple_Pack(3, tmp, tmp, tmp);
-    if (npy_static_pydata.default_truediv_type_tup == NULL) {
-        Py_DECREF(tmp);
-        return -1;
-    }
-    Py_DECREF(tmp);
-
-    PyObject *flags = PySys_GetObject("flags");  /* borrowed object */
-    if (flags == NULL) {
-        PyErr_SetString(PyExc_AttributeError, "cannot get sys.flags");
-        return -1;
-    }
-    PyObject *level = PyObject_GetAttrString(flags, "optimize");
-    if (level == NULL) {
-        return -1;
-    }
-    npy_static_cdata.optimize = PyLong_AsLong(level);
-    Py_DECREF(level);
-
-    /*
-     * see unpack_bits for how this table is used.
-     *
-     * LUT for bigendian bitorder, littleendian is handled via
-     * byteswapping in the loop.
-     *
-     * 256 8 byte blocks representing 8 bits expanded to 1 or 0 bytes
-     */
-    npy_intp j;
-    for (j=0; j < 256; j++) {
-        npy_intp k;
-        for (k=0; k < 8; k++) {
-            npy_uint8 v = (j & (1 << k)) == (1 << k);
-            npy_static_cdata.unpack_lookup_big[j].bytes[7 - k] = v;
-        }
-    }
-
-    npy_static_pydata.kwnames_is_copy = Py_BuildValue("(s)", "copy");
-    if (npy_static_pydata.kwnames_is_copy == NULL) {
-        return -1;
+        npy_thread_unsafe_state.warn_if_no_mem_policy = 0;
     }
 
-    npy_static_pydata.one_obj = PyLong_FromLong((long) 1);
-    if (npy_static_pydata.one_obj == NULL) {
-        return -1;
-    }
-
-    npy_static_pydata.zero_obj = PyLong_FromLong((long) 0);
-    if (npy_static_pydata.zero_obj == NULL) {
-        return -1;
-    }
+    npy_thread_unsafe_state.legacy_print_mode = INT_MAX;
 
     return 0;
 }
@@ -4903,6 +4838,10 @@ PyMODINIT_FUNC PyInit__multiarray_umath(void) {
         goto err;
     }
 
+    if (initialize_thread_unsafe_state() < 0) {
+        goto err;
+    }
+
     if (init_extobj() < 0) {
         goto err;
     }

numpy/_core/src/multiarray/multiarraymodule.h

@@ -70,6 +70,22 @@ typedef struct npy_thread_unsafe_state_struct {
      * used to detect module reloading in the reload guard
      */
     int reload_guard_initialized;
+
+     /*
+      * global variable to determine if legacy printing is enabled,
+      * accessible from C. For simplicity the mode is encoded as an
+      * integer where INT_MAX means no legacy mode, and '113'/'121'
+      * means 1.13/1.21 legacy mode; and 0 maps to INT_MAX. We can
+      * upgrade this if we have more complex requirements in the future.
+      */
+    int legacy_print_mode;
+
+    /*
+     * Holds the user-defined setting for whether or not to warn
+     * if there is no memory policy set
+     */
+    int warn_if_no_mem_policy;
+
 } npy_thread_unsafe_state_struct;
 
 

numpy/_core/src/multiarray/scalartypes.c.src

@@ -33,15 +33,13 @@
 #include "dragon4.h"
 #include "npy_longdouble.h"
 #include "npy_buffer.h"
+#include "npy_static_data.h"
 #include "multiarraymodule.h"
 
 #include <stdlib.h>
 
 #include "binop_override.h"
 
-/* determines if legacy mode is enabled, global set in multiarraymodule.c */
-extern int npy_legacy_print_mode;
-
 /*
  * used for allocating a single scalar, so use the default numpy
  * memory allocators instead of the (maybe) user overrides
@@ -338,7 +336,7 @@ genint_type_repr(PyObject *self)
     if (value_string == NULL) {
         return NULL;
     }
-    if (npy_legacy_print_mode <= 125) {
+    if (npy_thread_unsafe_state.legacy_print_mode <= 125) {
         return value_string;
     }
 
@@ -375,7 +373,7 @@ genbool_type_str(PyObject *self)
 static PyObject *
 genbool_type_repr(PyObject *self)
 {
-    if (npy_legacy_print_mode <= 125) {
+    if (npy_thread_unsafe_state.legacy_print_mode <= 125) {
         return genbool_type_str(self);
     }
     return PyUnicode_FromString(
@@ -501,7 +499,7 @@ stringtype_@form@(PyObject *self)
     if (ret == NULL) {
         return NULL;
     }
-    if (npy_legacy_print_mode > 125) {
+    if (npy_thread_unsafe_state.legacy_print_mode > 125) {
         Py_SETREF(ret, PyUnicode_FromFormat("np.bytes_(%S)", ret));
     }
 #endif   /* IS_repr */
@@ -548,7 +546,7 @@ unicodetype_@form@(PyObject *self)
     if (ret == NULL) {
         return NULL;
     }
-    if (npy_legacy_print_mode > 125) {
+    if (npy_thread_unsafe_state.legacy_print_mode > 125) {
         Py_SETREF(ret, PyUnicode_FromFormat("np.str_(%S)", ret));
     }
 #endif  /* IS_repr */
@@ -629,7 +627,7 @@ voidtype_repr(PyObject *self)
         /* Python helper checks for the legacy mode printing */
         return _void_scalar_to_string(self, 1);
     }
-    if (npy_legacy_print_mode > 125) {
+    if (npy_thread_unsafe_state.legacy_print_mode > 125) {
         return _void_to_hex(s->obval, s->descr->elsize, "np.void(b'", "\\x", "')");
     }
     else {
@@ -681,7 +679,7 @@ datetimetype_repr(PyObject *self)
      */
     if ((scal->obmeta.num == 1 && scal->obmeta.base != NPY_FR_h) ||
             scal->obmeta.base == NPY_FR_GENERIC) {
-        if (npy_legacy_print_mode > 125) {
+        if (npy_thread_unsafe_state.legacy_print_mode > 125) {
             ret = PyUnicode_FromFormat("np.datetime64('%s')", iso);
         }
         else {
@@ -693,7 +691,7 @@ datetimetype_repr(PyObject *self)
         if (meta == NULL) {
             return NULL;
         }
-        if (npy_legacy_print_mode > 125) {
+        if (npy_thread_unsafe_state.legacy_print_mode > 125) {
             ret = PyUnicode_FromFormat("np.datetime64('%s','%S')", iso, meta);
         }
         else {
@@ -737,7 +735,7 @@ timedeltatype_repr(PyObject *self)
 
     /* The metadata unit */
     if (scal->obmeta.base == NPY_FR_GENERIC) {
-        if (npy_legacy_print_mode > 125) {
+        if (npy_thread_unsafe_state.legacy_print_mode > 125) {
             ret = PyUnicode_FromFormat("np.timedelta64(%S)", val);
         }
         else {
@@ -750,7 +748,7 @@ timedeltatype_repr(PyObject *self)
             Py_DECREF(val);
             return NULL;
         }
-        if (npy_legacy_print_mode > 125) {
+        if (npy_thread_unsafe_state.legacy_print_mode > 125) {
             ret = PyUnicode_FromFormat("np.timedelta64(%S,'%S')", val, meta);
         }
         else {
@@ -1052,7 +1050,7 @@ static PyObject *
                          npy_bool sign)
 {
 
-    if (npy_legacy_print_mode <= 113) {
+    if (npy_thread_unsafe_state.legacy_print_mode <= 113) {
         return legacy_@name@_format@kind@(val);
     }
 
@@ -1083,7 +1081,7 @@ static PyObject *
     if (string == NULL) {
         return NULL;
     }
-    if (npy_legacy_print_mode > 125) {
+    if (npy_thread_unsafe_state.legacy_print_mode > 125) {
         Py_SETREF(string, PyUnicode_FromFormat("@repr_format@", string));
     }
 #endif  /* IS_repr */
@@ -1098,7 +1096,7 @@ c@name@type_@kind@(PyObject *self)
     npy_c@name@ val = PyArrayScalar_VAL(self, C@Name@);
     TrimMode trim = TrimMode_DptZeros;
 
-    if (npy_legacy_print_mode <= 113) {
+    if (npy_thread_unsafe_state.legacy_print_mode <= 113) {
         return legacy_c@name@_format@kind@(val);
     }
 
@@ -1111,7 +1109,7 @@ c@name@type_@kind@(PyObject *self)
 #ifdef IS_str
         ret = PyUnicode_FromFormat("%Sj", istr);
 #else  /* IS_repr */
-        if (npy_legacy_print_mode <= 125) {
+        if (npy_thread_unsafe_state.legacy_print_mode <= 125) {
             ret = PyUnicode_FromFormat("%Sj", istr);
         }
         else {
@@ -1159,7 +1157,7 @@ c@name@type_@kind@(PyObject *self)
 #ifdef IS_str
     string = PyUnicode_FromFormat("(%S%Sj)", rstr, istr);
 #else  /* IS_repr */
-    if (npy_legacy_print_mode > 125) {
+    if (npy_thread_unsafe_state.legacy_print_mode > 125) {
         string = PyUnicode_FromFormat("@crepr_format@", rstr, istr);
     }
     else {
@@ -1184,7 +1182,7 @@ halftype_@kind@(PyObject *self)
     float floatval = npy_half_to_float(val);
     float absval;
 
-    if (npy_legacy_print_mode <= 113) {
+    if (npy_thread_unsafe_state.legacy_print_mode <= 113) {
         return legacy_float_format@kind@(floatval);
     }
 
@@ -1200,7 +1198,7 @@ halftype_@kind@(PyObject *self)
 #ifdef IS_str
     return string;
 #else
-    if (string == NULL || npy_legacy_print_mode <= 125) {
+    if (string == NULL || npy_thread_unsafe_state.legacy_print_mode <= 125) {
         return string;
     }
     PyObject *res = PyUnicode_FromFormat("np.float16(%S)", string);