ABI compat

PDAL · Jun 18, 2024 · 066ab0c · 066ab0c
1 parent 83158ff
commit 066ab0c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,7 +29,7 @@ dependencies = [
   "numpy >= 1.22"
 ]
 
-version="1.5.1"
+version="1.5.2"
 
 [project.optional-dependencies]
 test = [ ]

diff --git a/src/pdal/io/NumpyReader.cpp b/src/pdal/io/NumpyReader.cpp
@@ -45,6 +45,10 @@
 
 #include "../plang/Environment.hpp"
 
+#if NPY_ABI_VERSION < 0x02000000
+  #define PyDataType_FIELDS(descr) ((descr)->fields)
+  #define PyDataType_ELSIZE(descr) ((descr)->elsize)
+#endif
 
 std::string toString(PyObject *pname)
 {

diff --git a/src/pdal/plang/Invocation.cpp b/src/pdal/plang/Invocation.cpp
@@ -235,6 +235,11 @@ bool Invocation::execute(PointViewPtr& v, MetadataNode stageMetadata)
 }
 
 
+#if NPY_ABI_VERSION < 0x02000000
+  #define PyDataType_FIELDS(descr) ((descr)->fields)
+  #define PyDataType_ELSIZE(descr) ((descr)->elsize)
+#endif
+
 // Returns a pointer to the data in Numpy array, 'array'.
 void *Invocation::extractArray(PyObject *array, std::string const& name,
     Dimension::Type t, size_t& num_elements)