diff --git a/include/eigenpy/numpy-allocator.hpp b/include/eigenpy/numpy-allocator.hpp index c2c1ba798ab4f95879dbfbfa2e68aef14d7bcb86..4dd5f7e091dae4ac8bc5cda04309f0c9bbc3865f 100644 --- a/include/eigenpy/numpy-allocator.hpp +++ b/include/eigenpy/numpy-allocator.hpp @@ -141,7 +141,8 @@ struct numpy_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride> > { #if NPY_ABI_VERSION < 0x02000000 const int elsize = call_PyArray_DescrFromType(Scalar_type_code)->elsize; #else - const int elsize = PyDataType_ELSIZE(call_PyArray_DescrFromType(Scalar_type_code)); + const int elsize = + PyDataType_ELSIZE(call_PyArray_DescrFromType(Scalar_type_code)); #endif npy_intp strides[2] = {elsize * inner_stride, elsize * outer_stride}; @@ -211,7 +212,8 @@ struct numpy_allocator_impl_matrix< #if NPY_ABI_VERSION < 0x02000000 const int elsize = call_PyArray_DescrFromType(Scalar_type_code)->elsize; #else - const int elsize = PyDataType_ELSIZE(call_PyArray_DescrFromType(Scalar_type_code)); + const int elsize = + PyDataType_ELSIZE(call_PyArray_DescrFromType(Scalar_type_code)); #endif npy_intp strides[2] = {elsize * inner_stride, elsize * outer_stride}; diff --git a/include/eigenpy/numpy.hpp b/include/eigenpy/numpy.hpp index e1a4637f88a16a9c38f7be1269b6ac47af1441a1..3529ec257e1b5a5da2c62135d487c281c0b5ea36 100644 --- a/include/eigenpy/numpy.hpp +++ b/include/eigenpy/numpy.hpp @@ -17,7 +17,8 @@ #endif /* Allow compiling against NumPy 1.x and 2.x - see: https://github.com/numpy/numpy/blob/afea8fd66f6bdbde855f5aff0b4e73eb0213c646/doc/source/reference/c-api/array.rst#L1224 + see: + https://github.com/numpy/numpy/blob/afea8fd66f6bdbde855f5aff0b4e73eb0213c646/doc/source/reference/c-api/array.rst#L1224 */ #if NPY_ABI_VERSION < 0x02000000 #define PyArray_DescrProto PyArray_Descr @@ -27,18 +28,16 @@ #include <numpy/ufuncobject.h> #if NPY_ABI_VERSION < 0x02000000 - static inline PyArray_ArrFuncs * - PyDataType_GetArrFuncs(PyArray_Descr *descr) - { - return descr->f; - } +static inline PyArray_ArrFuncs* PyDataType_GetArrFuncs(PyArray_Descr* descr) { + return descr->f; +} #endif /* PEP 674 disallow using macros as l-values see : https://peps.python.org/pep-0674/ */ #if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE) -static inline void _Py_SET_TYPE(PyObject *o, PyTypeObject *type) { +static inline void _Py_SET_TYPE(PyObject* o, PyTypeObject* type) { Py_TYPE(o) = type; } #define Py_SET_TYPE(o, type) _Py_SET_TYPE((PyObject*)(o), type) diff --git a/include/eigenpy/user-type.hpp b/include/eigenpy/user-type.hpp index b7eb67be6df036fe1679bd98c48a6fef8093e167..bcca5554252f5222cbe2bb610c8469762bb5b5fd 100644 --- a/include/eigenpy/user-type.hpp +++ b/include/eigenpy/user-type.hpp @@ -171,7 +171,8 @@ struct SpecialMethods<T, NPY_USERDEF> { char* srcptr = static_cast<char*>(src); PyArrayObject* py_array = static_cast<PyArrayObject*>(array); - PyArray_CopySwapFunc* copyswap = PyDataType_GetArrFuncs(PyArray_DESCR(py_array))->copyswap; + PyArray_CopySwapFunc* copyswap = + PyDataType_GetArrFuncs(PyArray_DESCR(py_array))->copyswap; for (npy_intp i = 0; i < n; i++) { copyswap(dstptr, srcptr, swap, array); @@ -189,8 +190,8 @@ struct SpecialMethods<T, NPY_USERDEF> { return (npy_bool)(value != ZeroValue); } else { T tmp_value; - PyDataType_GetArrFuncs(PyArray_DESCR(py_array))->copyswap( - &tmp_value, ip, PyArray_ISBYTESWAPPED(py_array), array); + PyDataType_GetArrFuncs(PyArray_DESCR(py_array)) + ->copyswap(&tmp_value, ip, PyArray_ISBYTESWAPPED(py_array), array); return (npy_bool)(tmp_value != ZeroValue); } } diff --git a/src/numpy.cpp b/src/numpy.cpp index 3b1a831e9117b15586a0eb456557db45e408c845..e758ed02dff52c691c303705b0f6746de9198b2b 100644 --- a/src/numpy.cpp +++ b/src/numpy.cpp @@ -14,9 +14,10 @@ void import_numpy() { } int PyArray_TypeNum(PyTypeObject* type) { - PyArray_Descr * descr = PyArray_DescrFromTypeObject(reinterpret_cast<PyObject*>(type)); + PyArray_Descr* descr = + PyArray_DescrFromTypeObject(reinterpret_cast<PyObject*>(type)); if (descr == NULL) { - return NPY_NOTYPE; + return NPY_NOTYPE; } return descr->type_num; }