Thanks to visit codestin.com
Credit goes to github.com

Skip to content

MAINT: from_dlpack thread safety fixes (#28883) #28889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2025
Merged

MAINT: from_dlpack thread safety fixes (#28883) #28889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 4 additions & 27 deletions numpy/_core/src/multiarray/dlpack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,36 +504,12 @@ from_dlpack(PyObject *NPY_UNUSED(self),
return NULL;
}

/* Prepare the arguments to call objects __dlpack__() method */
static PyObject *call_kwnames = NULL;
static PyObject *dl_cpu_device_tuple = NULL;
static PyObject *max_version = NULL;

if (call_kwnames == NULL) {
call_kwnames = Py_BuildValue("(sss)", "dl_device", "copy", "max_version");
if (call_kwnames == NULL) {
return NULL;
}
}
if (dl_cpu_device_tuple == NULL) {
dl_cpu_device_tuple = Py_BuildValue("(i,i)", 1, 0);
if (dl_cpu_device_tuple == NULL) {
return NULL;
}
}
if (max_version == NULL) {
max_version = Py_BuildValue("(i,i)", 1, 0);
if (max_version == NULL) {
return NULL;
}
}

/*
* Prepare arguments for the full call. We always forward copy and pass
* our max_version. `device` is always passed as `None`, but if the user
* provided a device, we will replace it with the "cpu": (1, 0).
*/
PyObject *call_args[] = {obj, Py_None, copy, max_version};
PyObject *call_args[] = {obj, Py_None, copy, npy_static_pydata.dl_max_version};
Py_ssize_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;

/* If device is passed it must be "cpu" and replace it with (1, 0) */
Expand All @@ -544,12 +520,13 @@ from_dlpack(PyObject *NPY_UNUSED(self),
return NULL;
}
assert(device_request == NPY_DEVICE_CPU);
call_args[1] = dl_cpu_device_tuple;
call_args[1] = npy_static_pydata.dl_cpu_device_tuple;
}


PyObject *capsule = PyObject_VectorcallMethod(
npy_interned_str.__dlpack__, call_args, nargsf, call_kwnames);
npy_interned_str.__dlpack__, call_args, nargsf,
npy_static_pydata.dl_call_kwnames);
if (capsule == NULL) {
/*
* TODO: This path should be deprecated in NumPy 2.1. Once deprecated
Expand Down
16 changes: 16 additions & 0 deletions numpy/_core/src/multiarray/npy_static_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,22 @@ initialize_static_globals(void)
return -1;
}

npy_static_pydata.dl_call_kwnames =
Py_BuildValue("(sss)", "dl_device", "copy", "max_version");
if (npy_static_pydata.dl_call_kwnames == NULL) {
return -1;
}

npy_static_pydata.dl_cpu_device_tuple = Py_BuildValue("(i,i)", 1, 0);
if (npy_static_pydata.dl_cpu_device_tuple == NULL) {
return -1;
}

npy_static_pydata.dl_max_version = Py_BuildValue("(i,i)", 1, 0);
if (npy_static_pydata.dl_max_version == NULL) {
return -1;
}

/*
* Initialize contents of npy_static_cdata struct
*
Expand Down
7 changes: 7 additions & 0 deletions numpy/_core/src/multiarray/npy_static_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,13 @@ typedef struct npy_static_pydata_struct {
PyObject *GenericToVoidMethod;
PyObject *ObjectToGenericMethod;
PyObject *GenericToObjectMethod;

/*
* Used in from_dlpack
*/
PyObject *dl_call_kwnames;
PyObject *dl_cpu_device_tuple;
PyObject *dl_max_version;
} npy_static_pydata_struct;


Expand Down
Loading