Skip to content

Commit

Permalink
Merge branch 'branch-25.02' of github.com:nv-morpheus/Morpheus into d…
Browse files Browse the repository at this point in the history
…avid-arm-docker
  • Loading branch information
dagardner-nv committed Jan 16, 2025
2 parents ec14b09 + ac97e6d commit 6277a9a
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions python/morpheus/morpheus/_lib/cudf_helpers.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ from pylibcudf.libcudf.io.types cimport table_with_metadata
from pylibcudf.libcudf.table.table_view cimport table_view
from pylibcudf.libcudf.types cimport size_type

from cudf._lib.column cimport Column

##### THE FOLLOWING CODE IS COPIED FROM CUDF AND SHOULD BE REMOVED WHEN UPDATING TO cudf>=24.12 #####
# see https://github.com/rapidsai/cudf/pull/17193 for details

Expand Down Expand Up @@ -61,7 +59,7 @@ from cudf._lib.types cimport (
# dtype_to_pylibcudf_type,
)
from cudf._lib.null_mask import bitmask_allocation_size_bytes

from cudf._lib.column cimport Column
# isort: on

cdef get_element(column_view col_view, size_type index):
Expand Down Expand Up @@ -469,7 +467,7 @@ cdef public api:

return dict(zip(column_names, data_columns)), index

cdef _set_col_children_metadata(Column col,
cdef _set_col_children_metadata(col,
column_name_info& col_meta):
cdef column_name_info child_info
if isinstance(col.dtype, cudf.StructDtype):
Expand Down Expand Up @@ -500,8 +498,8 @@ cdef update_struct_field_names(
)


cdef Column update_column_struct_field_names(
Column col,
cdef update_column_struct_field_names(
col,
column_name_info& info
):
cdef vector[string] field_names
Expand Down

0 comments on commit 6277a9a

Please sign in to comment.