Use pylibcudf instead of cudf._lib

Signed-off-by: Sebastian Berg <[email protected]>
rapidsai · Dec 3, 2024 · ce6dc46 · ce6dc46
1 parent 0cd65f8
commit ce6dc46
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 15 deletions.
diff --git a/conda/environments/all_cuda-124_arch-x86_64.yaml b/conda/environments/all_cuda-124_arch-x86_64.yaml
@@ -34,6 +34,7 @@ dependencies:
 - numpy >=1.23,<3.0.0a0
 - openssh
 - pydata-sphinx-theme>=0.16.0
+- pylibcudf==24.10.*,>=0.0.0a0
 - pytest>=7.0
 - python>=3.10,<3.13
 - rapids-build-backend>=0.3.0,<0.4.0.dev0

diff --git a/conda/recipes/legate-dataframe/meta.yaml b/conda/recipes/legate-dataframe/meta.yaml
@@ -68,6 +68,7 @@ requirements:
     - cudf {{ rapids_version }}  # pulls in pyarrow?
     - libcudf {{ rapids_version }}
     - librmm {{ rapids_version }}
+    - pylibcudf {{ rapids_version }}
   run:
     - python
     # cuda-version is used to constrain __cuda

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -188,6 +188,7 @@ dependencies:
       - output_types: conda
         packages:
           - &cudf_unsuffixed cudf==24.10.*,>=0.0.0a0
+          - &pylibcudf_unsuffixed pylibcudf==24.10.*,>=0.0.0a0
     specific:
       - output_types: [requirements, pyproject]
         matrices:
@@ -196,6 +197,7 @@ dependencies:
               cuda_suffixed: "true"
             packages:
               - cudf-cu12==24.10.*,>=0.0.0a0
+              - pylibcudf-cu12==24.10.*,>=0.0.0a0
           - {matrix: null, packages: [*cudf_unsuffixed]}
 
   depends_on_cupy:

diff --git a/python/legate_dataframe/lib/binaryop.pyx b/python/legate_dataframe/lib/binaryop.pyx
@@ -6,7 +6,7 @@
 
 from libc.stdint cimport int32_t
 
-from cudf._lib.pylibcudf.types cimport data_type
+from pylibcudf.types cimport data_type
 
 from legate_dataframe.lib.core.column cimport LogicalColumn, cpp_LogicalColumn
 from legate_dataframe.lib.core.data_type cimport as_data_type

diff --git a/python/legate_dataframe/lib/core/column.pxd b/python/legate_dataframe/lib/core/column.pxd
@@ -8,8 +8,8 @@ from libcpp cimport bool
 from libcpp.memory cimport unique_ptr
 from libcpp.string cimport string
 
-from cudf._lib.pylibcudf.libcudf.column.column cimport column, column_view
-from cudf._lib.pylibcudf.types cimport data_type
+from pylibcudf.libcudf.column.column cimport column, column_view
+from pylibcudf.types cimport data_type
 
 from legate_dataframe.lib.core.legate_task cimport cpp_AutoTask
 from legate_dataframe.lib.core.logical_array cimport cpp_LogicalArray

diff --git a/python/legate_dataframe/lib/core/column.pyx b/python/legate_dataframe/lib/core/column.pyx
@@ -11,7 +11,7 @@ from libcpp.string cimport string
 from libcpp.utility cimport move
 
 from cudf._lib.column cimport Column as cudfColumn
-from cudf._lib.pylibcudf.libcudf.column.column cimport column
+from pylibcudf.libcudf.column.column cimport column
 
 from legate_dataframe.lib.core.legate_task cimport get_auto_task_handle
 from legate_dataframe.lib.core.logical_array cimport cpp_LogicalArray

diff --git a/python/legate_dataframe/lib/core/data_type.pxd b/python/legate_dataframe/lib/core/data_type.pxd
@@ -4,7 +4,7 @@
 # distutils: language = c++
 # cython: language_level=3
 
