Migrate column factories to pylibcudf

cpp/src/column/column_factories.cpp

@@ -65,7 +65,8 @@ std::size_t size_of(data_type element_type)
 std::unique_ptr<column> make_empty_column(data_type type)
 {
   CUDF_EXPECTS(type.id() == type_id::EMPTY || !cudf::is_nested(type),
-               "make_empty_column is invalid to call on nested types");
+               "make_empty_column is invalid to call on nested types",
+               cudf::data_type_error);
   return std::make_unique<column>(type, 0, rmm::device_buffer{}, rmm::device_buffer{}, 0);
 }
 
@@ -80,7 +81,7 @@ std::unique_ptr<column> make_numeric_column(data_type type,
                                             rmm::device_async_resource_ref mr)
 {
   CUDF_FUNC_RANGE();
-  CUDF_EXPECTS(is_numeric(type), "Invalid, non-numeric type.");
+  CUDF_EXPECTS(is_numeric(type), "Invalid, non-numeric type.", cudf::data_type_error);
   CUDF_EXPECTS(size >= 0, "Column size cannot be negative.");
 
   return std::make_unique<column>(
@@ -100,7 +101,7 @@ std::unique_ptr<column> make_fixed_point_column(data_type type,
                                                 rmm::device_async_resource_ref mr)
 {
   CUDF_FUNC_RANGE();
-  CUDF_EXPECTS(is_fixed_point(type), "Invalid, non-fixed_point type.");
+  CUDF_EXPECTS(is_fixed_point(type), "Invalid, non-fixed_point type.", cudf::data_type_error);
   CUDF_EXPECTS(size >= 0, "Column size cannot be negative.");
 
   return std::make_unique<column>(
@@ -120,7 +121,7 @@ std::unique_ptr<column> make_timestamp_column(data_type type,
                                               rmm::device_async_resource_ref mr)
 {
   CUDF_FUNC_RANGE();
-  CUDF_EXPECTS(is_timestamp(type), "Invalid, non-timestamp type.");
+  CUDF_EXPECTS(is_timestamp(type), "Invalid, non-timestamp type.", cudf::data_type_error);
   CUDF_EXPECTS(size >= 0, "Column size cannot be negative.");
 
   return std::make_unique<column>(
@@ -140,7 +141,7 @@ std::unique_ptr<column> make_duration_column(data_type type,
                                              rmm::device_async_resource_ref mr)
 {
   CUDF_FUNC_RANGE();
-  CUDF_EXPECTS(is_duration(type), "Invalid, non-duration type.");
+  CUDF_EXPECTS(is_duration(type), "Invalid, non-duration type.", cudf::data_type_error);
   CUDF_EXPECTS(size >= 0, "Column size cannot be negative.");
 
   return std::make_unique<column>(
@@ -160,7 +161,7 @@ std::unique_ptr<column> make_fixed_width_column(data_type type,
                                                 rmm::device_async_resource_ref mr)
 {
   CUDF_FUNC_RANGE();
-  CUDF_EXPECTS(is_fixed_width(type), "Invalid, non-fixed-width type.");
+  CUDF_EXPECTS(is_fixed_width(type), "Invalid, non-fixed-width type.", cudf::data_type_error);
 
   // clang-format off
   if      (is_timestamp  (type)) return make_timestamp_column  (type, size, state, stream, mr);

cpp/tests/column/factories_test.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2023, NVIDIA CORPORATION.
+ * Copyright (c) 2019-2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -163,7 +163,7 @@ TEST_P(NonNumericFactoryTest, NonNumericThrow)
     auto column = cudf::make_numeric_column(
       cudf::data_type{GetParam()}, this->size(), cudf::mask_state::UNALLOCATED);
   };
-  EXPECT_THROW(construct(), cudf::logic_error);
+  EXPECT_THROW(construct(), cudf::data_type_error);
 }
 
 INSTANTIATE_TEST_CASE_P(NonNumeric,
@@ -306,7 +306,7 @@ TEST_P(NonFixedWidthFactoryTest, NonFixedWidthThrow)
     auto column = cudf::make_fixed_width_column(
       cudf::data_type{GetParam()}, this->size(), cudf::mask_state::UNALLOCATED);
   };
-  EXPECT_THROW(construct(), cudf::logic_error);
+  EXPECT_THROW(construct(), cudf::data_type_error);
 }
 
 INSTANTIATE_TEST_CASE_P(NonFixedWidth,

docs/cudf/source/user_guide/api_docs/pylibcudf/column_factories.rst

@@ -0,0 +1,6 @@
+========
+column_factories
+========
+
+.. automodule:: cudf._lib.pylibcudf.column_factories
+   :members:

docs/cudf/source/user_guide/api_docs/pylibcudf/index.rst

@@ -11,6 +11,7 @@ This page provides API documentation for pylibcudf.
     aggregation
     binaryop
     column
+    column_factories
     concatenate
     copying
     filling

python/cudf/cudf/_lib/column.pyx

@@ -46,7 +46,6 @@ from cudf._lib.types import dtype_from_pylibcudf_column
 cimport cudf._lib.cpp.copying as cpp_copying
 cimport cudf._lib.cpp.types as libcudf_types
 cimport cudf._lib.cpp.unary as libcudf_unary
-from cudf._lib cimport pylibcudf
 from cudf._lib.cpp.column.column cimport column, column_contents
 from cudf._lib.cpp.column.column_factories cimport (
     make_column_from_scalar as cpp_make_column_from_scalar,
@@ -623,22 +622,17 @@ cdef class Column:
         pylibcudf.Column
             A new pylibcudf.Column referencing the same data.
         """
-        cdef libcudf_types.data_type new_dtype
         if col.type().id() == pylibcudf.TypeId.TIMESTAMP_DAYS:
             col = pylibcudf.unary.cast(
                 col, pylibcudf.DataType(pylibcudf.TypeId.TIMESTAMP_SECONDS)
             )
         elif col.type().id() == pylibcudf.TypeId.EMPTY:
-            new_dtype = libcudf_types.data_type(libcudf_types.type_id.INT8)
-            # TODO: This function call is what requires cimporting pylibcudf.
-            # We can remove the cimport once we can directly do
-            # pylibcudf.column_factories.make_numeric_column or equivalent.
-            col = pylibcudf.Column.from_libcudf(
-                move(
-                    make_numeric_column(
-                        new_dtype, col.size(), libcudf_types.mask_state.ALL_NULL
-                        )
-                    )
+            new_dtype = pylibcudf.DataType(pylibcudf.TypeId.INT8)
+
+            col = pylibcudf.column_factories.make_numeric_column(
+                new_dtype,
+                col.size(),
+                pylibcudf.column_factories.MaskState.ALL_NULL
             )
 
         dtype = dtype_from_pylibcudf_column(col)

python/cudf/cudf/_lib/cpp/column/column_factories.pxd

@@ -1,16 +1,83 @@
-# Copyright (c) 2020, NVIDIA CORPORATION.
+# Copyright (c) 2020-2024, NVIDIA CORPORATION.
 
 from libcpp.memory cimport unique_ptr
 
+from rmm._lib.device_buffer cimport device_buffer
+
 from cudf._lib.cpp.column.column cimport column
 from cudf._lib.cpp.scalar.scalar cimport scalar
-from cudf._lib.cpp.types cimport data_type, mask_state, size_type
+from cudf._lib.cpp.types cimport (
+    bitmask_type,
+    data_type,
+    mask_state,
+    size_type,
+    type_id,
+)
 
 
 cdef extern from "cudf/column/column_factories.hpp" namespace "cudf" nogil:
     cdef unique_ptr[column] make_numeric_column(data_type type,
                                                 size_type size,
                                                 mask_state state) except +
 
+    cdef unique_ptr[column] make_numeric_column(data_type type,
+                                                size_type size,
+                                                device_buffer mask,
+                                                size_type null_count) except +
+
+    cdef unique_ptr[column] make_fixed_point_column(
+        data_type type,
+        size_type size,
+        mask_state state) except +
+
+    cdef unique_ptr[column] make_fixed_point_column(
+        data_type type,
+        size_type size,
+        device_buffer mask,
+        size_type null_count) except +
+
+    cdef unique_ptr[column] make_timestamp_column(
+        data_type type,
+        size_type size,
+        mask_state state) except +
+
+    cdef unique_ptr[column] make_timestamp_column(
+        data_type type,
+        size_type size,
+        device_buffer mask,
+        size_type null_count) except +
+
+    cdef unique_ptr[column] make_duration_column(
+        data_type type,
+        size_type size,
+        mask_state state) except +
+
+    cdef unique_ptr[column] make_duration_column(
+        data_type type,
+        size_type size,
+        device_buffer mask,
+        size_type null_count) except +
+
+    cdef unique_ptr[column] make_fixed_width_column(
+        data_type type,
+        size_type size,
+        mask_state state) except +
+
+    cdef unique_ptr[column] make_fixed_width_column(
+        data_type type,
+        size_type size,
+        device_buffer mask,
+        size_type null_count) except +
+
     cdef unique_ptr[column] make_column_from_scalar (const scalar & s,
                                                      size_type size) except +
+
+    cdef unique_ptr[column] make_dictionary_from_scalar(const scalar & s,
+                                                        size_type size) except +
+
+    cdef unique_ptr[column] make_empty_column(type_id id) except +
+    cdef unique_ptr[column] make_empty_column(data_type type_) except +
+
+    cdef unique_ptr[column] make_dictionary_column(
+        unique_ptr[column] keys_column,
+        unique_ptr[column] indices_column) except +

python/cudf/cudf/_lib/cpp/types.pxd

@@ -97,3 +97,7 @@ cdef extern from "cudf/types.hpp" namespace "cudf" nogil:
         HIGHER
         MIDPOINT
         NEAREST
+
+cdef struct MaskAndNullCnt:
+    const bitmask_type* mask
+    size_type null_count

python/cudf/cudf/_lib/pylibcudf/CMakeLists.txt

@@ -16,6 +16,7 @@ set(cython_sources
     aggregation.pyx
     binaryop.pyx
     column.pyx
+    column_factories.pyx
     concatenate.pyx
     copying.pyx
     filling.pyx

python/cudf/cudf/_lib/pylibcudf/__init__.pxd

@@ -4,6 +4,7 @@
 from . cimport (
     aggregation,
     binaryop,
+    column_factories,
     concatenate,
     copying,
     filling,
@@ -38,6 +39,7 @@ __all__ = [
     "binaryop",
     "concatenate",
     "copying",
+    "column_factories",
     "filling",
     "gpumemoryview",
     "groupby",

python/cudf/cudf/_lib/pylibcudf/__init__.py

@@ -3,6 +3,7 @@
 from . import (
     aggregation,
     binaryop,
+    column_factories,
     concatenate,
     copying,
     filling,
@@ -37,6 +38,7 @@
     "binaryop",
     "concatenate",
     "copying",
+    "column_factories",
     "filling",
     "gpumemoryview",
     "groupby",

python/cudf/cudf/_lib/pylibcudf/column_factories.pxd

@@ -0,0 +1,58 @@
+# Copyright (c) 2024, NVIDIA CORPORATION.
+from libcpp.memory cimport unique_ptr
+from libcpp.utility cimport move
+
+from cudf._lib.cpp.types cimport (
+    MaskAndNullCnt,
+    bitmask_type,
+    mask_state,
+    size_type,
+)
+
+from .column cimport Column
+from .types cimport DataType, type_id
+
+ctypedef fused MakeEmptyColumnOperand:
+    DataType
+    type_id
+    object
+
+ctypedef fused MaskArg:
+    mask_state
+    tuple
+    object
+
+
+cpdef Column make_empty_column(
+    MakeEmptyColumnOperand type_or_id
+)
+
+cpdef Column make_numeric_column(
+    DataType type_,
+    size_type size,
+    MaskArg mstate,
+)
+
+cpdef Column make_fixed_point_column(
+    DataType type_,
+    size_type size,
+    MaskArg mstate,
+)
+
+cpdef Column make_timestamp_column(
+    DataType type_,
+    size_type size,
+    MaskArg mstate,
+)
+
+cpdef Column make_duration_column(
+    DataType type_,
+    size_type size,
+    MaskArg mstate,
+)
+
+cpdef Column make_fixed_width_column(
+    DataType type_,
+    size_type size,
+    MaskArg mstate,
+)