diff --git a/cpp/tests/groupby/groupby_test_util.cpp b/cpp/tests/groupby/groupby_test_util.cpp index 341aa3b1f38..d6a0608c3e9 100644 --- a/cpp/tests/groupby/groupby_test_util.cpp +++ b/cpp/tests/groupby/groupby_test_util.cpp @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2020-2024, NVIDIA CORPORATION. + * SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION. * SPDX-License-Identifier: Apache-2.0 */ @@ -27,8 +27,12 @@ void test_single_agg(cudf::column_view const& keys, cudf::sorted keys_are_sorted, std::vector const& column_order, std::vector const& null_precedence, - cudf::sorted reference_keys_are_sorted) + cudf::sorted reference_keys_are_sorted, + std::source_location const& location) { + SCOPED_TRACE("Original failure location: " + std::string{location.file_name()} + ":" + + std::to_string(location.line())); + auto const [sorted_expect_keys, sorted_expect_vals] = [&]() { if (reference_keys_are_sorted == cudf::sorted::NO) { auto const sort_expect_order = @@ -86,7 +90,8 @@ void test_single_agg(cudf::column_view const& keys, void test_sum_agg(cudf::column_view const& keys, cudf::column_view const& values, cudf::column_view const& expected_keys, - cudf::column_view const& expected_values) + cudf::column_view const& expected_values, + std::source_location const& location) { auto const do_test = [&](auto const use_sort_option) { test_single_agg(keys, @@ -95,7 +100,12 @@ void test_sum_agg(cudf::column_view const& keys, expected_values, cudf::make_sum_aggregation(), use_sort_option, - cudf::null_policy::INCLUDE); + cudf::null_policy::INCLUDE, + cudf::sorted::NO, + {}, + {}, + cudf::sorted::NO, + location); }; do_test(force_use_sort_impl::YES); do_test(force_use_sort_impl::NO); @@ -109,12 +119,15 @@ void test_single_scan(cudf::column_view const& keys, cudf::null_policy include_null_keys, cudf::sorted keys_are_sorted, std::vector const& column_order, - std::vector const& null_precedence) + std::vector const& null_precedence, + std::source_location const& location) { + SCOPED_TRACE("Original failure location: " + std::string{location.file_name()} + ":" + + std::to_string(location.line())); + std::vector requests; requests.emplace_back(); requests[0].values = values; - requests[0].aggregations.push_back(std::move(agg)); cudf::groupby::groupby gb_obj( diff --git a/cpp/tests/groupby/groupby_test_util.hpp b/cpp/tests/groupby/groupby_test_util.hpp index 28f9f79c74d..f581db75ab7 100644 --- a/cpp/tests/groupby/groupby_test_util.hpp +++ b/cpp/tests/groupby/groupby_test_util.hpp @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2020-2024, NVIDIA CORPORATION. + * SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION. * SPDX-License-Identifier: Apache-2.0 */ @@ -8,6 +8,8 @@ #include #include +#include + enum class force_use_sort_impl : bool { NO, YES }; void test_single_agg(cudf::column_view const& keys, @@ -20,12 +22,13 @@ void test_single_agg(cudf::column_view const& keys, cudf::sorted keys_are_sorted = cudf::sorted::NO, std::vector const& column_order = {}, std::vector const& null_precedence = {}, - cudf::sorted reference_keys_are_sorted = cudf::sorted::NO); - + cudf::sorted reference_keys_are_sorted = cudf::sorted::NO, + std::source_location const& location = std::source_location::current()); void test_sum_agg(cudf::column_view const& keys, cudf::column_view const& values, cudf::column_view const& expected_keys, - cudf::column_view const& expected_values); + cudf::column_view const& expected_values, + std::source_location const& location = std::source_location::current()); void test_single_scan(cudf::column_view const& keys, cudf::column_view const& values, @@ -35,4 +38,5 @@ void test_single_scan(cudf::column_view const& keys, cudf::null_policy include_null_keys = cudf::null_policy::EXCLUDE, cudf::sorted keys_are_sorted = cudf::sorted::NO, std::vector const& column_order = {}, - std::vector const& null_precedence = {}); + std::vector const& null_precedence = {}, + std::source_location const& location = std::source_location::current());