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

Avoid private cudf DeviceScalar in favor of using pylibcudf & pyarrow #2090

Open
wants to merge 1 commit into
base: branch-25.02
Choose a base branch
from
Open

Avoid private cudf DeviceScalar in favor of using pylibcudf & pyarrow #2090

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
33 changes: 10 additions & 23 deletions python/morpheus/morpheus/_lib/cudf_helpers.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,10 @@ from cudf._lib.column cimport Column

# isort: off

# imports needed for get_element, which is required by from_column_view_with_fix
cimport pylibcudf.libcudf.copying as cpp_copying
from pylibcudf.libcudf.column.column_view cimport column_view
from libcpp.memory cimport make_unique, unique_ptr
from pylibcudf.libcudf.scalar.scalar cimport scalar
from pylibcudf cimport Table as plc_Table
from cudf._lib.scalar cimport DeviceScalar

# imports needed for from_column_view_with_fix
import pylibcudf as plc
from pylibcudf cimport Column as plc_Column, Table as plc_Table
from pylibcudf.libcudf.column.column_view cimport column_view
import rmm
from libc.stdint cimport uintptr_t
from cudf.core.buffer import (
Expand All @@ -64,18 +59,6 @@ from cudf._lib.null_mask import bitmask_allocation_size_bytes

# isort: on

cdef get_element(column_view col_view, size_type index):

cdef unique_ptr[scalar] c_output
with nogil:
c_output = move(
cpp_copying.get_element(col_view, index)
)

return DeviceScalar.from_unique_ptr(
move(c_output), dtype=dtype_from_column_view(col_view)
)

cdef Column from_column_view_with_fix(column_view cv, object owner):
"""
Given a ``cudf::column_view``, constructs a ``cudf.Column`` from it,
Expand Down Expand Up @@ -118,9 +101,13 @@ cdef Column from_column_view_with_fix(column_view cv, object owner):
if offset_child_column.size() == 0:
base_nbytes = 0
else:
chars_size = get_element(
offset_child_column, offset_child_column.size()-1).value
base_nbytes = chars_size
offset_child_column_owner = owner.children[offsets_column_index]
plc_owner = offset_child_column_owner.to_pylibcudf(mode="read")
plc_offsets_col = plc_Column.from_column_view(
offset_child_column, plc_owner
)
plc_scalar = plc.copying.get_element(plc_offsets_col, offset_child_column.size()-1)
base_nbytes = plc.interop.to_arrow(plc_scalar).as_py()

if data_ptr:
if data_owner is None:
Expand Down
2 changes: 2 additions & 0 deletions python/morpheus/morpheus/_lib/cudf_helpers/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ from cudf.core.dtypes import StructDtype
import _cython_3_0_11
import cudf
import itertools
import pylibcudf
import rmm

__all__ = [
Expand All @@ -19,6 +20,7 @@ __all__ = [
"bitmask_allocation_size_bytes",
"cudf",
"itertools",
"plc",
"rmm"
]

Expand Down
Loading