Skip to content

fix: memory leak in dal::homogen_table to ndarray conversion #2548

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

Closed
wants to merge 3 commits into from
Closed

fix: memory leak in dal::homogen_table to ndarray conversion #2548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef62480
Fix memory leak in dal::homogen_table to ndarray conversion
Vika-F Jun 13, 2025
4e97d6a
Fix a typo: NYMPY -> NUMPY
Vika-F Jun 13, 2025
f62cc07
Make conversion from array<byte_t> to array<T> more correctly
Vika-F Jun 13, 2025
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
42 changes: 27 additions & 15 deletions onedal/datatypes/numpy/data_conversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,15 +269,16 @@ dal::table convert_to_table(py::object inp_obj, py::object queue, bool recursed)
return res;
}

static void free_capsule(PyObject *cap) {
template <class T>
void free_capsule(PyObject *cap) {
// TODO: check safe cast
dal::base *stored_array = static_cast<dal::base *>(PyCapsule_GetPointer(cap, NULL));
dal::array<T> *stored_array = static_cast<dal::array<T> *>(PyCapsule_GetPointer(cap, NULL));
if (stored_array) {
delete stored_array;
}
}

template <int NpType, typename T = byte_t>
template <int NpType, typename T>
static PyObject *convert_to_numpy_impl(
const dal::array<T> &array,
std::int64_t row_count,
Expand All @@ -304,7 +305,7 @@ static PyObject *convert_to_numpy_impl(
throw std::invalid_argument("Conversion to numpy array failed");

void *opaque_value = static_cast<void *>(new dal::array<T>(host_array));
PyObject *cap = PyCapsule_New(opaque_value, NULL, free_capsule);
PyObject *cap = PyCapsule_New(opaque_value, NULL, free_capsule<T>);
PyArray_SetBaseObject(reinterpret_cast<PyArrayObject *>(obj), cap);
return obj;
}
Expand Down Expand Up @@ -420,18 +421,29 @@ PyObject *convert_to_pyobject(const dal::table &input) {
const auto &homogen_input = static_cast<const dal::homogen_table &>(input);
const dal::data_type dtype = homogen_input.get_metadata().get_data_type(0);

#define MAKE_NYMPY_FROM_HOMOGEN(NpType) \
{ \
auto bytes_array = dal::detail::get_original_data(homogen_input); \
res = convert_to_numpy_impl<NpType>(bytes_array, \
homogen_input.get_row_count(), \
homogen_input.get_column_count(), \
homogen_input.get_data_layout()); \
#define MAKE_NUMPY_FROM_HOMOGEN(NpType, T) \
{ \
auto bytes_array = dal::detail::get_original_data(homogen_input); \
dal::array<T> typed_array; \
if (bytes_array.has_mutable_data()) { \
typed_array.reset(bytes_array, \
reinterpret_cast<T *>(bytes_array.get_mutable_data()), \
bytes_array.get_count() / sizeof(T)); \
} \
else { \
typed_array.reset(bytes_array, \
reinterpret_cast<const T *>(bytes_array.get_data()), \
bytes_array.get_count() / sizeof(T)); \
} \
res = convert_to_numpy_impl<NpType, T>(typed_array, \
homogen_input.get_row_count(), \
homogen_input.get_column_count(), \
homogen_input.get_data_layout()); \
}
SET_CTYPE_NPY_FROM_DAL_TYPE(dtype,
MAKE_NYMPY_FROM_HOMOGEN,
throw std::invalid_argument("Unable to convert numpy object"));
#undef MAKE_NYMPY_FROM_HOMOGEN
SET_CTYPES_NPY_FROM_DAL_TYPE(dtype,
MAKE_NUMPY_FROM_HOMOGEN,
throw std::invalid_argument("Unable to convert numpy object"));
#undef MAKE_NUMPY_FROM_HOMOGEN
}
else if (input.get_kind() == csr_table_t::kind()) {
const auto &csr_input = static_cast<const csr_table_t &>(input);
Expand Down
4 changes: 2 additions & 2 deletions onedal/datatypes/table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ ONEDAL_PY_INIT_MODULE(table) {
return numpy::convert_to_table(obj, queue);
});

m.def("from_table", [](const dal::table& t) -> py::handle {
m.def("from_table", [](const dal::table& t) -> py::object {
auto* obj_ptr = numpy::convert_to_pyobject(t);
return obj_ptr;
return py::reinterpret_steal<py::object>(obj_ptr);
});
m.def("dlpack_memory_order", &dlpack::dlpack_memory_order);
py::enum_<DLDeviceType>(m, "DLDeviceType")
Expand Down
Loading