Initial changes (10.2 not working)

rapidsai · Jan 28, 2021 · 34f02c2 · 34f02c2
1 parent 27893db
commit 34f02c2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/cpp/include/cudf/detail/aggregation/aggregation.cuh b/cpp/include/cudf/detail/aggregation/aggregation.cuh
@@ -341,7 +341,8 @@ struct elementwise_aggregator {
                              column_device_view source,
                              size_type source_index) const noexcept
   {
-    update_target_element<Source, k, target_has_nulls, source_has_nulls>{}(
+    using DeviceType = device_storage_type_t<Source>;
+    update_target_element<DeviceType, k, target_has_nulls, source_has_nulls>{}(
       target, target_index, source, source_index);
   }
 };

diff --git a/cpp/tests/groupby/group_count_test.cpp b/cpp/tests/groupby/group_count_test.cpp
@@ -221,6 +221,8 @@ TYPED_TEST(FixedPointTestBothReps, GroupBySumProductMinMaxDecimalAsValue)
     auto const expect_vals_min = fp_wrapper{{0, 1, 2}, scale};
     auto const expect_vals_max = fp_wrapper{{6, 9, 8}, scale};
 
+    // group_by sort tests
+
     auto agg1 = cudf::make_sum_aggregation();
     test_single_agg(
       keys, vals, expect_keys, expect_vals_sum, std::move(agg1), force_use_sort_impl::YES);
@@ -237,6 +239,21 @@ TYPED_TEST(FixedPointTestBothReps, GroupBySumProductMinMaxDecimalAsValue)
     EXPECT_THROW(
       test_single_agg(keys, vals, expect_keys, {}, std::move(agg4), force_use_sort_impl::YES),
       cudf::logic_error);
+
+    // group_by hash tests
+
+    auto agg5 = cudf::make_sum_aggregation();
+    test_single_agg(keys, vals, expect_keys, expect_vals_sum, std::move(agg5));
+
+    // auto agg6 = cudf::make_min_aggregation();
+    // test_single_agg(keys, vals, expect_keys, expect_vals_min, std::move(agg6));
+
+    // auto agg7 = cudf::make_max_aggregation();
+    // test_single_agg(keys, vals, expect_keys, expect_vals_max, std::move(agg7));
+
+    // auto agg8 = cudf::make_product_aggregation();
+    // EXPECT_THROW(test_single_agg(keys, vals, expect_keys, {}, std::move(agg8)),
+    // cudf::logic_error);
   }
 }