From c3e322ebfbf59258fa97c223592919af06f63c0b Mon Sep 17 00:00:00 2001
From: Justin Carpentier <justin.carpentier@inria.fr>
Date: Fri, 16 Apr 2021 18:51:43 +0200
Subject: [PATCH] core: fix user declaration according to new NumPy API 1.20
---
include/eigenpy/numpy.hpp | 12 +++++++++---
include/eigenpy/user-type.hpp | 3 +++
src/numpy.cpp | 10 ++++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/include/eigenpy/numpy.hpp b/include/eigenpy/numpy.hpp
index 8bb3215..1631a79 100644
--- a/include/eigenpy/numpy.hpp
+++ b/include/eigenpy/numpy.hpp
@@ -21,10 +21,10 @@
#if defined _WIN32 || defined __CYGWIN__
#define EIGENPY_GET_PY_ARRAY_TYPE(array) \
- call_PyArray_ObjectType(reinterpret_cast<PyObject *>(array), 0)
+ call_PyArray_MinScalarType(array)->type_num
#else
#define EIGENPY_GET_PY_ARRAY_TYPE(array) \
- PyArray_ObjectType(reinterpret_cast<PyObject *>(array), 0)
+ PyArray_MinScalarType(array)->type_num
#endif
namespace eigenpy
@@ -51,6 +51,10 @@ namespace eigenpy
EIGENPY_DLLAPI void call_PyArray_InitArrFuncs(PyArray_ArrFuncs * funcs);
EIGENPY_DLLAPI int call_PyArray_RegisterDataType(PyArray_Descr * dtype);
+
+ EIGENPY_DLLAPI int call_PyArray_RegisterCanCast(PyArray_Descr *descr, int totype, NPY_SCALARKIND scalar);
+
+ EIGENPY_DLLAPI PyArray_Descr * call_PyArray_MinScalarType(PyArrayObject *arr);
}
#else
#define call_PyArray_Check(py_obj) PyArray_Check(py_obj)
@@ -59,8 +63,10 @@ namespace eigenpy
PyArray_New(py_type_ptr,nd,shape,np_type,NULL,data_ptr,0,options,NULL)
#define getPyArrayType() &PyArray_Type
#define call_PyArray_DescrFromType(typenum) PyArray_DescrFromType(typenum)
+ #define call_PyArray_MinScalarType(py_arr) PyArray_MinScalarType(py_arr)
#define call_PyArray_InitArrFuncs(funcs) PyArray_InitArrFuncs(funcs)
- #define call_PyArray_RegisterDataType(dtype) PyArray_RegisterDataType(dtype)
+ #define call_PyArray_RegisterDataType(dtype) PyArray_RegisterDataType(dtype)
+ #define call_PyArray_RegisterCanCast(descr,totype,scalar) PyArray_RegisterCanCast(descr,totype,scalar)
#endif
#endif // ifndef __eigenpy_numpy_hpp__
diff --git a/include/eigenpy/user-type.hpp b/include/eigenpy/user-type.hpp
index 20c12ca..27ac831 100644
--- a/include/eigenpy/user-type.hpp
+++ b/include/eigenpy/user-type.hpp
@@ -198,6 +198,9 @@ namespace eigenpy
copyswap, copyswapn,
dotfunc);
+ call_PyArray_RegisterCanCast(call_PyArray_DescrFromType(NPY_OBJECT),
+ code, NPY_NOSCALAR);
+
return code;
}
diff --git a/src/numpy.cpp b/src/numpy.cpp
index 10c3d7e..fc132c9 100644
--- a/src/numpy.cpp
+++ b/src/numpy.cpp
@@ -58,6 +58,16 @@ namespace eigenpy
{
return PyArray_RegisterDataType(dtype);
}
+
+ PyArray_Descr * call_PyArray_MinScalarType(PyArrayObject * arr)
+ {
+ return PyArray_MinScalarType(arr);
+ }
+
+ int call_PyArray_RegisterCanCast(PyArray_Descr *descr, int totype, NPY_SCALARKIND scalar)
+ {
+ return PyArray_RegisterCanCast(descr,totype,scalar);
+ }
#endif
}
--
GitLab