Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cpp/src/copying/contiguous_split.cu
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ std::unique_ptr<packed_partition_buf_size_and_dst_buf_info> compute_splits(

partition_buf_size_and_dst_buf_info->copy_to_host();

stream.wait();
stream.sync();

return partition_buf_size_and_dst_buf_info;
}
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/partitioning/partitioning.cu
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ std::pair<std::unique_ptr<table>, std::vector<size_type>> hash_partition_table_g
// Scatter input rows into partitioned output
auto output = detail::scatter(input, scatter_map, input, stream, mr);

stream.wait(); // Pinned async D2H copy must finish before returning host vec
stream.sync(); // Pinned async D2H copy must finish before returning host vec

// Convert pinned host_vector to std::vector for the return type
auto partition_offsets = std::vector<size_type>(pinned_offsets.begin(), pinned_offsets.end());
Expand Down Expand Up @@ -724,7 +724,7 @@ std::pair<std::unique_ptr<table>, std::vector<size_type>> hash_partition_table(
input, gather_map.begin(), output_cols, detail::gather_bitmask_op::DONT_CHECK, stream, mr);
}

stream.wait(); // Async D2H copy must finish before returning host vec
stream.sync(); // Async D2H copy must finish before returning host vec
return std::pair{std::make_unique<table>(std::move(output_cols), num_rows),
std::move(partition_offsets)};
} else {
Expand All @@ -742,7 +742,7 @@ std::pair<std::unique_ptr<table>, std::vector<size_type>> hash_partition_table(
// Use the resulting scatter map to materialize the output
auto output = detail::scatter(input, row_partition_numbers, input, stream, mr);

stream.wait(); // Async D2H copy must finish before returning host vec
stream.sync(); // Async D2H copy must finish before returning host vec
return std::pair{std::move(output), std::move(partition_offsets)};
}
}
Expand Down
2 changes: 1 addition & 1 deletion cpp/tests/copying/concatenate_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct TypedColumnTest : public cudf::test::BaseFixture {
CUDF_CUDA_TRY(
cudaMemcpyAsync(typed_mask, h_mask.data(), mask.size(), cudaMemcpyDefault, stream.get()));
_null_count = cudf::null_count(static_cast<cudf::bitmask_type*>(mask.data()), 0, _num_elements);
stream.wait();
stream.sync();
}

[[nodiscard]] cudf::size_type num_elements() const { return _num_elements; }
Expand Down
Loading