Skip to content

Commit

Permalink
update to rapids 24.10
Browse files Browse the repository at this point in the history
  • Loading branch information
cwharris committed Aug 28, 2024
1 parent c2e2697 commit b8500b2
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
1 change: 1 addition & 0 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions conda/environments/dev_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions python/morpheus/morpheus/_lib/cudf_helpers.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions python/morpheus/morpheus/parsers/ip.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand Down
5 changes: 3 additions & 2 deletions tests/test_ip.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b8500b2

Please sign in to comment.