Merge pull request #97 from ngoldbaum/update-for-numpy-2.0

Update for numpy 2.0

asciidtype/asciidtype/src/asciidtype_main.c

@@ -1,9 +1,13 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL asciidtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define PY_UFUNC_UNIQUE_SYMBOL asciidtype_UFUNC_API
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#include "numpy/ndarraytypes.h"
 #include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
+#include "numpy/ufuncobject.h"
+#include "numpy/dtype_api.h"
 
 #include "dtype.h"
 #include "umath.h"
@@ -18,13 +22,8 @@ static struct PyModuleDef moduledef = {
 PyMODINIT_FUNC
 PyInit__asciidtype_main(void)
 {
-    if (_import_array() < 0) {
-        return NULL;
-    }
-
-    if (import_experimental_dtype_api(15) < 0) {
-        return NULL;
-    }
+    import_array();
+    import_umath();
 
     PyObject *m = PyModule_Create(&moduledef);
     if (m == NULL) {
@@ -51,7 +50,7 @@ PyInit__asciidtype_main(void)
         goto error;
     }
 
-    if (init_ufuncs() < 0) {
+    if (init_ufuncs() == -1) {
         goto error;
     }
 

asciidtype/asciidtype/src/casts.c

@@ -1,10 +1,13 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL asciidtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define PY_UFUNC_UNIQUE_SYMBOL asciidtype_UFUNC_API
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
 #define NO_IMPORT_ARRAY
+#define NO_IMPORT_UFUNC
 #include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 #include "numpy/ndarraytypes.h"
 
 #include "casts.h"
@@ -46,7 +49,7 @@ ascii_to_ascii(PyArrayMethod_Context *context, char *const data[],
                npy_intp const dimensions[], npy_intp const strides[],
                NpyAuxData *NPY_UNUSED(auxdata))
 {
-    PyArray_Descr **descrs = context->descriptors;
+    PyArray_Descr *const *descrs = context->descriptors;
     long in_size = ((ASCIIDTypeObject *)descrs[0])->size;
     long out_size = ((ASCIIDTypeObject *)descrs[1])->size;
     long copy_size;
@@ -111,7 +114,7 @@ unicode_to_ascii(PyArrayMethod_Context *context, char *const data[],
                  npy_intp const dimensions[], npy_intp const strides[],
                  NpyAuxData *NPY_UNUSED(auxdata))
 {
-    PyArray_Descr **descrs = context->descriptors;
+    PyArray_Descr *const *descrs = context->descriptors;
     long in_size = (descrs[0]->elsize) / 4;
     long out_size = ((ASCIIDTypeObject *)descrs[1])->size;
     long copy_size;
@@ -162,7 +165,7 @@ ascii_to_unicode(PyArrayMethod_Context *context, char *const data[],
                  npy_intp const dimensions[], npy_intp const strides[],
                  NpyAuxData *NPY_UNUSED(auxdata))
 {
-    PyArray_Descr **descrs = context->descriptors;
+    PyArray_Descr *const *descrs = context->descriptors;
     long in_size = ((ASCIIDTypeObject *)descrs[0])->size;
     long out_size = (descrs[1]->elsize) / 4;
     long copy_size;

asciidtype/asciidtype/src/casts.h

@@ -1,15 +1,6 @@
 #ifndef _NPY_CASTS_H
 #define _NPY_CASTS_H
 
-#include <Python.h>
-
-#define PY_ARRAY_UNIQUE_SYMBOL asciidtype_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);
 

asciidtype/asciidtype/src/dtype.c

@@ -1,3 +1,19 @@
+// clang-format off
+#include <Python.h>
+#include "structmember.h"
+// clang-format on
+
+#define PY_ARRAY_UNIQUE_SYMBOL asciidtype_ARRAY_API
+#define PY_UFUNC_UNIQUE_SYMBOL asciidtype_UFUNC_API
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NO_IMPORT_ARRAY
+#define NO_IMPORT_UFUNC
+#include "numpy/ndarraytypes.h"
+#include "numpy/arrayobject.h"
+#include "numpy/ufuncobject.h"
+#include "numpy/dtype_api.h"
+
 #include "dtype.h"
 
 #include "casts.h"

asciidtype/asciidtype/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 asciidtype_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;
     long size;

asciidtype/asciidtype/src/umath.c

@@ -1,12 +1,15 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL asciidtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define PY_UFUNC_UNIQUE_SYMBOL asciidtype_UFUNC_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/experimental_dtype_api.h"
+#define NO_IMPORT_UFUNC
 #include "numpy/ndarraytypes.h"
+#include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"
+#include "numpy/dtype_api.h"
 
 #include "dtype.h"
 #include "string.h"
@@ -17,7 +20,7 @@ ascii_add_strided_loop(PyArrayMethod_Context *context, char *const data[],
                        npy_intp const dimensions[], npy_intp const strides[],
                        NpyAuxData *NPY_UNUSED(auxdata))
 {
-    PyArray_Descr **descrs = context->descriptors;
+    PyArray_Descr *const *descrs = context->descriptors;
     long in1_size = ((ASCIIDTypeObject *)descrs[0])->size;
     long in2_size = ((ASCIIDTypeObject *)descrs[1])->size;
     long out_size = ((ASCIIDTypeObject *)descrs[2])->size;
@@ -112,7 +115,7 @@ ascii_equal_strided_loop(PyArrayMethod_Context *context, char *const data[],
                          npy_intp const dimensions[], npy_intp const strides[],
                          NpyAuxData *NPY_UNUSED(auxdata))
 {
-    PyArray_Descr **descrs = context->descriptors;
+    PyArray_Descr *const *descrs = context->descriptors;
     long in1_size = ((ASCIIDTypeObject *)descrs[0])->size;
     long in2_size = ((ASCIIDTypeObject *)descrs[1])->size;
 
@@ -234,7 +237,6 @@ init_ufuncs(void)
         goto error;
     }
 
-    Py_DECREF(numpy);
     return 0;
 
 error:

asciidtype/reinstall.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -xeuo pipefail
+IFS=$'\n\t'
+
+if [ -d "build/" ]
+then
+    rm -r build
+fi
+
+#meson setup build -Db_sanitize=address,undefined
+meson setup build
+python -m pip uninstall -y asciidtype
+python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v' -Csetup-args="-Dbuildtype=debug"
+#python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v'

metadatadtype/metadatadtype/src/casts.c

@@ -1,10 +1,13 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define PY_UFUNC_UNIQUE_SYMBOL metadatadtype_UFUNC_API
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
 #define NO_IMPORT_ARRAY
+#define NO_IMPORT_UFUNC
 #include "numpy/arrayobject.h"
-#include "numpy/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 #include "numpy/ndarraytypes.h"
 
 #include "casts.h"
@@ -186,7 +189,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 +203,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,18 @@
+// clang-format off
+#include <Python.h>
+#include "structmember.h"
+// clang-format on
+
+#define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_ARRAY_API
+#define PY_UFUNC_UNIQUE_SYMBOL metadatadtype_UFUNC_API
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
+#define NPY_TARGET_VERSION NPY_2_0_API_VERSION
+#define NO_IMPORT_ARRAY
+#define NO_IMPORT_UFUNC
+#include "numpy/arrayobject.h"
+#include "numpy/dtype_api.h"
+#include "numpy/ndarraytypes.h"
+
 #include "dtype.h"
 
 #include "casts.h"
@@ -74,8 +89,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

@@ -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 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,15 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define PY_UFUNC_UNIQUE_SYMBOL metadatadtype_UFUNC_API
+#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/ufuncobject.h"
+#include "numpy/dtype_api.h"
 
-#include "dtype.h"
 #include "umath.h"
+#include "dtype.h"
 
 static struct PyModuleDef moduledef = {
         PyModuleDef_HEAD_INIT,
@@ -18,12 +21,8 @@ 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();
+    import_umath();
 
     PyObject *m = PyModule_Create(&moduledef);
     if (m == NULL) {
@@ -51,7 +50,7 @@ PyInit__metadatadtype_main(void)
         goto error;
     }
 
-    if (init_ufuncs() < 0) {
+    if (init_ufuncs() == -1) {
         goto error;
     }
 

metadatadtype/metadatadtype/src/umath.c

@@ -1,20 +1,23 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL metadatadtype_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define PY_UFUNC_UNIQUE_SYMBOL metadatadtype_UFUNC_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/experimental_dtype_api.h"
+#define NO_IMPORT_UFUNC
 #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 +38,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[])
 {
@@ -125,5 +128,6 @@ init_ufuncs(void)
 
     return 0;
 error:
+
     return -1;
 }