Merge pull request #105 from matthewdcong/numpy2_abi_changes

fwilliams · web-flow · commit c5d392576554 · 2025-03-20T22:57:23.000-04:00
Draft: Add support for NumPy 2.0.0 ABI changes
diff --git a/src/common/ply_loader.h b/src/common/ply_loader.h
@@ -74,7 +74,7 @@ pybind11::array ply_data_to_array(std::shared_ptr<tinyply::PlyData> attrib) {
     if (attrib->count == 0) {
         return pybind11::array(attrib_dtype, std::vector<size_t>({0, 0}));
     }
-    size_t bytes_per_scalar = attrib_dtype.elsize();
+    size_t bytes_per_scalar = static_cast<size_t>(attrib_dtype.itemsize());
     if (bytes_per_scalar <= 0) {
         throw std::runtime_error("Internal PLY loading error. Type has no defined byte size.");
     }
@@ -541,4 +541,4 @@ void save_mesh_ply(std::string filename,
     plyf.write(outstream_binary, true);
 }
 
-#endif // PLY_LOADER_H
+#endif // PLY_LOADER_H

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ pybind11::array ply_data_to_array(std::shared_ptr<tinyply::PlyData> attrib) {`
`74`	`74`	`if (attrib->count == 0) {`
`75`	`75`	`return pybind11::array(attrib_dtype, std::vector<size_t>({0, 0}));`
`76`	`76`	`}`
`77`		`- size_t bytes_per_scalar = attrib_dtype.elsize();`
	`77`	`+ size_t bytes_per_scalar = static_cast<size_t>(attrib_dtype.itemsize());`
`78`	`78`	`if (bytes_per_scalar <= 0) {`
`79`	`79`	`throw std::runtime_error("Internal PLY loading error. Type has no defined byte size.");`
`80`	`80`	`}`
`@@ -541,4 +541,4 @@ void save_mesh_ply(std::string filename,`
`541`	`541`	`plyf.write(outstream_binary, true);`
`542`	`542`	`}`
`543`	`543`
`544`		`-#endif // PLY_LOADER_H`
	`544`	`+#endif // PLY_LOADER_H`