From c5463e8134d80e72d03d01d0e2427f47404b1c0b Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Mon, 10 Nov 2014 13:59:44 +0000 Subject: DEP: replaced arr->nd with PyArray_NDIM in C code generation scripts --- numpy/f2py/cfuncs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'numpy/f2py/cfuncs.py') diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index 7fb630697..650be9b16 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -248,7 +248,7 @@ needs['len..']=['f2py_size'] cppmacros['len..']="""\ #define rank(var) var ## _Rank #define shape(var,dim) var ## _Dims[dim] -#define old_rank(var) (((PyArrayObject *)(capi_ ## var ## _tmp))->nd) +#define old_rank(var) (PyArray_NDIM((PyArrayObject *)(capi_ ## var ## _tmp))) #define old_shape(var,dim) (((PyArrayObject *)(capi_ ## var ## _tmp))->dimensions[dim]) #define fshape(var,dim) shape(var,rank(var)-dim-1) #define len(var) shape(var,0) @@ -536,15 +536,15 @@ cppmacros['OLDPYNUM']="""\ cfuncs['calcarrindex']="""\ static int calcarrindex(int *i,PyArrayObject *arr) { \tint k,ii = i[0]; -\tfor (k=1; k < arr->nd; k++) +\tfor (k=1; k < PyArray_NDIM(arr); k++) \t\tii += (ii*(arr->dimensions[k] - 1)+i[k]); /* assuming contiguous arr */ \treturn ii; }""" cfuncs['calcarrindextr']="""\ static int calcarrindextr(int *i,PyArrayObject *arr) { -\tint k,ii = i[arr->nd-1]; -\tfor (k=1; k < arr->nd; k++) -\t\tii += (ii*(arr->dimensions[arr->nd-k-1] - 1)+i[arr->nd-k-1]); /* assuming contiguous arr */ +\tint k,ii = i[PyArray_NDIM(arr)-1]; +\tfor (k=1; k < PyArray_NDIM(arr); k++) +\t\tii += (ii*(arr->dimensions[PyArray_NDIM(arr)-k-1] - 1)+i[PyArray_NDIM(arr)-k-1]); /* assuming contiguous arr */ \treturn ii; }""" cfuncs['forcomb']="""\ -- cgit v1.2.1