Update mpfdtype for numpy 2.0

Author: ngoldbaum

mpfdtype/mpfdtype/src/casts.cpp

@@ -1,14 +1,15 @@
 
 #define PY_ARRAY_UNIQUE_SYMBOL MPFDType_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
 
 extern "C" {
     #include <Python.h>
 
     #include "numpy/arrayobject.h"
     #include "numpy/ndarraytypes.h"
-    #include "numpy/experimental_dtype_api.h"
+    #include "numpy/dtype_api.h"
 }
 
 #include <vector>

mpfdtype/mpfdtype/src/dtype.c

@@ -1,11 +1,12 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL MPFDType_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/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 
 #include "mpfr.h"
 

mpfdtype/mpfdtype/src/mpfdtype_main.c

@@ -1,9 +1,9 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL MPFDType_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"
@@ -22,9 +22,6 @@ PyInit__mpfdtype_main(void)
     if (_import_array() < 0) {
         return NULL;
     }
-    if (import_experimental_dtype_api(15) < 0) {
-        return NULL;
-    }
 
     PyObject *m = PyModule_Create(&moduledef);
     if (m == NULL) {
@@ -47,10 +44,14 @@ PyInit__mpfdtype_main(void)
         goto error;
     }
 
-    if (init_mpf_umath() < 0) {
+    PyObject *numpy = init_mpf_umath();
+    
+    if (numpy == NULL) {
         goto error;
     }
 
+    Py_DECREF(numpy);
+
     if (init_terrible_hacks() < 0) {
         goto error;
     }

mpfdtype/mpfdtype/src/numbers.cpp

@@ -3,7 +3,8 @@
  */
 
 #define PY_ARRAY_UNIQUE_SYMBOL MPFDType_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
 
 extern "C" {
@@ -13,7 +14,7 @@ extern "C" {
     #include "numpy/ndarraytypes.h"
     #include "numpy/ufuncobject.h"
 
-    #include "numpy/experimental_dtype_api.h"
+    #include "numpy/dtype_api.h"
 }
 
 #include <algorithm>

mpfdtype/mpfdtype/src/scalar.c

@@ -1,11 +1,11 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL MPFDType_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#define NPY_NO_DEPRECATED_API NPY_2_0_API_VERSION
 #define NO_IMPORT_ARRAY
 #include "numpy/arrayobject.h"
 #include "numpy/ndarraytypes.h"
-#include "numpy/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 
 #include "scalar.h"
 #include "numbers.h"

mpfdtype/mpfdtype/src/terrible_hacks.c

@@ -1,11 +1,12 @@
 #include <Python.h>
 
 #define PY_ARRAY_UNIQUE_SYMBOL MPFDType_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/experimental_dtype_api.h"
+#include "numpy/dtype_api.h"
 
 #include "mpfr.h"
 
@@ -68,8 +69,8 @@ init_terrible_hacks(void) {
         return -1;
     }
     /* ->f slots are the same for all instances (currently). */
-    descr->base.f->copyswap = (PyArray_CopySwapFunc *)&copyswap_mpf;
-    descr->base.f->compare = (PyArray_CompareFunc *)&compare_mpf;
+    PyDataType_GetArrFuncs(&descr->base)->copyswap = (PyArray_CopySwapFunc *)&copyswap_mpf;
+    PyDataType_GetArrFuncs(&descr->base)->compare = (PyArray_CompareFunc *)&compare_mpf;
     Py_DECREF(descr);
 
     return 0;

mpfdtype/mpfdtype/src/umath.cpp

@@ -1,7 +1,8 @@
 
 #include "scalar.h"
 #define PY_ARRAY_UNIQUE_SYMBOL MPFDType_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
 
 extern "C" {
@@ -11,7 +12,7 @@ extern "C" {
     #include "numpy/ndarraytypes.h"
     #include "numpy/ufuncobject.h"
 
-    #include "numpy/experimental_dtype_api.h"
+    #include "numpy/dtype_api.h"
 }
 
 #include <algorithm>
@@ -591,15 +592,17 @@ init_comps(PyObject *numpy)
 /*
  * Function that adds our multiply loop to NumPy's multiply ufunc.
  */
-int
+PyObject *
 init_mpf_umath(void)
 {
+    import_umath();
+  
     /*
      * Get the multiply ufunc:
      */
     PyObject *numpy = PyImport_ImportModule("numpy");
     if (numpy == NULL) {
-        return -1;
+        return NULL;
     }
 
     if (init_unary_ops(numpy) < 0) {
@@ -612,10 +615,10 @@ init_mpf_umath(void)
         goto err;
     }
 
-    return 0;
+    return numpy;
 
   err:
     Py_DECREF(numpy);
-    return -1;
+    return NULL;
 }
 

mpfdtype/mpfdtype/src/umath.h

@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-int
+PyObject *
 init_mpf_umath(void);
 
 #ifdef __cplusplus