ENH: use n_ops struct for comparison

lvllvl · lvllvl · commit f40d31818aff · 2025-08-08T16:16:46.000Z
diff --git a/numpy/_core/src/umath/ufunc_object.c b/numpy/_core/src/umath/ufunc_object.c
@@ -65,6 +65,7 @@
 #include "mapping.h"
 #include "npy_static_data.h"
 #include "multiarraymodule.h"
+#include "../multiarray/number.h"
 
 /********** PRINTF DEBUG TRACING **************/
 #define NPY_UF_DBG_TRACING 0
@@ -90,8 +91,6 @@ typedef struct {
 
 
 /* ---------------------------------------------------------------- */
-extern PyUFuncObject *UFUNC_MAXIMUM;
-extern PyUFuncObject *UFUNC_MINIMUM;
 
 static PyObject *
 prepare_input_arguments_for_outer(PyObject *args, PyUFuncObject *ufunc);
@@ -4373,7 +4372,7 @@ ufunc_generic_fastcall(PyUFuncObject *ufunc,
 
         /* Extra positional args but no keywords */
         /* DEPRECATED NumPy 2.4, 2025-08 */
-        if (ufunc == UFUNC_MAXIMUM || ufunc == UFUNC_MINIMUM) {
+        if ((PyObject *)ufunc == n_ops.maximum || (PyObject *)ufunc == n_ops.minimum) {
             
             if (DEPRECATE(
                 "Passing more than 2 positional arguments to np.maximum and np.minimum "
diff --git a/numpy/_core/src/umath/umathmodule.c b/numpy/_core/src/umath/umathmodule.c
@@ -40,8 +40,6 @@
 
 
 static PyUFuncGenericFunction pyfunc_functions[] = {PyUFunc_On_Om};
-PyUFuncObject *UFUNC_MAXIMUM = NULL;
-PyUFuncObject *UFUNC_MINIMUM = NULL;
 
 static int
 object_ufunc_type_resolver(PyUFuncObject *ufunc,
@@ -284,17 +282,6 @@ int initumath(PyObject *m)
     PyDict_SetItemString(d, "conj", s);
     PyDict_SetItemString(d, "mod", s2);
 
-    PyObject *tmp;
-    if (PyDict_GetItemStringRef(d, "maximum", &tmp) < 0) {
-        return -1;
-    }
-    UFUNC_MAXIMUM = (PyUFuncObject *)tmp;
-
-    if (PyDict_GetItemStringRef(d, "minimum", &tmp) < 0) {
-        return -1;
-    }
-    UFUNC_MINIMUM = (PyUFuncObject *)tmp;
-
     /*
      * Set up promoters for logical functions
      * TODO: This should probably be done at a better place, or even in the
