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

Add column sanitization checks in CUDF_TEST_EXPECT_COLUMN_* macros #14559

Merged
merged 5 commits into from
Dec 18, 2023
Merged

Add column sanitization checks in CUDF_TEST_EXPECT_COLUMN_* macros #14559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a70103
check has_nonempty_nulls in macros
SurajAralihalli Dec 2, 2023
7f83e83
update cu file
SurajAralihalli Dec 4, 2023
1f4bb46
reduce code duplication and improve readability
SurajAralihalli Dec 6, 2023
fe57348
Merge branch 'branch-24.02' into verify_column_sanity_cudf_tests
SurajAralihalli Dec 18, 2023
6a6fc86
remove UnsanitaryLists test
SurajAralihalli Dec 18, 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
17 changes: 17 additions & 0 deletions cpp/tests/utilities/column_utilities.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include <cudf/column/column_view.hpp>
#include <cudf/copying.hpp>
#include <cudf/detail/copy.hpp>
#include <cudf/detail/get_value.cuh>
#include <cudf/detail/iterator.cuh>
#include <cudf/detail/utilities/vector_factories.hpp>
Expand Down Expand Up @@ -801,6 +802,18 @@ struct column_comparator {
}
};

void check_non_empty_nulls(column_view const& lhs, column_view const& rhs)
{
auto check_column_nulls = [](column_view const& col, const char* col_name) {
if (cudf::detail::has_nonempty_nulls(col, cudf::get_default_stream())) {
throw std::invalid_argument(col_name + std::string(" column has non-empty nulls"));
}
};

check_column_nulls(lhs, "lhs");
check_column_nulls(rhs, "rhs");
}

} // namespace

namespace detail {
Expand All @@ -811,6 +824,7 @@ bool expect_column_properties_equal(column_view const& lhs,
column_view const& rhs,
debug_output_level verbosity)
{
check_non_empty_nulls(lhs, rhs);
auto lhs_indices = generate_all_row_indices(lhs.size());
auto rhs_indices = generate_all_row_indices(rhs.size());
return cudf::type_dispatcher(lhs.type(),
Expand All @@ -829,6 +843,7 @@ bool expect_column_properties_equivalent(column_view const& lhs,
column_view const& rhs,
debug_output_level verbosity)
{
check_non_empty_nulls(lhs, rhs);
auto lhs_indices = generate_all_row_indices(lhs.size());
auto rhs_indices = generate_all_row_indices(rhs.size());
return cudf::type_dispatcher(lhs.type(),
Expand All @@ -847,6 +862,7 @@ bool expect_columns_equal(cudf::column_view const& lhs,
cudf::column_view const& rhs,
debug_output_level verbosity)
{
check_non_empty_nulls(lhs, rhs);
auto lhs_indices = generate_all_row_indices(lhs.size());
auto rhs_indices = generate_all_row_indices(rhs.size());
return cudf::type_dispatcher(lhs.type(),
Expand All @@ -867,6 +883,7 @@ bool expect_columns_equivalent(cudf::column_view const& lhs,
debug_output_level verbosity,
size_type fp_ulps)
{
check_non_empty_nulls(lhs, rhs);
auto lhs_indices = generate_all_row_indices(lhs.size());
auto rhs_indices = generate_all_row_indices(rhs.size());
return cudf::type_dispatcher(lhs.type(),
Expand Down
37 changes: 0 additions & 37 deletions cpp/tests/utilities_tests/column_utilities_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,43 +281,6 @@ TEST_F(ColumnUtilitiesListsTest, DifferingRowCounts)
a, b, cudf::test::debug_output_level::QUIET));
}

TEST_F(ColumnUtilitiesListsTest, UnsanitaryLists)
{
// unsanitary
//
// List<int32_t>:
// Length : 1
// Offsets : 0, 3
// Null count: 1
// 0
// 0, 1, 2
std::vector<std::unique_ptr<cudf::column>> children;
children.emplace_back(
std::move(cudf::test::fixed_width_column_wrapper<cudf::size_type>{0, 3}.release()));
children.emplace_back(std::move(cudf::test::fixed_width_column_wrapper<int>{0, 1, 2}.release()));

auto l0 = std::make_unique<cudf::column>(cudf::data_type{cudf::type_id::LIST},
1,
rmm::device_buffer{},
cudf::create_null_mask(1, cudf::mask_state::ALL_NULL),
1,
std::move(children));

// sanitary
//
// List<int32_t>:
// Length : 1
// Offsets : 0, 0
// Null count: 1
// 0
auto l1 = cudf::test::lists_column_wrapper<int>::make_one_empty_row_column(false);

// equivalent, but not equal
CUDF_TEST_EXPECT_COLUMNS_EQUIVALENT(*l0, l1);
EXPECT_FALSE(
cudf::test::detail::expect_columns_equal(*l0, l1, cudf::test::debug_output_level::QUIET));
}

TEST_F(ColumnUtilitiesListsTest, DifferentPhysicalStructureBeforeConstruction)
{
// list<int>
Expand Down