diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 37d999cb1d..1a45c575c6 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -83,6 +83,7 @@ dependencies: - pre-commit - pybind11-stubgen=0.10.5 - pydantic +- pylibcudf=24.10 - pylint=3.0.3 - pypdf=3.17.4 - pypdfium2=4.30 diff --git a/conda/environments/dev_cuda-125_arch-x86_64.yaml b/conda/environments/dev_cuda-125_arch-x86_64.yaml index 563f1c9814..47e717f3f0 100644 --- a/conda/environments/dev_cuda-125_arch-x86_64.yaml +++ b/conda/environments/dev_cuda-125_arch-x86_64.yaml @@ -68,6 +68,7 @@ dependencies: - pre-commit - pybind11-stubgen=0.10.5 - pydantic +- pylibcudf=24.10 - pylint=3.0.3 - pypdfium2=4.30 - pytest-asyncio diff --git a/dependencies.yaml b/dependencies.yaml index 4806a6558f..7242c9ea5f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -261,6 +261,7 @@ dependencies: - mrc=24.10 - nlohmann_json=3.11 - pybind11-stubgen=0.10.5 + - pylibcudf=24.10 - rapidjson=1.1.0 - rdma-core>=48 # Needed for DOCA. - scikit-build=0.17.6 diff --git a/python/morpheus/morpheus/_lib/cudf_helpers.pyx b/python/morpheus/morpheus/_lib/cudf_helpers.pyx index 67b6e0cf53..6612f990e4 100644 --- a/python/morpheus/morpheus/_lib/cudf_helpers.pyx +++ b/python/morpheus/morpheus/_lib/cudf_helpers.pyx @@ -21,11 +21,11 @@ from libcpp.utility cimport move from libcpp.vector cimport vector from cudf._lib.column cimport Column -from cudf._lib.pylibcudf.libcudf.io.types cimport column_name_info -from cudf._lib.pylibcudf.libcudf.io.types cimport table_metadata -from cudf._lib.pylibcudf.libcudf.io.types cimport table_with_metadata -from cudf._lib.pylibcudf.libcudf.table.table_view cimport table_view -from cudf._lib.pylibcudf.libcudf.types cimport size_type +from pylibcudf.libcudf.io.types cimport column_name_info +from pylibcudf.libcudf.io.types cimport table_metadata +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.utils cimport data_from_unique_ptr from cudf._lib.utils cimport table_view_from_table diff --git a/python/morpheus/morpheus/parsers/ip.py b/python/morpheus/morpheus/parsers/ip.py index 814d46f9dd..706e1fe959 100644 --- a/python/morpheus/morpheus/parsers/ip.py +++ b/python/morpheus/morpheus/parsers/ip.py @@ -41,7 +41,7 @@ def ip_to_int(values): 1 167772161 dtype: int64 """ - return cudf.Series(values.str.ip2int()) + return values.str.ip2int() def int_to_ip(values): @@ -68,7 +68,7 @@ def int_to_ip(values): 1 10.0.0.1 dtype: object """ - return cudf.Series(values._column.int2ip()) + return cudf.Series._from_column(values._column.int2ip()) def is_ip(ips: str): diff --git a/tests/test_ip.py b/tests/test_ip.py index a8875939b1..a4d21293fb 100644 --- a/tests/test_ip.py +++ b/tests/test_ip.py @@ -19,13 +19,14 @@ def test_ip_to_int(): input_df = cudf.Series(["5.79.97.178", "94.130.74.45"]) - expected = cudf.Series([89088434, 1585596973]) + expected = cudf.Series([89088434, 1585596973], dtype=cudf.api.types.dtype("uint32")) actual = ip.ip_to_int(input_df) + assert cudf.Series([89088434,1585596973],dtype=cudf.api.types.dtype("uint32")).equals(cudf.Series([89088434,1585596973],dtype=cudf.api.types.dtype("uint32"))) assert actual.equals(expected) def test_int_to_ip(): - input_df = cudf.Series([89088434, 1585596973]) + input_df = cudf.Series([89088434, 1585596973], dtype=cudf.api.types.dtype("uint32")) expected = cudf.Series(["5.79.97.178", "94.130.74.45"]) actual = ip.int_to_ip(input_df) assert actual.equals(expected)