From 0bfcd9f048ad7afb432d7386e9635e07edaefc71 Mon Sep 17 00:00:00 2001
From: Yunsong Wang <yunsongw@nvidia.com>
Date: Tue, 15 Oct 2024 10:55:02 -0700
Subject: [PATCH] Rename single pass functor + fix typos

---
 cpp/src/groupby/hash/compute_single_pass_aggs.cu |  2 +-
 .../groupby/hash/compute_single_pass_aggs.hpp    | 16 +++++++---------
 ...upby_kernels.cuh => single_pass_functors.cuh} | 14 +++-----------
 3 files changed, 11 insertions(+), 21 deletions(-)
 rename cpp/src/groupby/hash/{groupby_kernels.cuh => single_pass_functors.cuh} (95%)

diff --git a/cpp/src/groupby/hash/compute_single_pass_aggs.cu b/cpp/src/groupby/hash/compute_single_pass_aggs.cu
index a150d216a73..58ec48f488e 100644
--- a/cpp/src/groupby/hash/compute_single_pass_aggs.cu
+++ b/cpp/src/groupby/hash/compute_single_pass_aggs.cu
@@ -16,8 +16,8 @@
 
 #include "compute_single_pass_aggs.hpp"
 #include "flatten_single_pass_aggs.hpp"
-#include "groupby_kernels.cuh"
 #include "helpers.cuh"
+#include "single_pass_functors.cuh"
 #include "var_hash_functor.cuh"
 
 #include <cudf/column/column_factories.hpp>
diff --git a/cpp/src/groupby/hash/compute_single_pass_aggs.hpp b/cpp/src/groupby/hash/compute_single_pass_aggs.hpp
index a1964f3d984..a7434bdf61a 100644
--- a/cpp/src/groupby/hash/compute_single_pass_aggs.hpp
+++ b/cpp/src/groupby/hash/compute_single_pass_aggs.hpp
@@ -21,7 +21,6 @@
 #include <cudf/utilities/span.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
-#include <rmm/device_uvector.hpp>
 
 namespace cudf::groupby::detail::hash {
 /**
@@ -29,12 +28,11 @@ namespace cudf::groupby::detail::hash {
  * over the data and stores the results in `sparse_results`
  */
 template <typename SetType>
-rmm::device_uvector<cudf::size_type> compute_single_pass_aggs(
-  int64_t num_keys,
-  bool skip_rows_with_nulls,
-  bitmask_type const* row_bitmask,
-  SetType global_set,
-  cudf::host_span<cudf::groupby::aggregation_request const> requests,
-  cudf::detail::result_cache* sparse_results,
-  rmm::cuda_stream_view stream);
+void compute_single_pass_aggs(int64_t num_keys,
+                              bool skip_rows_with_nulls,
+                              bitmask_type const* row_bitmask,
+                              SetType set,
+                              cudf::host_span<cudf::groupby::aggregation_request const> requests,
+                              cudf::detail::result_cache* sparse_results,
+                              rmm::cuda_stream_view stream);
 }  // namespace cudf::groupby::detail::hash
diff --git a/cpp/src/groupby/hash/groupby_kernels.cuh b/cpp/src/groupby/hash/single_pass_functors.cuh
similarity index 95%
rename from cpp/src/groupby/hash/groupby_kernels.cuh
rename to cpp/src/groupby/hash/single_pass_functors.cuh
index 86f4d76487f..73791b3aa71 100644
--- a/cpp/src/groupby/hash/groupby_kernels.cuh
+++ b/cpp/src/groupby/hash/single_pass_functors.cuh
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
 #include <cudf/detail/aggregation/aggregation.hpp>
@@ -21,12 +20,9 @@
 #include <cudf/groupby.hpp>
 #include <cudf/utilities/bit.hpp>
 
-#include <thrust/pair.h>
+#include <cuco/static_set_ref.cuh>
 
-namespace cudf {
-namespace groupby {
-namespace detail {
-namespace hash {
+namespace cudf::groupby::detail::hash {
 /**
  * @brief Computes single-pass aggregations and store results into a sparse `output_values` table,
  * and populate `set` with indices of unique keys
@@ -102,8 +98,4 @@ struct compute_single_pass_aggs_fn {
     }
   }
 };
-
-}  // namespace hash
-}  // namespace detail
-}  // namespace groupby
-}  // namespace cudf
+}  // namespace cudf::groupby::detail::hash