ABI compat

hobu · hobu · commit 066ab0cc15f1 · 2024-06-18T09:37:34.000-05:00
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)

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ dependencies = [`
`29`	`29`	`"numpy >= 1.22"`
`30`	`30`	`]`
`31`	`31`
`32`		`-version="1.5.1"`
	`32`	`+version="1.5.2"`
`33`	`33`
`34`	`34`	`[project.optional-dependencies]`
`35`	`35`	`test = [ ]`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@`
`45`	`45`
`46`	`46`	`#include "../plang/Environment.hpp"`
`47`	`47`
	`48`	`+#if NPY_ABI_VERSION < 0x02000000`
	`49`	`+ #define PyDataType_FIELDS(descr) ((descr)->fields)`
	`50`	`+ #define PyDataType_ELSIZE(descr) ((descr)->elsize)`
	`51`	`+#endif`
`48`	`52`
`49`	`53`	`std::string toString(PyObject *pname)`
`50`	`54`	`{`