-
-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
backport patch for numpy 2.0 compatibility
- Loading branch information
1 parent
aed9881
commit 8275b5c
Showing
2 changed files
with
31 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From 8ac13ee041e575a5b2af196dfd5088d9bdf90700 Mon Sep 17 00:00:00 2001 | ||
From: Alexis DUBURCQ <[email protected]> | ||
Date: Fri, 15 Mar 2024 14:10:16 +0100 | ||
Subject: [PATCH] Support numpy 2.0.0b1 | ||
|
||
--- | ||
libs/python/libs/python/src/numpy/dtype.cpp | 8 +++++++- | ||
1 file changed, 7 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/libs/python/src/numpy/dtype.cpp b/libs/python/src/numpy/dtype.cpp | ||
index 88a20a27..da30d192 100644 | ||
--- a/libs/python/src/numpy/dtype.cpp | ||
+++ b/libs/python/src/numpy/dtype.cpp | ||
@@ -98,7 +98,13 @@ python::detail::new_reference dtype::convert(object const & arg, bool align) | ||
return python::detail::new_reference(reinterpret_cast<PyObject*>(obj)); | ||
} | ||
|
||
-int dtype::get_itemsize() const { return reinterpret_cast<PyArray_Descr*>(ptr())->elsize;} | ||
+int dtype::get_itemsize() const { | ||
+#if NPY_ABI_VERSION < 0x02000000 | ||
+ return reinterpret_cast<PyArray_Descr*>(ptr())->elsize; | ||
+#else | ||
+ return PyDataType_ELSIZE(reinterpret_cast<PyArray_Descr*>(ptr())); | ||
+#endif | ||
+} | ||
|
||
bool equivalent(dtype const & a, dtype const & b) { | ||
// On Windows x64, the behaviour described on |