Remove cudf._lib.json in favor of inlining pylibcudf (#17443)

Contributes to #17317 Authors: - Matthew Roeschke (https://github.com/mroeschke) Approvers: - Matthew Murray (https://github.com/Matt711) URL: #17443
rapidsai · Nov 28, 2024 · 9b88794 · 9b88794
1 parent 2be82fe
commit 9b88794
Show file tree

Hide file tree

Showing 7 changed files with 238 additions and 246 deletions.
diff --git a/python/cudf/cudf/_lib/CMakeLists.txt b/python/cudf/cudf/_lib/CMakeLists.txt
@@ -22,7 +22,6 @@ set(cython_sources
     filling.pyx
     groupby.pyx
     interop.pyx
-    json.pyx
     merge.pyx
     orc.pyx
     parquet.pyx

diff --git a/python/cudf/cudf/_lib/__init__.py b/python/cudf/cudf/_lib/__init__.py
@@ -9,7 +9,6 @@
     filling,
     groupby,
     interop,
-    json,
     merge,
     nvtext,
     orc,

diff --git a/python/cudf/cudf/_lib/json.pyx b/python/cudf/cudf/_lib/json.pyx
diff --git a/python/cudf/cudf/_lib/utils.pxd b/python/cudf/cudf/_lib/utils.pxd
@@ -19,4 +19,4 @@ cdef table_view table_view_from_table(tbl, ignore_index=*) except*
 cdef columns_from_unique_ptr(unique_ptr[table] c_tbl)
 cdef columns_from_table_view(table_view tv, object owners)
 cpdef columns_from_pylibcudf_table(tbl)
-cdef _data_from_columns(columns, column_names, index_names=*)
+cpdef _data_from_columns(columns, column_names, index_names=*)
diff --git a/python/cudf/cudf/_lib/utils.pyx b/python/cudf/cudf/_lib/utils.pyx
@@ -245,7 +245,7 @@ cpdef columns_from_pylibcudf_table(tbl):
     return [Column.from_pylibcudf(plc) for plc in tbl.columns()]
 
 
-cdef _data_from_columns(columns, column_names, index_names=None):
+cpdef _data_from_columns(columns, column_names, index_names=None):
     """Convert a list of columns into a dict with an index.
 
     This method is intended to provide the bridge between the columns returned
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
         filling,
         groupby,
         interop,
-        json,
         merge,
         nvtext,
         orc,
@@ Expand Down @@