Skip to content
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

Jump to bottom

PythonExtensionGen: ~PyHalideBuffer should call device_free() (#8399) #8439

Merged
merged 3 commits into from
Oct 21, 2024
Merged

PythonExtensionGen: ~PyHalideBuffer should call device_free() (#8399) #8439

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdf0f8f
PythonExtensionGen: ~PyHalideBuffer should call device_free() (#8399)
steven-johnson Oct 16, 2024
c1efcee
Merge remote-tracking branch 'origin/main' into srj/pybuffer
abadams Oct 18, 2024
80ced4d
Merge branch 'main' into srj/pybuffer
steven-johnson Oct 19, 2024
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
16 changes: 13 additions & 3 deletions src/PythonExtensionGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,10 @@ bool unpack_buffer(PyObject *py_obj,
Py_buffer &py_buf,
halide_dimension_t *halide_dim,
halide_buffer_t &halide_buf,
bool &py_buf_valid) {
bool &py_buf_valid,
bool &needs_device_free) {
py_buf_valid = false;
needs_device_free = false;

memset(&py_buf, 0, sizeof(py_buf));
if (PyObject_GetBuffer(py_obj, &py_buf, PyBUF_FORMAT | PyBUF_STRIDED_RO | PyBUF_ANY_CONTIGUOUS | py_getbuffer_flags) < 0) {
Expand Down Expand Up @@ -213,6 +215,7 @@ bool unpack_buffer(PyObject *py_obj,
}

memset(&halide_buf, 0, sizeof(halide_buf));
needs_device_free = true;
if (!py_buf.format) {
halide_buf.type.code = halide_type_uint;
halide_buf.type.bits = 8;
Expand Down Expand Up @@ -306,7 +309,8 @@ extern bool unpack_buffer(PyObject *py_obj,
Py_buffer &py_buf,
halide_dimension_t *halide_dim,
halide_buffer_t &halide_buf,
bool &py_buf_valid);
bool &py_buf_valid,
bool &needs_device_free);
} // namespace Halide::PythonRuntime

namespace {
Expand All @@ -320,12 +324,18 @@ struct PyHalideBuffer {
halide_dimension_t halide_dim[dims_to_allocate];
halide_buffer_t halide_buf;
bool py_buf_needs_release = false;
bool needs_device_free = false;

bool unpack(PyObject *py_obj, int py_getbuffer_flags, const char *name) {
return Halide::PythonRuntime::unpack_buffer(py_obj, py_getbuffer_flags, name, dimensions, py_buf, halide_dim, halide_buf, py_buf_needs_release);
return Halide::PythonRuntime::unpack_buffer(py_obj, py_getbuffer_flags,
name, dimensions, py_buf, halide_dim, halide_buf, py_buf_needs_release,
needs_device_free);
}

~PyHalideBuffer() {
if (needs_device_free) {
halide_device_free(nullptr, &halide_buf);
}
if (py_buf_needs_release) {
PyBuffer_Release(&py_buf);
}
Expand Down
Loading