-from cudf._lib.pylibcudf.types cimport data_type as cpp_cudf_type
+from pylibcudf.types cimport data_type as cpp_cudf_type
 
 
 cdef cpp_cudf_type as_data_type(data_type_like)

diff --git a/python/legate_dataframe/lib/core/data_type.pyx b/python/legate_dataframe/lib/core/data_type.pyx
@@ -5,9 +5,9 @@
 # cython: language_level=3
 
 
-from cudf._lib.pylibcudf.types cimport DataType
-from cudf._lib.pylibcudf.types cimport data_type as cpp_cudf_type
 from cudf._lib.types cimport underlying_type_t_type_id
+from pylibcudf.types cimport DataType
+from pylibcudf.types cimport data_type as cpp_cudf_type
 
 import cudf
 from cudf._lib import pylibcudf

diff --git a/python/legate_dataframe/lib/core/scalar.pxd b/python/legate_dataframe/lib/core/scalar.pxd
@@ -7,7 +7,7 @@
 from libcpp cimport bool
 from libcpp.memory cimport unique_ptr
 
-from cudf._lib.pylibcudf.libcudf.scalar.scalar cimport scalar as cudf_cpp_scalar
+from pylibcudf.libcudf.scalar.scalar cimport scalar as cudf_cpp_scalar
 
 
 cdef extern from "legate.h" nogil:

diff --git a/python/legate_dataframe/lib/groupby_aggregation.pyx b/python/legate_dataframe/lib/groupby_aggregation.pyx
@@ -8,13 +8,13 @@
 from libcpp.string cimport string
 from libcpp.vector cimport vector
 
-from cudf._lib.pylibcudf.aggregation cimport aggregation as cudf_agg
+from pylibcudf.aggregation cimport aggregation as cudf_agg
 
 from legate_dataframe.lib.core.table cimport LogicalTable, cpp_LogicalTable
 
 from typing import Iterable, Tuple
 
-from cudf._lib.pylibcudf.libcudf.aggregation import Kind as AggregationKind
+from pylibcudf.libcudf.aggregation import Kind as AggregationKind
 
 from legate_dataframe.utils import _track_provenance
 

diff --git a/python/legate_dataframe/lib/timestamps.pyx b/python/legate_dataframe/lib/timestamps.pyx
@@ -8,7 +8,7 @@
 from libc.stdint cimport int32_t
 from libcpp.string cimport string
 
-from cudf._lib.pylibcudf.types cimport data_type
+from pylibcudf.types cimport data_type
 
 from legate_dataframe.lib.core.column cimport LogicalColumn, cpp_LogicalColumn
 from legate_dataframe.lib.core.data_type cimport as_data_type

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -59,7 +59,7 @@ requires = [
 
 [tool.scikit-build.metadata.version]
 provider = "scikit_build_core.metadata.regex"
-input = "VERSION"
+input = "../VERSION"
 regex = "(?P<value>.*)"
 
 [tool.scikit-build]

diff --git a/python/tests/test_tasks.py b/python/tests/test_tasks.py
@@ -15,8 +15,8 @@
 import cudf
 import cupy
 import legate.core.types as lg_type
-from cudf._lib.pylibcudf.unary import UnaryOperator
 from legate.core import get_legate_runtime
+from pylibcudf.unary import UnaryOperator
 
 from legate_dataframe import LogicalColumn
 from legate_dataframe.lib.unaryop import unary_operation

diff --git a/python/tests/test_timestamps.py b/python/tests/test_timestamps.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import cudf
-import cudf._lib.binaryop
 import pytest
 
 from legate_dataframe import LogicalColumn

diff --git a/python/tests/test_unaryop.py b/python/tests/test_unaryop.py
@@ -15,7 +15,7 @@
 import cudf
 import cupy
 import pytest
-from cudf._lib.pylibcudf.unary import UnaryOperator
+from pylibcudf.unary import UnaryOperator
 
 from legate_dataframe import LogicalColumn
 from legate_dataframe.lib.unaryop import unary_operation