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.

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

Migrate lists/combine to pylibcudf #15928

Merged
merged 8 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
20 changes: 4 additions & 16 deletions python/cudf/cudf/_lib/lists.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.lists.combine cimport (
concatenate_list_elements as cpp_concatenate_list_elements,
concatenate_null_policy,
concatenate_rows as cpp_concatenate_rows,
)
from cudf._lib.pylibcudf.libcudf.lists.contains cimport (
contains,
Expand All @@ -32,7 +31,6 @@ from cudf._lib.pylibcudf.libcudf.lists.stream_compaction cimport (
distinct as cpp_distinct,
)
from cudf._lib.pylibcudf.libcudf.scalar.scalar cimport scalar
from cudf._lib.pylibcudf.libcudf.table.table_view cimport table_view
from cudf._lib.pylibcudf.libcudf.types cimport (
nan_equality,
null_equality,
Expand All @@ -41,10 +39,7 @@ from cudf._lib.pylibcudf.libcudf.types cimport (
size_type,
)
from cudf._lib.scalar cimport DeviceScalar
from cudf._lib.utils cimport (
columns_from_pylibcudf_table,
table_view_from_columns,
)
from cudf._lib.utils cimport columns_from_pylibcudf_table

from cudf._lib import pylibcudf

Expand Down Expand Up @@ -223,16 +218,9 @@ def index_of_column(Column col, Column search_keys):

@acquire_spill_lock()
def concatenate_rows(list source_columns):
cdef unique_ptr[column] c_result

cdef table_view c_table_view = table_view_from_columns(source_columns)

with nogil:
c_result = move(cpp_concatenate_rows(
c_table_view,
))

return Column.from_unique_ptr(move(c_result))
return pylibcudf.lists.concatenate_rows(
Matt711 marked this conversation as resolved.
Show resolved Hide resolved
pylibcudf.Table([c.to_pylibcudf(mode="read") for c in source_columns])
)


@acquire_spill_lock()
Expand Down
3 changes: 3 additions & 0 deletions python/cudf/cudf/_lib/pylibcudf/lists.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

from cudf._lib.pylibcudf.libcudf.types cimport size_type

from .column cimport Column
from .table cimport Table


cpdef Table explode_outer(Table, size_type explode_column_idx)

cpdef Column concatenate_rows(Table)
26 changes: 26 additions & 0 deletions python/cudf/cudf/_lib/pylibcudf/lists.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@
from libcpp.memory cimport unique_ptr
from libcpp.utility cimport move

from cudf._lib.pylibcudf.libcudf.column.column cimport column
from cudf._lib.pylibcudf.libcudf.lists cimport explode as cpp_explode
from cudf._lib.pylibcudf.libcudf.lists.combine cimport (
concatenate_rows as cpp_concatenate_rows,
)
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from cudf._lib.pylibcudf.libcudf.types cimport size_type

from .column cimport Column
from .table cimport Table


Expand All @@ -33,3 +38,24 @@ cpdef Table explode_outer(Table input, size_type explode_column_idx):
c_result = move(cpp_explode.explode_outer(input.view(), explode_column_idx))

return Table.from_libcudf(move(c_result))


cpdef Column concatenate_rows(Table input):
"""Row-wise concatenating multiple lists columns into a single lists column.
Matt711 marked this conversation as resolved.
Show resolved Hide resolved

Parameters
----------
input : Table
The input table

Returns
-------
Table
A new Column of concatenated rows
"""
cdef unique_ptr[column] c_result

with nogil:
c_result = move(cpp_concatenate_rows(input.view()))

return Column.from_libcudf(move(c_result))
19 changes: 19 additions & 0 deletions python/cudf/cudf/pylibcudf_tests/test_lists.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) 2024, NVIDIA CORPORATION.

import pyarrow as pa
from utils import assert_column_eq

from cudf._lib import pylibcudf as plc


def test_concatenate_rows():
test_data = [[[0, 1], [2], [5], [6, 7]], [[8], [9], [], [13, 14, 15]]]

arrow_tbl = pa.Table.from_arrays(test_data, names=["a", "b"])
plc_tbl = plc.interop.from_arrow(arrow_tbl)
Matt711 marked this conversation as resolved.
Show resolved Hide resolved

res = plc.lists.concatenate_rows(plc_tbl)

expect = pa.array([pair[0] + pair[1] for pair in zip(*test_data)])

assert_column_eq(res, expect)
Matt711 marked this conversation as resolved.
Show resolved Hide resolved
Loading