ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Bugfix for transferring malloc'ed data to a pyarray under windows with the capsule

Browse Source
This commit is contained in:
Anne de Jong 2021-06-03 21:35:04 +02:00
parent 32e5860352
commit 3f32176804
2 changed files with 64 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lasp/c/lasp_pyarray.h
View File

@ -22,13 +22,15 @@
* Function passed to Python to use for cleanup of
* foreignly obtained data.
**/
#define LASP_CAPSULE_NAME "pyarray_data_destructor"
static inline void capsule_cleanup(PyObject *capsule) {
void *memory = PyCapsule_GetPointer(capsule, NULL);
void *memory = PyCapsule_GetPointer(capsule, LASP_CAPSULE_NAME);
free(memory);
}
#endif
static inline PyObject *data_to_ndarray(void *data, int n_rows, int n_cols,
int typenum, bool transfer_ownership,
bool F_contiguous) {
@ -36,28 +38,41 @@ static inline PyObject *data_to_ndarray(void *data, int n_rows, int n_cols,
/* fprintf(stderr, "Enter data_to_ndarray\n"); */
assert(data);
import_array();
PyArray_Descr *descr = PyArray_DescrFromType(typenum);
if(!descr) return NULL;
npy_intp dims[2];
npy_intp dims[2] = {n_rows, n_cols};
npy_intp strides[2];
int flags = 0;
if(F_contiguous){
dims[0] = n_cols;
dims[1] = n_rows;
flags |= NPY_ARRAY_FARRAY;
strides[0] = descr->elsize;
strides[1] = descr->elsize*n_rows;
} else {
dims[0] = n_rows;
dims[1] = n_cols;
strides[0] = descr->elsize*n_rows;
strides[1] = descr->elsize;
}
/* assert(n_rows > 0); */
/* assert(n_cols > 0); */
PyArrayObject *arr =
(PyArrayObject *)PyArray_SimpleNewFromData(2, dims, typenum, data);
(PyArrayObject *)PyArray_NewFromDescr(
&PyArray_Type,
descr, // Description
2, // nd
dims, // dimensions
strides, // strides
data, // Data pointer
flags, // Flags
NULL // obj
);
if (!arr) {
fprintf(stderr, "arr = 0!");
return NULL;
}
if (F_contiguous) {
arr = (PyArrayObject*) PyArray_Transpose(arr, NULL);
}
if (transfer_ownership == true) {
#ifdef MS_WIN64
@ -67,7 +82,7 @@ static inline PyObject *data_to_ndarray(void *data, int n_rows, int n_cols,
// https://stackoverflow.com/questions/54269956/crash-of-jupyter-due-to-the-use-of-pyarray-enableflags/54278170#54278170
// Note that in general it was disadvised to build all C code with MinGW on
// Windows. We do it anyway, see if we find any problems on the way.
PyObject *capsule = PyCapsule_New(data, "data destructor", capsule_cleanup);
PyObject *capsule = PyCapsule_New(data, LASP_CAPSULE_NAME, capsule_cleanup);
int res = PyArray_SetBaseObject(arr, capsule);
if(res != 0) {
fprintf(stderr, "Failed to set base object of array!");
@ -82,5 +97,6 @@ static inline PyObject *data_to_ndarray(void *data, int n_rows, int n_cols,
return (PyObject *) arr;
}
#undef LASP_CAPSULE_NAME
#endif // LASP_PYARRAY_H
//////////////////////////////////////////////////////////////////////

2
lasp/c/lasp_python.h
View File

@ -13,7 +13,7 @@
/**
* Create a numpy array from an existing dmat.
*
* @param mat dmat struccture containing array data and metadata.
* @param mat dmat structure containing array data and metadata.
* @param transfer_ownership If set to true, Numpy array will be responsible
* for freeing the data.
*