+
+
+
+
+
+
+
+  |
+
+
+
+ $projectname
+ $projectnumber
+
+ $projectbrief
+ |
+
+
+
+
+ $projectbrief
+ |
+
+
+
+
+ $searchbox |
+
+
+
+
+
+
+
+
diff --git a/cpp/include/cudf/column/column.hpp b/cpp/include/cudf/column/column.hpp
index ac3824dfc21..c5f6d339ae9 100644
--- a/cpp/include/cudf/column/column.hpp
+++ b/cpp/include/cudf/column/column.hpp
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
@@ -75,6 +76,33 @@ class column {
*/
column(column&& other) noexcept;
+ /**
+ * @brief Construct a new column by taking ownership of the contents of a device_uvector.
+ *
+ * @param other The device_uvector whose contents will be moved into the new column.
+ * @param null_mask Optional, column's null value indicator bitmask. May
+ * be empty if `null_count` is 0 or `UNKNOWN_NULL_COUNT`.
+ * @param null_count Optional, the count of null elements. If unknown, specify
+ * `UNKNOWN_NULL_COUNT` to indicate that the null count should be computed on
+ * the first invocation of `null_count()`.
+ */
+ template () or cudf::is_chrono())>
+ column(rmm::device_uvector&& other,
+ rmm::device_buffer&& null_mask = {},
+ size_type null_count = UNKNOWN_NULL_COUNT)
+ : _type{cudf::data_type{cudf::type_to_id()}},
+ _size{[&]() {
+ CUDF_EXPECTS(
+ other.size() <= static_cast(std::numeric_limits::max()),
+ "The device_uvector size exceeds the maximum size_type.");
+ return static_cast(other.size());
+ }()},
+ _data{other.release()},
+ _null_mask{std::move(null_mask)},
+ _null_count{null_count}
+ {
+ }
+
/**
* @brief Construct a new column from existing device memory.
*
diff --git a/cpp/include/cudf/detail/structs/utilities.hpp b/cpp/include/cudf/detail/structs/utilities.hpp
index 7d8ac5c9325..1a4b8f02dd3 100644
--- a/cpp/include/cudf/detail/structs/utilities.hpp
+++ b/cpp/include/cudf/detail/structs/utilities.hpp
@@ -151,35 +151,6 @@ flattened_table flatten_nested_columns(
std::vector const& null_precedence,
column_nullability nullability = column_nullability::MATCH_INCOMING);
-/**
- * @brief Unflatten columns flattened as by `flatten_nested_columns()`,
- * based on the provided `blueprint`.
- *
- * cudf::flatten_nested_columns() executes depth first, and serializes the struct null vector
- * before the child/member columns.
- * E.g. STRUCT_1< STRUCT_2< A, B >, C > is flattened to:
- * 1. Null Vector for STRUCT_1
- * 2. Null Vector for STRUCT_2
- * 3. Member STRUCT_2::A
- * 4. Member STRUCT_2::B
- * 5. Member STRUCT_1::C
- *
- * `unflatten_nested_columns()` reconstructs nested columns from flattened input that follows
- * the convention above.
- *
- * Note: This function requires a null-mask vector for each STRUCT column, including for nested
- * STRUCT members.
- *
- * @param flattened "Flattened" `table` of input columns, following the conventions in
- * `flatten_nested_columns()`.
- * @param blueprint The exemplar `table_view` with nested columns intact, whose structure defines
- * the nesting of the reconstructed output table.
- * @return std::unique_ptr Unflattened table (with nested STRUCT columns) reconstructed
- * based on `blueprint`.
- */
-std::unique_ptr unflatten_nested_columns(std::unique_ptr&& flattened,
- table_view const& blueprint);
-
/**
* @brief Push down nulls from a parent mask into a child column, using bitwise AND.
*
diff --git a/cpp/include/cudf/detail/utilities/device_atomics.cuh b/cpp/include/cudf/detail/utilities/device_atomics.cuh
index f985135064f..0521418d2d3 100644
--- a/cpp/include/cudf/detail/utilities/device_atomics.cuh
+++ b/cpp/include/cudf/detail/utilities/device_atomics.cuh
@@ -116,18 +116,17 @@ struct genericAtomicOperationImpl {
using T_int = unsigned int;
T old_value = *addr;
- T assumed{old_value};
+ T_int assumed;
+ T_int ret;
do {
- assumed = old_value;
- const T new_value = op(old_value, update_value);
+ T_int const new_value = type_reinterpret(op(old_value, update_value));
- T_int ret = atomicCAS(reinterpret_cast(addr),
- type_reinterpret(assumed),
- type_reinterpret(new_value));
+ assumed = type_reinterpret(old_value);
+ ret = atomicCAS(reinterpret_cast(addr), assumed, new_value);
old_value = type_reinterpret(ret);
- } while (assumed != old_value);
+ } while (assumed != ret);
return old_value;
}
@@ -142,18 +141,17 @@ struct genericAtomicOperationImpl {
static_assert(sizeof(T) == sizeof(T_int));
T old_value = *addr;
- T assumed{old_value};
+ T_int assumed;
+ T_int ret;
do {
- assumed = old_value;
- const T new_value = op(old_value, update_value);
+ T_int const new_value = type_reinterpret(op(old_value, update_value));
- T_int ret = atomicCAS(reinterpret_cast(addr),
- type_reinterpret(assumed),
- type_reinterpret(new_value));
+ assumed = type_reinterpret(old_value);
+ ret = atomicCAS(reinterpret_cast(addr), assumed, new_value);
old_value = type_reinterpret(ret);
- } while (assumed != old_value);
+ } while (assumed != ret);
return old_value;
}
diff --git a/cpp/include/cudf/io/orc.hpp b/cpp/include/cudf/io/orc.hpp
index 30acf80548b..7f3cb95e4b2 100644
--- a/cpp/include/cudf/io/orc.hpp
+++ b/cpp/include/cudf/io/orc.hpp
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include
#include
@@ -51,8 +52,8 @@ class orc_reader_options_builder;
class orc_reader_options {
source_info _source;
- // Names of column to read; empty is all
- std::vector _columns;
+ // Names of column to read; `nullopt` is all
+ std::optional> _columns;
// List of individual stripes to read (ignored if empty)
std::vector> _stripes;
@@ -105,18 +106,18 @@ class orc_reader_options {
[[nodiscard]] source_info const& get_source() const { return _source; }
/**
- * @brief Returns names of the columns to read.
+ * @brief Returns names of the columns to read, if set.
*
- * @return Names of the columns to read
+ * @return Names of the columns to read; `nullopt` if the option is not set
*/
- [[nodiscard]] std::vector const& get_columns() const { return _columns; }
+ [[nodiscard]] auto const& get_columns() const { return _columns; }
/**
* @brief Returns vector of vectors, stripes to read for each input source
*
* @return Vector of vectors, stripes to read for each input source
*/
- std::vector> const& get_stripes() const { return _stripes; }
+ [[nodiscard]] auto const& get_stripes() const { return _stripes; }
/**
* @brief Returns number of rows to skip from the start.
diff --git a/cpp/include/cudf/io/parquet.hpp b/cpp/include/cudf/io/parquet.hpp
index 10368f84824..19156e01c1e 100644
--- a/cpp/include/cudf/io/parquet.hpp
+++ b/cpp/include/cudf/io/parquet.hpp
@@ -51,7 +51,7 @@ class parquet_reader_options_builder;
class parquet_reader_options {
source_info _source;
- // Path in schema of column to read; empty is all
+ // Path in schema of column to read; `nullopt` is all
std::optional> _columns;
// List of individual row groups to read (ignored if empty)
@@ -152,17 +152,14 @@ class parquet_reader_options {
*
* @return Names of column to be read; `nullopt` if the option is not set
*/
- [[nodiscard]] std::optional> const& get_columns() const
- {
- return _columns;
- }
+ [[nodiscard]] auto const& get_columns() const { return _columns; }
/**
* @brief Returns list of individual row groups to be read.
*
* @return List of individual row groups to be read
*/
- std::vector> const& get_row_groups() const { return _row_groups; }
+ [[nodiscard]] auto const& get_row_groups() const { return _row_groups; }
/**
* @brief Returns timestamp type used to cast timestamp columns.
diff --git a/cpp/include/cudf/io/types.hpp b/cpp/include/cudf/io/types.hpp
index 6504e790677..c31176ab51c 100644
--- a/cpp/include/cudf/io/types.hpp
+++ b/cpp/include/cudf/io/types.hpp
@@ -23,11 +23,11 @@
#include
-#include
-
#include