X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fpython%2Finclude%2Fnumpy_conv.h;h=67d04da321dbc24a9416c03ef8c82a39fc9cf26c;hb=60e4ed7e229b54c47f5847128df2ede11d42a60d;hp=b810832b051c99676de5f0c7308b31b538db651f;hpb=0b4b87044cdf92cf18f1cc2769e701df4a8025fc;p=alexxy%2Fgromacs.git diff --git a/src/python/include/numpy_conv.h b/src/python/include/numpy_conv.h index b810832b05..67d04da321 100644 --- a/src/python/include/numpy_conv.h +++ b/src/python/include/numpy_conv.h @@ -39,25 +39,28 @@ #include #include -PyObject* array2dToNumpy(int dim1, int dim2, const void *data) { +PyObject* array2dToNumpy(int dim1, int dim2, const void *data) +{ npy_intp dims[] = {dim1, dim2}; #ifdef GMX_DOUBLE - return PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, (double*) data); + return PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, (double*) data); #else - return PyArray_SimpleNewFromData(2, dims, NPY_FLOAT, (float*) data); + return PyArray_SimpleNewFromData(2, dims, NPY_FLOAT, (float*) data); #endif } -PyObject* array1dToNumpy(int dim, const void *data) { +PyObject* array1dToNumpy(int dim, const void *data) +{ npy_intp n_dim = dim; #ifdef GMX_DOUBLE - return PyArray_SimpleNewFromData(1, &n_dim, NPY_DOUBLE, (double*) data); + return PyArray_SimpleNewFromData(1, &n_dim, NPY_DOUBLE, (double*) data); #else - return PyArray_SimpleNewFromData(1, &n_dim, NPY_FLOAT, (float*) data); + return PyArray_SimpleNewFromData(1, &n_dim, NPY_FLOAT, (float*) data); #endif } -PyObject* iarray1dToNumpy(int dim, const int *data) { +PyObject* iarray1dToNumpy(int dim, const int *data) +{ npy_intp n_dim = dim; return PyArray_SimpleNewFromData(1, &n_dim, NPY_INT, (int*) data); }