Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
eigenpy
Commits
c3e322eb
Verified
Commit
c3e322eb
authored
Apr 16, 2021
by
Justin Carpentier
Browse files
core: fix user declaration according to new NumPy API 1.20
parent
4879a795
Pipeline
#14071
passed with stage
in 9 minutes and 26 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
include/eigenpy/numpy.hpp
View file @
c3e322eb
...
...
@@ -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__
include/eigenpy/user-type.hpp
View file @
c3e322eb
...
...
@@ -198,6 +198,9 @@ namespace eigenpy
copyswap
,
copyswapn
,
dotfunc
);
call_PyArray_RegisterCanCast
(
call_PyArray_DescrFromType
(
NPY_OBJECT
),
code
,
NPY_NOSCALAR
);
return
code
;
}
...
...
src/numpy.cpp
View file @
c3e322eb
...
...
@@ -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
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment