Merge branch 'branch-24.10' of github.com:rapidsai/cudf into host-tre…

…e-algorithms

ci/release/update-version.sh

@@ -45,6 +45,8 @@ sed_runner "s/branch-.*/branch-${NEXT_SHORT_TAG}/g" ci/test_wheel_dask_cudf.sh
 DEPENDENCIES=(
   cudf
   cudf_kafka
+  cugraph
+  cuml
   custreamz
   dask-cuda
   dask-cudf
@@ -57,7 +59,7 @@ DEPENDENCIES=(
   rmm
 )
 for DEP in "${DEPENDENCIES[@]}"; do
-  for FILE in dependencies.yaml conda/environments/*.yaml; do
+  for FILE in dependencies.yaml conda/environments/*.yaml python/cudf/cudf_pandas_tests/third_party_integration_tests/dependencies.yaml; do
     sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
   done
   for FILE in python/*/pyproject.toml; do

cpp/src/io/json/host_tree_algorithms.cu

@@ -45,6 +45,7 @@
 
 #include <algorithm>
 #include <deque>
+
 namespace cudf::io::json::detail {
 
 /**

cpp/src/io/json/nested_json.hpp

@@ -352,59 +352,8 @@ void make_device_json_column(device_span<SymbolT const> input,
                              cudf::io::json_reader_options const& options,
                              rmm::cuda_stream_view stream,
                              rmm::device_async_resource_ref mr);
-/**
- * @brief Reduces node tree representation to column tree representation.
- *
- * @param tree Node tree representation of JSON string
- * @param original_col_ids Column ids of nodes
- * @param sorted_col_ids Sorted column ids of nodes
- * @param ordered_node_ids Node ids of nodes sorted by column ids
- * @param row_offsets Row offsets of nodes
- * @param is_array_of_arrays Whether the tree is an array of arrays
- * @param row_array_parent_col_id Column id of row array, if is_array_of_arrays is true
- * @param stream CUDA stream used for device memory operations and kernel launches
- * @return A tuple of column tree representation of JSON string, column ids of columns, and
- * max row offsets of columns
- */
-std::tuple<tree_meta_t, rmm::device_uvector<NodeIndexT>, rmm::device_uvector<size_type>>
-reduce_to_column_tree(tree_meta_t& tree,
-                      device_span<NodeIndexT> original_col_ids,
-                      device_span<NodeIndexT> sorted_col_ids,
-                      device_span<NodeIndexT> ordered_node_ids,
-                      device_span<size_type> row_offsets,
-                      bool is_array_of_arrays,
-                      NodeIndexT const row_array_parent_col_id,
-                      rmm::cuda_stream_view stream);
-/**
- * @brief Constructs `d_json_column` from node tree representation
- * Newly constructed columns are insert into `root`'s children.
- * `root` must be a list type.
- *
- * @param input Input JSON string device data
- * @param tree Node tree representation of the JSON string
- * @param col_ids Column ids of the nodes in the tree
- * @param row_offsets Row offsets of the nodes in the tree
- * @param root Root node of the `d_json_column` tree
- * @param is_array_of_arrays Whether the tree is an array of arrays
- * @param options Parsing options specifying the parsing behaviour
- * options affecting behaviour are
- *   is_enabled_lines: Whether the input is a line-delimited JSON
- *   is_enabled_mixed_types_as_string: Whether to enable reading mixed types as string
- * @param stream CUDA stream used for device memory operations and kernel launches
- * @param mr Device memory resource used to allocate the device memory
- * of child_offets and validity members of `d_json_column`
- */
-void make_device_json_column(device_span<SymbolT const> input,
-                             tree_meta_t& tree,
-                             device_span<NodeIndexT> col_ids,
-                             device_span<size_type> row_offsets,
-                             device_json_column& root,
-                             bool is_array_of_arrays,
-                             cudf::io::json_reader_options const& options,
-                             rmm::cuda_stream_view stream,
-                             rmm::device_async_resource_ref mr);
-namespace experimental {
 
+namespace experimental {
 void make_device_json_column(device_span<SymbolT const> input,
                              tree_meta_t& tree,
                              device_span<NodeIndexT> col_ids,
@@ -415,6 +364,7 @@ void make_device_json_column(device_span<SymbolT const> input,
                              rmm::cuda_stream_view stream,
                              rmm::device_async_resource_ref mr);
 }  // namespace experimental
+
 /**
  * @brief Retrieves the parse_options to be used for type inference and type casting
  *