update quaddtype to work on numpy 2.0

Author: ngoldbaum

quaddtype/quaddtype/src/casts.c

@@ -1,5 +1,15 @@
-#include "casts.h"
+#include <Python.h>
+
+#define PY_ARRAY_UNIQUE_SYMBOL quaddtype_ARRAY_API
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NO_IMPORT_ARRAY
+#include "numpy/ndarraytypes.h"
+#include "numpy/arrayobject.h"
+#include "numpy/dtype_api.h"
+
 #include "dtype.h"
+#include "casts.h"
 
 // And now the actual cast code!  Starting with the "resolver" which tells
 // us about cast safety.
@@ -131,7 +141,7 @@ static PyArray_DTypeMeta *QuadToQuadDtypes[2] = {NULL, NULL};
 
 static PyType_Slot QuadToQuadSlots[] = {
         {NPY_METH_resolve_descriptors, &quad_to_quad_resolve_descriptors},
-        {_NPY_METH_get_loop, &quad_to_quad_get_loop},
+        {NPY_METH_get_loop, &quad_to_quad_get_loop},
         {0, NULL}};
 
 PyArrayMethod_Spec QuadToQuadCastSpec = {

quaddtype/quaddtype/src/casts.h

@@ -1,7 +1,6 @@
 #ifndef _NPY_CASTS_H
 #define _NPY_CASTS_H
 
-#include "numpy/experimental_dtype_api.h"
 extern PyArrayMethod_Spec QuadToQuadCastSpec;
 extern PyArrayMethod_Spec QuadToFloat128CastSpec;
 

quaddtype/quaddtype/src/dtype.c

@@ -1,3 +1,13 @@
+#include <Python.h>
+
+#define PY_ARRAY_UNIQUE_SYMBOL quaddtype_ARRAY_API
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NO_IMPORT_ARRAY
+#include "numpy/ndarraytypes.h"
+#include "numpy/arrayobject.h"
+#include "numpy/dtype_api.h"
+
 #include "dtype.h"
 #include "abstract.h"
 #include "casts.h"

quaddtype/quaddtype/src/dtype.h

@@ -1,15 +1,6 @@
 #ifndef _NPY_DTYPE_H
 #define _NPY_DTYPE_H
 
-#include <Python.h>
-
-#define PY_ARRAY_UNIQUE_SYMBOL quaddtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define NO_IMPORT_ARRAY
-#include "numpy/ndarraytypes.h"
-#include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
-
 typedef struct {
     PyArray_Descr base;
 } QuadDTypeObject;

quaddtype/quaddtype/src/quaddtype_main.c

@@ -1,9 +1,9 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL quaddtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
 #include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 
 #include "dtype.h"
 #include "umath.h"
@@ -19,16 +19,9 @@ static struct PyModuleDef moduledef = {
 PyMODINIT_FUNC
 PyInit__quaddtype_main(void)
 {
-    if (_import_array() < 0)
+    if (import_array() < 0)
         return NULL;
 
-    // Fail to init if the experimental DType API version 5 isn't supported
-    if (import_experimental_dtype_api(15) < 0) {
-        PyErr_SetString(PyExc_ImportError,
-                        "Error encountered importing the experimental dtype API.");
-        return NULL;
-    }
-
     PyObject *m = PyModule_Create(&moduledef);
     if (m == NULL) {
         PyErr_SetString(PyExc_ImportError, "Unable to create the quaddtype_main module.");
@@ -57,11 +50,15 @@ PyInit__quaddtype_main(void)
         goto error;
     }
 
-    if (init_multiply_ufunc() < 0) {
+    PyObject *numpy = init_multiply_ufunc();
+    
+    if (numpy == NULL) {
         PyErr_SetString(PyExc_TypeError, "Failed to initialize the quadscalar multiply ufunc.");
         goto error;
     }
 
+    Py_DECREF(numpy);
+
     return m;
 
 error:

quaddtype/quaddtype/src/umath.c

@@ -1,13 +1,13 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL quaddtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
 #define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
 #include "numpy/ndarraytypes.h"
+#include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"
-
-#include "numpy/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 
 #include "dtype.h"
 #include "umath.h"
@@ -73,20 +73,22 @@ quad_multiply_resolve_descriptors(PyObject *self, PyArray_DTypeMeta *dtypes[],
 }
 
 // Function that adds our multiply loop to NumPy's multiply ufunc.
-int
+PyObject*
 init_multiply_ufunc(void)
 {
+    import_umath();
+  
     // Get the multiply ufunc:
     PyObject *numpy = PyImport_ImportModule("numpy");
     if (numpy == NULL) {
-        return -1;
+        return NULL;
     }
+
     PyObject *multiply = PyObject_GetAttrString(numpy, "multiply");
 
-    // Why decref here?
-    Py_DECREF(numpy);
     if (multiply == NULL) {
-        return -1;
+        Py_DECREF(numpy);
+        return NULL;
     }
 
     // The initializing "wrap up" code from the slides (plus one error check)
@@ -114,8 +116,10 @@ init_multiply_ufunc(void)
     /* Register */
     if (PyUFunc_AddLoopFromSpec(multiply, &MultiplySpec) < 0) {
         Py_DECREF(multiply);
-        return -1;
+        Py_DECREF(numpy);
+        return NULL;
     }
+
     Py_DECREF(multiply);
-    return 0;
+    return numpy;
 }

quaddtype/quaddtype/src/umath.h

@@ -1,7 +1,7 @@
 #ifndef _NPY_UFUNC_H
 #define _NPY_UFUNC_H
 
-int
+PyObject *
 init_multiply_ufunc(void);
 
 #endif /*_NPY_UFUNC_H */