From 423c2160e4c443df2a0fb2a69a68d391ee7baafe Mon Sep 17 00:00:00 2001
From: Jim Brennan <jimb@nvidia.com>
Date: Mon, 4 Apr 2022 20:45:29 -0500
Subject: [PATCH] Fix has_atomic_support check in can_use_hash_groupby()

---
 cpp/src/groupby/hash/groupby.cu | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cpp/src/groupby/hash/groupby.cu b/cpp/src/groupby/hash/groupby.cu
index 49ed0b7fc1d..44df981f5bf 100644
--- a/cpp/src/groupby/hash/groupby.cu
+++ b/cpp/src/groupby/hash/groupby.cu
@@ -645,10 +645,14 @@ bool can_use_hash_groupby(table_view const& keys, host_span<aggregation_request
     // Currently, structs are not supported in any of hash-based aggregations.
     // Therefore, if any request contains structs then we must fallback to sort-based aggregations.
     // TODO: Support structs in hash-based aggregations.
+    auto const v_type = is_dictionary(r.values.type())
+                          ? cudf::dictionary_column_view(r.values).keys().type()
+                          : r.values.type();
+
     return not(r.values.type().id() == type_id::STRUCT) and
-           cudf::has_atomic_support(r.values.type()) and
-           std::all_of(r.aggregations.begin(), r.aggregations.end(), [](auto const& a) {
-             return is_hash_aggregation(a->kind);
+           std::all_of(r.aggregations.begin(), r.aggregations.end(), [v_type](auto const& a) {
+             return cudf::has_atomic_support(cudf::detail::target_type(v_type, a->kind)) and
+                    is_hash_aggregation(a->kind);
            });
   });
 }