Merge pull request #1 from mtsokol/rename-numpy-core-c-api

mtsokol · web-flow · commit cdebcf38e22f · 2023-09-11T20:52:24.000+02:00
MAINT: Check numpy version in C-API
diff --git a/numpy/_core/code_generators/generate_numpy_api.py b/numpy/_core/code_generators/generate_numpy_api.py
@@ -41,18 +41,21 @@
 
 %s
 
+#include "numpy/utils.h"
+
 #if !defined(NO_IMPORT_ARRAY) && !defined(NO_IMPORT)
 static int
 _import_array(void)
 {
   int st;
-  PyObject *numpy = PyImport_ImportModule("numpy._core._multiarray_umath");
-  PyObject *c_api = NULL;
-
+  PyObject *numpy = _npy_import_numpy_multiarray_umath();
   if (numpy == NULL) {
+      PyErr_SetString(PyExc_ImportError,
+                      "_multiarray_umath failed to import");
       return -1;
   }
-  c_api = PyObject_GetAttrString(numpy, "_ARRAY_API");
+
+  PyObject *c_api = PyObject_GetAttrString(numpy, "_ARRAY_API");
   Py_DECREF(numpy);
   if (c_api == NULL) {
       PyErr_SetString(PyExc_AttributeError, "_ARRAY_API not found");
diff --git a/numpy/_core/code_generators/generate_ufunc_api.py b/numpy/_core/code_generators/generate_ufunc_api.py
@@ -30,18 +30,19 @@
 
 %s
 
+#include "numpy/utils.h"
+
 static inline int
 _import_umath(void)
 {
-  PyObject *numpy = PyImport_ImportModule("numpy._core._multiarray_umath");
-  PyObject *c_api = NULL;
-
+  PyObject *numpy = _npy_import_numpy_multiarray_umath();
   if (numpy == NULL) {
       PyErr_SetString(PyExc_ImportError,
-                      "numpy._core._multiarray_umath failed to import");
+                      "_multiarray_umath failed to import");
       return -1;
   }
-  c_api = PyObject_GetAttrString(numpy, "_UFUNC_API");
+
+  PyObject *c_api = PyObject_GetAttrString(numpy, "_UFUNC_API");
   Py_DECREF(numpy);
   if (c_api == NULL) {
       PyErr_SetString(PyExc_AttributeError, "_UFUNC_API not found");
diff --git a/numpy/_core/include/numpy/experimental_dtype_api.h b/numpy/_core/include/numpy/experimental_dtype_api.h
@@ -128,6 +128,7 @@
 #include <Python.h>
 #include "ndarraytypes.h"
 #include "_dtype_api.h"
+#include "utils.h"
 
 /*
  * The contents of PyArrayMethodObject are currently opaque (is there a way
@@ -353,7 +354,7 @@ import_experimental_dtype_api(int version)
         return 0;
     }
 
-    PyObject *multiarray = PyImport_ImportModule("numpy._core._multiarray_umath");
+    PyObject *multiarray = _npy_import_numpy_multiarray_umath();
     if (multiarray == NULL) {
         return -1;
     }
diff --git a/numpy/_core/include/numpy/oldnumeric.h b/numpy/_core/include/numpy/oldnumeric.h
diff --git a/numpy/_core/include/numpy/utils.h b/numpy/_core/include/numpy/utils.h
@@ -1,6 +1,8 @@
 #ifndef NUMPY_CORE_INCLUDE_NUMPY_UTILS_H_
 #define NUMPY_CORE_INCLUDE_NUMPY_UTILS_H_
 
+#include <Python.h>
+
 #ifndef __COMP_NPY_UNUSED
     #if defined(__GNUC__)
         #define __COMP_NPY_UNUSED __attribute__ ((__unused__))
@@ -34,4 +36,17 @@
 #define NPY_CAT_(a, b) NPY_CAT__(a, b)
 #define NPY_CAT(a, b) NPY_CAT_(a, b)
 
+static PyObject *_npy_import_numpy_multiarray_umath()
+{
+    PyObject *multiarray = PyImport_ImportModule("numpy._core._multiarray_umath");
+    if (
+        multiarray == NULL && 
+        PyErr_ExceptionMatches(PyExc_ModuleNotFoundError)
+    ) {
+        PyErr_Clear();
+        multiarray = PyImport_ImportModule("numpy.core._multiarray_umath");
+    }
+    return multiarray;
+}
+
 #endif  /* NUMPY_CORE_INCLUDE_NUMPY_UTILS_H_ */

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@`
`128`	`128`	`#include <Python.h>`
`129`	`129`	`#include "ndarraytypes.h"`
`130`	`130`	`#include "_dtype_api.h"`
	`131`	`+#include "utils.h"`
`131`	`132`
`132`	`133`	`/*`
`133`	`134`	`* The contents of PyArrayMethodObject are currently opaque (is there a way`
`@@ -353,7 +354,7 @@ import_experimental_dtype_api(int version)`
`353`	`354`	`return 0;`
`354`	`355`	`}`
`355`	`356`
`356`		`- PyObject *multiarray = PyImport_ImportModule("numpy._core._multiarray_umath");`
	`357`	`+ PyObject *multiarray = _npy_import_numpy_multiarray_umath();`
`357`	`358`	`if (multiarray == NULL) {`
`358`	`359`	`return -1;`
`359`	`360`	`}`