fix to support Numpy 1.x and Numpy 2.x

Author: magro11

Qitom/python/pythonDataObject.cpp

@@ -46,10 +46,6 @@
 
 #define PROTOCOL_STR_LENGTH 128
 
-// Define NPY_2_0_API_VERSION if it's not available (e.g., when using NumPy 1.x)
-#ifndef NPY_2_0_API_VERSION
-#define NPY_2_0_API_VERSION 0x00000012
-#endif
 
 namespace ito {
 template<class T>
@@ -1178,7 +1174,7 @@ bool PythonDataObject::PyDataObj_CopyFromDatetimeNpNdArray(
     // in case of datetime or timedelta: The values are int64, based on 1.1.1970
     // the timebase is given by:
     // Assuming NumPy 1.7+ has the new behavior for descr metadata
-#if (NPY_2_0_API_VERSION)
+#ifdef NPY_2_0_API_VERSION
     const auto md = (PyArray_DatetimeDTypeMetaData*)(descr);
 #else
     const auto md = (PyArray_DatetimeDTypeMetaData*)(descr->c_metadata);
@@ -1313,7 +1309,7 @@ bool PythonDataObject::PyDataObj_CopyFromTimedeltaNpNdArray(
 
     // in case of datetime or timedelta: The values are int64, based on 1.1.1970
     // the timebase is given by:
-#if (NPY_2_0_API_VERSION)
+#ifdef NPY_2_0_API_VERSION
     const auto md = (PyArray_DatetimeDTypeMetaData*)(descr);
 #else
     const auto md = (PyArray_DatetimeDTypeMetaData*)(descr->c_metadata);
@@ -8564,7 +8560,11 @@ RetVal PythonDataObject::parseTypeNumber(int typeno, char& typekind, int& itemsi
         // todo: maybe kind and size can be hard coded
         PyArray_Descr* descr = PyArray_DescrNewFromType(NPY_DATETIME);
         typekind = descr->kind; // NPY_DATETIMELTR
+#ifdef NPY_2_0_API_VERSION
         itemsize = PyDataType_ELSIZE(descr);
+#else
+        itemsize = descr->elsize; // 8
+#endif
         Py_DECREF(descr);
 
         // PyDatetimeScalarObject
@@ -8574,7 +8574,11 @@ RetVal PythonDataObject::parseTypeNumber(int typeno, char& typekind, int& itemsi
         // todo: maybe kind and size can be hard coded
         PyArray_Descr* descr = PyArray_DescrNewFromType(NPY_TIMEDELTA);
         typekind = descr->kind; // NPY_TIMEDELTALTR
+#ifdef NPY_2_0_API_VERSION
         itemsize = PyDataType_ELSIZE(descr);
+#else
+        itemsize = descr->elsize; // 8
+#endif
         Py_DECREF(descr);
         break;
     }
@@ -8748,7 +8752,7 @@ std::string PythonDataObject::getNpDTypeStringFromNpDTypeEnum(const int type)
     case NPY_HALF:
         typeStr = "half";
         break;
-#if (NPY_2_0_API_VERSION)
+#ifdef NPY_2_0_API_VERSION
     case NPY_NTYPES_LEGACY:
 #else
     case NPY_NTYPES:
@@ -8980,7 +8984,7 @@ ito::RetVal PythonDataObject::copyNpArrayValuesToDataObject(
             ito::DateTime* rowPtr;
             PyArray_Descr* dtype = PyArray_DESCR(npNdArray);
 
-#if (NPY_2_0_API_VERSION)
+#ifdef NPY_2_0_API_VERSION
             const auto md = (PyArray_DatetimeDTypeMetaData*)(dtype);
 #else
             const auto md = (PyArray_DatetimeDTypeMetaData*)(dtype->c_metadata);
@@ -9014,7 +9018,7 @@ ito::RetVal PythonDataObject::copyNpArrayValuesToDataObject(
             ito::TimeDelta* rowPtr;
             PyArray_Descr* dtype = PyArray_DESCR(npNdArray);
 
-#if (NPY_2_0_API_VERSION)
+#ifdef NPY_2_0_API_VERSION
             const auto md = (PyArray_DatetimeDTypeMetaData*)(dtype);
 #else
             const auto md = (PyArray_DatetimeDTypeMetaData*)(dtype->c_metadata);
@@ -9560,7 +9564,7 @@ PyArrayObject* nparrayFromTimeDeltaDataObject(
 {
     // step 1: create numpy array
     PyArray_Descr* descr = PyArray_DescrNewFromType(NPY_TIMEDELTA);
-#if (NPY_2_0_API_VERSION)
+#ifdef NPY_2_0_API_VERSION
     auto metaData = (PyArray_DatetimeDTypeMetaData*)(descr);
 #else
     auto metaData = (PyArray_DatetimeDTypeMetaData*)(descr->c_metadata);
@@ -9685,7 +9689,7 @@ PyArrayObject* nparrayFromDateTimeDataObject(
 {
     // step 1: create numpy array
     PyArray_Descr* descr = PyArray_DescrNewFromType(NPY_DATETIME);
-    #if (NPY_2_0_API_VERSION)
+#ifdef NPY_2_0_API_VERSION
     auto metaData = (PyArray_DatetimeDTypeMetaData*)(descr);
 #else
     auto metaData = (PyArray_DatetimeDTypeMetaData*)(descr->c_metadata);
@@ -9853,7 +9857,7 @@ PyObject* PythonDataObject::PyDataObj_Array_(PyDataObject* self, PyObject* args)
 
         if (newtype && PyDataType_ISDATETIME(newtype))
         {
-#if (NPY_2_0_API_VERSION)
+#ifdef NPY_2_0_API_VERSION
             meta = &(((PyArray_DatetimeDTypeMetaData*)newtype)->meta);
 #else
             meta = &(((PyArray_DatetimeDTypeMetaData*)newtype->c_metadata)->meta);