Temporarily undo changes to double check failure with CI

mroeschke · Jan 6, 2025 · e12895b · e12895b
1 parent ea9707e
commit e12895b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/python/morpheus/morpheus/_lib/cudf_helpers.pyx b/python/morpheus/morpheus/_lib/cudf_helpers.pyx
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,8 +40,8 @@ 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, Scalar as plc_Scalar
-import pylibcudf as plc
+from pylibcudf cimport Table as plc_Table
+from cudf._lib.scalar cimport DeviceScalar
 
 # imports needed for from_column_view_with_fix
 import rmm
@@ -72,9 +72,9 @@ cdef get_element(column_view col_view, size_type index):
             cpp_copying.get_element(col_view, index)
         )
 
-    plc_scalar = plc_Scalar.from_libcudf(move(c_output))
-    return plc.interop.to_arrow(plc_scalar).to_py()
-
+    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):
     """
@@ -119,7 +119,7 @@ cdef Column from_column_view_with_fix(column_view cv, object owner):
                 base_nbytes = 0
             else:
                 chars_size = get_element(
-                    offset_child_column, offset_child_column.size()-1)
+                    offset_child_column, offset_child_column.size()-1).value
                 base_nbytes = chars_size
 
     if data_ptr:

diff --git a/python/morpheus/morpheus/_lib/cudf_helpers/__init__.pyi b/python/morpheus/morpheus/_lib/cudf_helpers/__init__.pyi
@@ -8,7 +8,6 @@ from cudf.core.dtypes import StructDtype
 import _cython_3_0_11
 import cudf
 import itertools
-import pylibcudf
 import rmm
 
 __all__ = [
@@ -20,7 +19,6 @@ __all__ = [
     "bitmask_allocation_size_bytes",
     "cudf",
     "itertools",
-    "plc",
     "rmm"
 ]