Rename single pass functor + fix typos

rapidsai · Oct 15, 2024 · 0bfcd9f · 0bfcd9f
1 parent 9261052
commit 0bfcd9f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git 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
@@ -21,20 +21,18 @@
 #include <cudf/utilities/span.hpp>
 
 #include <rmm/cuda_stream_view.hpp>
-#include <rmm/device_uvector.hpp>
 
 namespace cudf::groupby::detail::hash {
 /**
  * @brief Computes all aggregations from `requests` that require a single pass
  * 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 → ...src/groupby/hash/single_pass_functors.cuh b/cpp/src/groupby/hash/groupby_kernels.cuh → ...src/groupby/hash/single_pass_functors.cuh
@@ -13,20 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
 #include <cudf/detail/aggregation/aggregation.hpp>
 #include <cudf/detail/aggregation/device_aggregators.cuh>
 #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