Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions mkl_random/src/numpy_multiiter_workaround.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@
* and `PyArray_MultiIter_DIMS`.
*/

#define WORKAROUND_NEEDED (defined(NPY_2_0_API_VERSION) && (NPY_API_VERSION >= NPY_2_0_API_VERSION))
#if (defined(NPY_2_0_API_VERSION) && (NPY_API_VERSION >= NPY_2_0_API_VERSION))
#define WORKAROUND_NEEDED
#endif

#if !WORKAROUND_NEEDED
#if !defined(WORKAROUND_NEEDED)
typedef struct {
PyObject_HEAD
int numiter;
Expand All @@ -58,23 +60,23 @@ typedef struct {
#endif

npy_intp workaround_PyArray_MultiIter_SIZE(PyArrayMultiIterObject *multi) {
#if WORKAROUND_NEEDED
#if defined(WORKAROUND_NEEDED)
return PyArray_MultiIter_SIZE(multi);
#else
return ((multi_iter_proxy_st *)(multi))->size;
#endif
}

int workaround_PyArray_MultiIter_NDIM(PyArrayMultiIterObject *multi) {
#if WORKAROUND_NEEDED
#if defined(WORKAROUND_NEEDED)
return PyArray_MultiIter_NDIM(multi);
#else
return ((multi_iter_proxy_st *)(multi))->nd;
#endif
}

npy_intp* workaround_PyArray_MultiIter_DIMS(PyArrayMultiIterObject *multi) {
#if WORKAROUND_NEEDED
#if defined(WORKAROUND_NEEDED)
return PyArray_MultiIter_DIMS(multi);
#else
return (((multi_iter_proxy_st *)(multi))->dimensions);
Expand Down