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 cudf::test::to_host return of host_vector #15263

Merged
merged 3 commits into from
Mar 12, 2024
Merged

Fix cudf::test::to_host return of host_vector #15263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3ba8be
Fix cudf::test::to_host return of host_vector
davidwendt Mar 8, 2024
bffba2d
Merge branch 'branch-24.04' into to-host-rtn-vector
davidwendt Mar 8, 2024
129bf3d
Merge branch 'branch-24.04' into to-host-rtn-vector
davidwendt Mar 11, 2024
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: 0 additions & 2 deletions cpp/include/cudf/detail/gather.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@

#include <thrust/functional.h>
#include <thrust/gather.h>
#include <thrust/host_vector.h>
#include <thrust/iterator/counting_iterator.h>
#include <thrust/iterator/transform_iterator.h>
#include <thrust/logical.h>

#include <algorithm>
Expand Down
6 changes: 3 additions & 3 deletions cpp/include/cudf_test/column_utilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ bool validate_host_masks(std::vector<bitmask_type> const& expected_mask,
template <typename T, std::enable_if_t<not cudf::is_fixed_point<T>()>* = nullptr>
std::pair<thrust::host_vector<T>, std::vector<bitmask_type>> to_host(column_view c)
{
thrust::host_vector<T> host_data(c.size());
CUDF_CUDA_TRY(cudaMemcpy(host_data.data(), c.data<T>(), c.size() * sizeof(T), cudaMemcpyDefault));
return {host_data, bitmask_to_host(c)};
auto col_span = cudf::device_span<T const>(c.data<T>(), c.size());
auto host_data = cudf::detail::make_host_vector_sync(col_span, cudf::get_default_stream());
return {std::move(host_data), bitmask_to_host(c)};
}

// This signature is identical to the above overload apart from SFINAE so
Expand Down
32 changes: 14 additions & 18 deletions cpp/tests/utilities/column_utilities.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,20 +906,18 @@ void expect_column_empty(cudf::column_view const& col)
std::vector<bitmask_type> bitmask_to_host(cudf::column_view const& c)
{
if (c.nullable()) {
auto num_bitmasks = num_bitmask_words(c.size());
std::vector<bitmask_type> host_bitmask(num_bitmasks);
if (c.offset() == 0) {
CUDF_CUDA_TRY(cudaMemcpy(host_bitmask.data(),
c.null_mask(),
num_bitmasks * sizeof(bitmask_type),
cudaMemcpyDefault));
} else {
auto num_bitmasks = num_bitmask_words(c.size());
auto [bitmask_span, _] = [&] {
if (c.offset() == 0) {
return std::pair{cudf::device_span<bitmask_type const>(c.null_mask(), num_bitmasks),
rmm::device_buffer{}};
}
auto mask = copy_bitmask(c.null_mask(), c.offset(), c.offset() + c.size());
CUDF_CUDA_TRY(cudaMemcpy(
host_bitmask.data(), mask.data(), num_bitmasks * sizeof(bitmask_type), cudaMemcpyDefault));
}

return host_bitmask;
return std::pair{cudf::device_span<bitmask_type const>(
static_cast<bitmask_type*>(mask.data()), num_bitmasks),
std::move(mask)};
}();
return cudf::detail::make_std_vector_sync(bitmask_span, cudf::get_default_stream());
} else {
return std::vector<bitmask_type>{};
}
Expand All @@ -946,16 +944,14 @@ std::pair<thrust::host_vector<T>, std::vector<bitmask_type>> to_host(column_view
using namespace numeric;
using Rep = typename T::rep;

auto host_rep_types = thrust::host_vector<Rep>(c.size());

CUDF_CUDA_TRY(
cudaMemcpy(host_rep_types.data(), c.begin<Rep>(), c.size() * sizeof(Rep), cudaMemcpyDefault));
auto col_span = cudf::device_span<Rep const>(c.begin<Rep>(), c.size());
auto host_rep_types = cudf::detail::make_host_vector_sync(col_span, cudf::get_default_stream());

auto to_fp = [&](Rep val) { return T{scaled_integer<Rep>{val, scale_type{c.type().scale()}}}; };
auto begin = thrust::make_transform_iterator(std::cbegin(host_rep_types), to_fp);
auto const host_fixed_points = thrust::host_vector<T>(begin, begin + c.size());

return {host_fixed_points, bitmask_to_host(c)};
return {std::move(host_fixed_points), bitmask_to_host(c)};
}

template std::pair<thrust::host_vector<numeric::decimal32>, std::vector<bitmask_type>> to_host(
Expand Down
Loading