update unytdtype to work with numpy 2.0

Author: ngoldbaum

unytdtype/unytdtype/src/casts.c

@@ -1,10 +1,13 @@
 #include <Python.h>
 
+#include <Python.h>
+
 #define PY_ARRAY_UNIQUE_SYMBOL unytdtype_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/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 #include "numpy/ndarraytypes.h"
 
 #include "casts.h"
@@ -442,7 +445,7 @@ static PyArray_DTypeMeta *u2u_dtypes[2] = {NULL, NULL};
 
 static PyType_Slot u2u_slots[] = {
         {NPY_METH_resolve_descriptors, &unit_to_unit_resolve_descriptors},
-        {_NPY_METH_get_loop, &unit_to_unit_get_loop},
+        {NPY_METH_get_loop, &unit_to_unit_get_loop},
         {0, NULL}};
 
 static PyArrayMethod_Spec UnitToUnitCastSpec = {
@@ -456,7 +459,7 @@ static PyArrayMethod_Spec UnitToUnitCastSpec = {
 };
 
 static PyType_Slot u2f_slots[] = {
-        {_NPY_METH_get_loop, &unit_to_float64_get_loop}, {0, NULL}};
+        {NPY_METH_get_loop, &unit_to_float64_get_loop}, {0, NULL}};
 
 static char *u2f_name = "cast_UnytDType_to_Float64";
 

unytdtype/unytdtype/src/casts.h

@@ -1,15 +1,6 @@
 #ifndef _NPY_CASTS_H
 #define _NPY_CASTS_H
 
-#include <Python.h>
-
-#define PY_ARRAY_UNIQUE_SYMBOL unytdtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
-#include "numpy/ndarraytypes.h"
-
 /* Gets the conversion between two units: */
 int
 get_conversion_factor(PyObject *from_unit, PyObject *to_unit, double *factor,

unytdtype/unytdtype/src/dtype.c

@@ -1,3 +1,16 @@
+// clang-format off
+#include <Python.h>
+#include "structmember.h"
+// clang-format on
+
+#define PY_ARRAY_UNIQUE_SYMBOL unytdtype_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/arrayobject.h"
+#include "numpy/dtype_api.h"
+#include "numpy/ndarraytypes.h"
+
 #include "dtype.h"
 
 #include "casts.h"

unytdtype/unytdtype/src/dtype.h

@@ -1,18 +1,6 @@
 #ifndef _NPY_DTYPE_H
 #define _NPY_DTYPE_H
 
-// clang-format off
-#include <Python.h>
-#include "structmember.h"
-// clang-format on
-
-#define PY_ARRAY_UNIQUE_SYMBOL unytdtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
-#include "numpy/ndarraytypes.h"
-
 typedef struct {
     PyArray_Descr base;
     PyObject *unit;

unytdtype/unytdtype/src/umath.c

@@ -1,10 +1,11 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL unytdtype_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/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 #include "numpy/ndarraytypes.h"
 #include "numpy/ufuncobject.h"
 
@@ -64,20 +65,22 @@ unit_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");
-    Py_DECREF(numpy);
     if (multiply == NULL) {
-        return -1;
+        Py_DECREF(numpy);
+        return NULL;
     }
 
     /*
@@ -103,8 +106,9 @@ 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;
 }

unytdtype/unytdtype/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 */

unytdtype/unytdtype/src/unytdtype_main.c

@@ -1,9 +1,9 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL unytdtype_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"
@@ -18,12 +18,7 @@ static struct PyModuleDef moduledef = {
 PyMODINIT_FUNC
 PyInit__unytdtype_main(void)
 {
-    if (_import_array() < 0) {
-        return NULL;
-    }
-    if (import_experimental_dtype_api(15) < 0) {
-        return NULL;
-    }
+    import_array();
 
     PyObject *m = PyModule_Create(&moduledef);
     if (m == NULL) {
@@ -50,10 +45,14 @@ PyInit__unytdtype_main(void)
         goto error;
     }
 
-    if (init_multiply_ufunc() < 0) {
+    PyObject *numpy = init_multiply_ufunc();
+
+    if (numpy == NULL) {
         goto error;
     }
 
+    Py_DECREF(numpy);
+
     return m;
 
 error: