Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix groupby gtests coded in namespace cudf::test #12784

Merged
merged 4 commits into from
Feb 16, 2023
Merged

Fix groupby gtests coded in namespace cudf::test #12784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d98a88
Fix groupby gtests coded in namespace cudf::test
davidwendt Feb 15, 2023
302ac95
Merge branch 'branch-23.04' into fix-gtest-ns-groupby1
davidwendt Feb 16, 2023
abd2959
fix remaining files
davidwendt Feb 16, 2023
12002ad
cleanup: mostly comments
davidwendt Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cpp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ ConfigureTest(
groupby/count_scan_tests.cpp
groupby/count_tests.cpp
groupby/covariance_tests.cpp
groupby/groupby_test_util.cpp
groupby/groups_tests.cpp
groupby/keys_tests.cpp
groupby/lists_tests.cpp
Expand Down
194 changes: 97 additions & 97 deletions cpp/tests/groupby/argmax_tests.cpp
View file
Open in desktop

Large diffs are not rendered by default.

190 changes: 95 additions & 95 deletions cpp/tests/groupby/argmin_tests.cpp
View file
Open in desktop

Large diffs are not rendered by default.

131 changes: 71 additions & 60 deletions cpp/tests/groupby/collect_list_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -22,9 +22,6 @@

#include <cudf/detail/aggregation/aggregation.hpp>

namespace cudf {
namespace test {

template <typename V>
struct groupby_collect_list_test : public cudf::test::BaseFixture {
};
Expand All @@ -39,13 +36,13 @@ TYPED_TEST(groupby_collect_list_test, CollectWithoutNulls)
using K = int32_t;
using V = TypeParam;

fixed_width_column_wrapper<K, int32_t> keys{1, 1, 1, 2, 2, 2};
fixed_width_column_wrapper<V, int32_t> values{1, 2, 3, 4, 5, 6};
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{1, 1, 1, 2, 2, 2};
cudf::test::fixed_width_column_wrapper<V, int32_t> values{1, 2, 3, 4, 5, 6};

fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2};
lists_column_wrapper<V, int32_t> expect_vals{{1, 2, 3}, {4, 5, 6}};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2};
cudf::test::lists_column_wrapper<V, int32_t> expect_vals{{1, 2, 3}, {4, 5, 6}};

auto agg = cudf::make_collect_list_aggregation<groupby_aggregation>();
auto agg = cudf::make_collect_list_aggregation<cudf::groupby_aggregation>();
test_single_agg(keys, values, expect_keys, expect_vals, std::move(agg));
}

Expand All @@ -54,17 +51,17 @@ TYPED_TEST(groupby_collect_list_test, CollectWithNulls)
using K = int32_t;
using V = TypeParam;

fixed_width_column_wrapper<K, int32_t> keys{1, 1, 2, 2, 3, 3};
fixed_width_column_wrapper<V, int32_t> values{{1, 2, 3, 4, 5, 6},
{true, false, true, false, true, false}};
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{1, 1, 2, 2, 3, 3};
cudf::test::fixed_width_column_wrapper<V, int32_t> values{
{1, 2, 3, 4, 5, 6}, {true, false, true, false, true, false}};

fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2, 3};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2, 3};

std::vector<int32_t> validity({true, false});
lists_column_wrapper<V, int32_t> expect_vals{
cudf::test::lists_column_wrapper<V, int32_t> expect_vals{
{{1, 2}, validity.begin()}, {{3, 4}, validity.begin()}, {{5, 6}, validity.begin()}};

auto agg = cudf::make_collect_list_aggregation<groupby_aggregation>();
auto agg = cudf::make_collect_list_aggregation<cudf::groupby_aggregation>();
test_single_agg(keys, values, expect_keys, expect_vals, std::move(agg));
}

Expand All @@ -73,16 +70,17 @@ TYPED_TEST(groupby_collect_list_test, CollectWithNullExclusion)
using K = int32_t;
using V = TypeParam;

fixed_width_column_wrapper<K, int32_t> keys{1, 1, 1, 2, 2, 3, 3, 4, 4};
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{1, 1, 1, 2, 2, 3, 3, 4, 4};

fixed_width_column_wrapper<V, int32_t> values{
cudf::test::fixed_width_column_wrapper<V, int32_t> values{
{1, 2, 3, 4, 5, 6, 7, 8, 9}, {false, true, false, true, false, false, false, true, true}};

fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2, 3, 4};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2, 3, 4};

lists_column_wrapper<V, int32_t> expect_vals{{2}, {4}, {}, {8, 9}};
cudf::test::lists_column_wrapper<V, int32_t> expect_vals{{2}, {4}, {}, {8, 9}};

auto agg = cudf::make_collect_list_aggregation<groupby_aggregation>(null_policy::EXCLUDE);
auto agg =
cudf::make_collect_list_aggregation<cudf::groupby_aggregation>(cudf::null_policy::EXCLUDE);
test_single_agg(keys, values, expect_keys, expect_vals, std::move(agg));
}

Expand All @@ -91,13 +89,14 @@ TYPED_TEST(groupby_collect_list_test, CollectOnEmptyInput)
using K = int32_t;
using V = TypeParam;

fixed_width_column_wrapper<K, int32_t> keys{};
fixed_width_column_wrapper<V, int32_t> values{};
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{};
cudf::test::fixed_width_column_wrapper<V, int32_t> values{};

fixed_width_column_wrapper<K, int32_t> expect_keys{};
lists_column_wrapper<V, int32_t> expect_vals{};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{};
cudf::test::lists_column_wrapper<V, int32_t> expect_vals{};

auto agg = cudf::make_collect_list_aggregation<groupby_aggregation>(null_policy::EXCLUDE);
auto agg =
cudf::make_collect_list_aggregation<cudf::groupby_aggregation>(cudf::null_policy::EXCLUDE);
test_single_agg(keys, values, expect_keys, expect_vals, std::move(agg));
}

Expand All @@ -108,15 +107,16 @@ TYPED_TEST(groupby_collect_list_test, CollectLists)

using LCW = cudf::test::lists_column_wrapper<TypeParam, int32_t>;

fixed_width_column_wrapper<K, int32_t> keys{1, 1, 2, 2, 3, 3};
lists_column_wrapper<V, int32_t> values{{1, 2}, {3, 4}, {5, 6, 7}, LCW{}, {9, 10}, {11}};
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{1, 1, 2, 2, 3, 3};
cudf::test::lists_column_wrapper<V, int32_t> values{
{1, 2}, {3, 4}, {5, 6, 7}, LCW{}, {9, 10}, {11}};

fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2, 3};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2, 3};

lists_column_wrapper<V, int32_t> expect_vals{
cudf::test::lists_column_wrapper<V, int32_t> expect_vals{
{{1, 2}, {3, 4}}, {{5, 6, 7}, LCW{}}, {{9, 10}, {11}}};

auto agg = cudf::make_collect_list_aggregation<groupby_aggregation>();
auto agg = cudf::make_collect_list_aggregation<cudf::groupby_aggregation>();
test_single_agg(keys, values, expect_keys, expect_vals, std::move(agg));
}

Expand All @@ -127,15 +127,16 @@ TYPED_TEST(groupby_collect_list_test, CollectListsWithNullExclusion)

using LCW = cudf::test::lists_column_wrapper<V, int32_t>;

fixed_width_column_wrapper<K, int32_t> keys{1, 1, 2, 2, 3, 3, 4, 4};
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{1, 1, 2, 2, 3, 3, 4, 4};
const bool validity_mask[] = {true, false, false, true, true, true, false, false};
LCW values{{{1, 2}, {3, 4}, {5, 6, 7}, LCW{}, {9, 10}, {11}, {20, 30, 40}, LCW{}}, validity_mask};

fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2, 3, 4};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2, 3, 4};

LCW expect_vals{{{1, 2}}, {LCW{}}, {{9, 10}, {11}}, {}};

auto agg = cudf::make_collect_list_aggregation<groupby_aggregation>(null_policy::EXCLUDE);
auto agg =
cudf::make_collect_list_aggregation<cudf::groupby_aggregation>(cudf::null_policy::EXCLUDE);
test_single_agg(keys, values, expect_keys, expect_vals, std::move(agg));
}

Expand All @@ -146,19 +147,20 @@ TYPED_TEST(groupby_collect_list_test, CollectOnEmptyInputLists)

using LCW = cudf::test::lists_column_wrapper<V, int32_t>;

auto offsets = data_type{type_to_id<offset_type>()};
auto offsets = cudf::data_type{cudf::type_to_id<cudf::offset_type>()};

fixed_width_column_wrapper<K, int32_t> keys{};
auto values = cudf::make_lists_column(0, make_empty_column(offsets), LCW{}.release(), 0, {});
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{};
auto values =
cudf::make_lists_column(0, cudf::make_empty_column(offsets), LCW{}.release(), 0, {});

fixed_width_column_wrapper<K, int32_t> expect_keys{};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{};

auto expect_child =
cudf::make_lists_column(0, make_empty_column(offsets), LCW{}.release(), 0, {});
cudf::make_lists_column(0, cudf::make_empty_column(offsets), LCW{}.release(), 0, {});
auto expect_values =
cudf::make_lists_column(0, make_empty_column(offsets), std::move(expect_child), 0, {});
cudf::make_lists_column(0, cudf::make_empty_column(offsets), std::move(expect_child), 0, {});

auto agg = cudf::make_collect_list_aggregation<groupby_aggregation>();
auto agg = cudf::make_collect_list_aggregation<cudf::groupby_aggregation>();
test_single_agg(keys, values->view(), expect_keys, expect_values->view(), std::move(agg));
}

Expand All @@ -169,24 +171,36 @@ TYPED_TEST(groupby_collect_list_test, CollectOnEmptyInputListsOfStructs)

using LCW = cudf::test::lists_column_wrapper<V, int32_t>;

fixed_width_column_wrapper<K, int32_t> keys{};
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{};
auto struct_child = LCW{};
auto struct_column = structs_column_wrapper{{struct_child}};
auto struct_column = cudf::test::structs_column_wrapper{{struct_child}};

auto values = cudf::make_lists_column(
0, make_empty_column(type_to_id<offset_type>()), struct_column.release(), 0, {});
auto values =
cudf::make_lists_column(0,
cudf::make_empty_column(cudf::type_to_id<cudf::offset_type>()),
struct_column.release(),
0,
{});

fixed_width_column_wrapper<K, int32_t> expect_keys{};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{};

auto expect_struct_child = LCW{};
auto expect_struct_column = structs_column_wrapper{{expect_struct_child}};
auto expect_struct_column = cudf::test::structs_column_wrapper{{expect_struct_child}};

auto expect_child = cudf::make_lists_column(
0, make_empty_column(type_to_id<offset_type>()), expect_struct_column.release(), 0, {});
auto expect_values = cudf::make_lists_column(
0, make_empty_column(type_to_id<offset_type>()), std::move(expect_child), 0, {});
auto expect_child =
cudf::make_lists_column(0,
cudf::make_empty_column(cudf::type_to_id<cudf::offset_type>()),
expect_struct_column.release(),
0,
{});
auto expect_values =
cudf::make_lists_column(0,
cudf::make_empty_column(cudf::type_to_id<cudf::offset_type>()),
std::move(expect_child),
0,
{});

auto agg = cudf::make_collect_list_aggregation<groupby_aggregation>();
auto agg = cudf::make_collect_list_aggregation<cudf::groupby_aggregation>();
test_single_agg(keys, values->view(), expect_keys, expect_values->view(), std::move(agg));
}

Expand All @@ -195,13 +209,13 @@ TYPED_TEST(groupby_collect_list_test, dictionary)
using K = int32_t;
using V = TypeParam;

fixed_width_column_wrapper<K, int32_t> keys{1, 1, 1, 2, 2, 2};
dictionary_column_wrapper<V, int32_t> vals{1, 2, 3, 4, 5, 6};
cudf::test::fixed_width_column_wrapper<K, int32_t> keys{1, 1, 1, 2, 2, 2};
cudf::test::dictionary_column_wrapper<V, int32_t> vals{1, 2, 3, 4, 5, 6};

fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2};
lists_column_wrapper<V, int32_t> expect_vals_w{{1, 2, 3}, {4, 5, 6}};
cudf::test::fixed_width_column_wrapper<K, int32_t> expect_keys{1, 2};
cudf::test::lists_column_wrapper<V, int32_t> expect_vals_w{{1, 2, 3}, {4, 5, 6}};

fixed_width_column_wrapper<int32_t> offsets({0, 3, 6});
cudf::test::fixed_width_column_wrapper<int32_t> offsets({0, 3, 6});
auto expect_vals = cudf::make_lists_column(cudf::column_view(offsets).size() - 1,
std::make_unique<cudf::column>(offsets),
std::make_unique<cudf::column>(vals),
Expand All @@ -212,8 +226,5 @@ TYPED_TEST(groupby_collect_list_test, dictionary)
vals,
expect_keys,
expect_vals->view(),
cudf::make_collect_list_aggregation<groupby_aggregation>());
cudf::make_collect_list_aggregation<cudf::groupby_aggregation>());
}

} // namespace test
} // namespace cudf
Loading