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 gtest column utility comparator diff reporting #12995

Merged
merged 5 commits into from
Mar 24, 2023
Merged

Fix gtest column utility comparator diff reporting #12995

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8c1ba3
Fix gtest column utility comparator diff reporting
davidwendt Mar 22, 2023
a308f06
Merge branch 'branch-23.04' into bug-column-utilities
davidwendt Mar 23, 2023
baa3682
Merge branch 'branch-23.04' into bug-column-utilities
davidwendt Mar 23, 2023
d452af5
Merge branch 'branch-23.04' into bug-column-utilities
davidwendt Mar 23, 2023
6d5db17
Merge branch 'branch-23.04' into bug-column-utilities
davidwendt Mar 23, 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
16 changes: 10 additions & 6 deletions cpp/tests/utilities/column_utilities.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ struct column_comparator_impl {

auto const comparator = cudf::experimental::row::equality::two_table_comparator{
lhs_tview, rhs_tview, cudf::get_default_stream()};
auto const has_nulls = cudf::has_nested_nulls(lhs_tview) or cudf::has_nested_nulls(rhs_tview);
auto const has_nulls = cudf::has_nulls(lhs_tview) or cudf::has_nulls(rhs_tview);

auto const device_comparator = comparator.equal_to<false>(cudf::nullate::DYNAMIC{has_nulls});

Expand All @@ -556,18 +556,22 @@ struct column_comparator_impl {
lhs_row_indices.size(), cudf::get_default_stream()); // worst case: everything different
auto input_iter = thrust::make_counting_iterator(0);

auto diff_map = rmm::device_uvector<bool>(lhs_row_indices.size(), cudf::get_default_stream());

thrust::transform(
rmm::exec_policy(cudf::get_default_stream()),
input_iter,
input_iter + lhs_row_indices.size(),
differences.begin(),
diff_map.begin(),
ComparatorType(
*d_lhs_row_indices, *d_rhs_row_indices, fp_ulps, device_comparator, *d_lhs, *d_rhs));

auto diff_iter = thrust::remove(rmm::exec_policy(cudf::get_default_stream()),
differences.begin(),
differences.end(),
0); // remove the zero entries
auto diff_iter = thrust::copy_if(rmm::exec_policy(cudf::get_default_stream()),
input_iter,
input_iter + lhs_row_indices.size(),
diff_map.begin(),
differences.begin(),
thrust::identity<bool>{});

differences.resize(thrust::distance(differences.begin(), diff_iter),
cudf::get_default_stream()); // shrink back down
Expand Down