update metadatadtype for numpy 2.0

Author: ngoldbaum

metadatadtype/metadatadtype/src/casts.c

@@ -1,10 +1,11 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_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"
@@ -186,7 +187,7 @@ static PyArray_DTypeMeta *m2m_dtypes[2] = {NULL, NULL};
 static PyType_Slot m2m_slots[] = {
         {NPY_METH_resolve_descriptors,
          &metadata_to_metadata_resolve_descriptors},
-        {_NPY_METH_get_loop, &metadata_to_metadata_get_loop},
+        {NPY_METH_get_loop, &metadata_to_metadata_get_loop},
         {0, NULL}};
 
 PyArrayMethod_Spec MetadataToMetadataCastSpec = {
@@ -200,7 +201,7 @@ PyArrayMethod_Spec MetadataToMetadataCastSpec = {
 };
 
 static PyType_Slot m2f_slots[] = {
-        {_NPY_METH_get_loop, &metadata_to_float64_get_loop}, {0, NULL}};
+        {NPY_METH_get_loop, &metadata_to_float64_get_loop}, {0, NULL}};
 
 static char *m2f_name = "cast_MetadataDType_to_Float64";
 

metadatadtype/metadatadtype/src/casts.h

@@ -1,15 +1,6 @@
 #ifndef _NPY_CASTS_H
 #define _NPY_CASTS_H
 
-#include <Python.h>
-
-#define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_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"
-
 PyArrayMethod_Spec **
 get_casts(void);
 

metadatadtype/metadatadtype/src/dtype.c

@@ -1,3 +1,11 @@
+#define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_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"
@@ -74,8 +82,9 @@ new_metadatadtype_instance(PyObject *metadata)
     }
     Py_INCREF(metadata);
     new->metadata = metadata;
-    new->base.elsize = sizeof(double);
-    new->base.alignment = _Alignof(double); /* is there a better spelling? */
+    PyArray_Descr *base = (PyArray_Descr *)new;
+    base->elsize = sizeof(double);
+    base->alignment = _Alignof(double); /* is there a better spelling? */
     /* do not support byte-order for now */
 
     return new;

metadatadtype/metadatadtype/src/dtype.h

@@ -6,13 +6,6 @@
 #include "structmember.h"
 // clang-format on
 
-#define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_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 *metadata;

metadatadtype/metadatadtype/src/metadatadtype_main.c

@@ -1,12 +1,13 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_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
 #include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 
-#include "dtype.h"
 #include "umath.h"
+#include "dtype.h"
 
 static struct PyModuleDef moduledef = {
         PyModuleDef_HEAD_INIT,
@@ -18,12 +19,7 @@ static struct PyModuleDef moduledef = {
 PyMODINIT_FUNC
 PyInit__metadatadtype_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) {
@@ -51,7 +47,7 @@ PyInit__metadatadtype_main(void)
         goto error;
     }
 
-    if (init_ufuncs() < 0) {
+    if (init_ufuncs(m) == NULL) {
         goto error;
     }
 

metadatadtype/metadatadtype/src/umath.c

@@ -1,20 +1,21 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_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/ndarraytypes.h"
+#include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"
+#include "numpy/dtype_api.h"
 
 #include "dtype.h"
 #include "umath.h"
 
 static int
 translate_given_descrs(int nin, int nout,
-                       PyArray_DTypeMeta *NPY_UNUSED(wrapped_dtypes[]),
-                       PyArray_Descr *given_descrs[],
+                       PyArray_DTypeMeta *const NPY_UNUSED(wrapped_dtypes[]),
+                       PyArray_Descr *const given_descrs[],
                        PyArray_Descr *new_descrs[])
 {
     for (int i = 0; i < nin + nout; i++) {
@@ -35,8 +36,8 @@ translate_given_descrs(int nin, int nout,
 
 static int
 translate_loop_descrs(int nin, int NPY_UNUSED(nout),
-                      PyArray_DTypeMeta *NPY_UNUSED(new_dtypes[]),
-                      PyArray_Descr *given_descrs[],
+                      PyArray_DTypeMeta *const NPY_UNUSED(new_dtypes[]),
+                      PyArray_Descr *const given_descrs[],
                       PyArray_Descr *original_descrs[],
                       PyArray_Descr *loop_descrs[])
 {
@@ -102,9 +103,11 @@ add_wrapping_loop(const char *ufunc_name, PyArray_DTypeMeta **dtypes,
     return res;
 }
 
-int
-init_ufuncs(void)
+PyObject *
+init_ufuncs(PyObject *module)
 {
+    import_umath();
+
     PyArray_DTypeMeta *binary_orig_dtypes[3] = {&MetadataDType, &MetadataDType,
                                                 &MetadataDType};
     PyArray_DTypeMeta *binary_wrapped_dtypes[3] = {
@@ -123,7 +126,9 @@ init_ufuncs(void)
         goto error;
     }
 
-    return 0;
+    return module;
 error:
-    return -1;
+
+    Py_DECREF(module);
+    return NULL;
 }

metadatadtype/metadatadtype/src/umath.h

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