address comments and revert accidental change

python/cudf/cudf/_lib/quantiles.pyx

@@ -3,76 +3,43 @@
 from cudf.core.buffer import acquire_spill_lock
 
 from libcpp cimport bool
-from libcpp.memory cimport unique_ptr
-from libcpp.utility cimport move
 from libcpp.vector cimport vector
 
 from cudf._lib.column cimport Column
 from cudf._lib.types cimport (
     underlying_type_t_interpolation,
-    underlying_type_t_null_order,
-    underlying_type_t_order,
     underlying_type_t_sorted,
 )
 
 from cudf._lib.types import Interpolation
 
-from cudf._lib.pylibcudf.libcudf.column.column cimport column
-from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
-from cudf._lib.pylibcudf.libcudf.quantiles cimport (
-    quantile as cpp_quantile,
-    quantiles as cpp_quantile_table,
-)
-from cudf._lib.pylibcudf.libcudf.table.table cimport table
-from cudf._lib.pylibcudf.libcudf.table.table_view cimport table_view
-from cudf._lib.pylibcudf.libcudf.types cimport (
-    interpolation,
-    null_order,
-    order,
-    sorted,
-)
-from cudf._lib.utils cimport columns_from_unique_ptr, table_view_from_columns
+from cudf._lib.pylibcudf.libcudf.types cimport interpolation, sorted
+from cudf._lib.utils cimport columns_from_pylibcudf_table
+
+import cudf._lib.pylibcudf as plc
 
 
 @acquire_spill_lock()
 def quantile(
     Column input,
-    object q,
+    vector[double] q,
     str interp,
     Column ordered_indices,
     bool exact,
-
 ):
-    cdef column_view c_input = input.view()
-    cdef column_view c_ordered_indices = (
-        column_view() if ordered_indices is None
-        else ordered_indices.view()
-    )
     cdef interpolation c_interp = <interpolation>(
         <underlying_type_t_interpolation> Interpolation[interp.upper()]
     )
-    cdef bool c_exact = exact
-
-    cdef vector[double] c_q
-    c_q.reserve(len(q))
-
-    for value in q:
-        c_q.push_back(value)
 
-    cdef unique_ptr[column] c_result
-
-    with nogil:
-        c_result = move(
-            cpp_quantile(
-                c_input,
-                c_q,
-                c_interp,
-                c_ordered_indices,
-                c_exact,
-            )
+    return Column.from_pylibcudf(
+        plc.quantiles.quantile(
+            input.to_pylibcudf(mode="read"),
+            q,
+            c_interp,
+            ordered_indices.to_pylibcudf(mode="read"),
+            <bool>exact
         )
-
-    return Column.from_unique_ptr(move(c_result))
+    )
 
 
 def quantile_table(
@@ -83,42 +50,23 @@ def quantile_table(
     list column_order,
     list null_precedence,
 ):
-    cdef table_view c_input = table_view_from_columns(source_columns)
-    cdef vector[double] c_q = q
+
     cdef interpolation c_interp = <interpolation>(
         <underlying_type_t_interpolation> interp
     )
     cdef sorted c_is_input_sorted = <sorted>(
         <underlying_type_t_sorted> is_input_sorted
     )
-    cdef vector[order] c_column_order
-    cdef vector[null_order] c_null_precedence
-
-    c_column_order.reserve(len(column_order))
-    c_null_precedence.reserve(len(null_precedence))
-
-    for value in column_order:
-        c_column_order.push_back(
-            <order>(<underlying_type_t_order> value)
-        )
 
-    for value in null_precedence:
-        c_null_precedence.push_back(
-            <null_order>(<underlying_type_t_null_order> value)
+    return columns_from_pylibcudf_table(
+        plc.quantiles.quantiles(
+            plc.Table([
+                c.to_pylibcudf(mode="read") for c in source_columns
+            ]),
+            q,
+            c_interp,
+            c_is_input_sorted,
+            column_order,
+            null_precedence
         )
-
-    cdef unique_ptr[table] c_result
-
-    with nogil:
-        c_result = move(
-            cpp_quantile_table(
-                c_input,
-                c_q,
-                c_interp,
-                c_is_input_sorted,
-                c_column_order,
-                c_null_precedence,
-            )
-        )
-
-    return columns_from_unique_ptr(move(c_result))
+    )