|
5 | 5 | #pragma once |
6 | 6 |
|
7 | 7 | #include <cudf/detail/device_scalar.hpp> |
| 8 | +#include <cudf/detail/utilities/buffer_factories.hpp> |
8 | 9 | #include <cudf/detail/utilities/cuda.cuh> |
9 | 10 | #include <cudf/detail/utilities/cuda.hpp> |
10 | 11 | #include <cudf/detail/utilities/grid_1d.cuh> |
@@ -313,7 +314,7 @@ segmented_bitmask_binop(Binop op, |
313 | 314 | h_destination_masks_ptrs.push_back(h_destination_masks.back()->data()); |
314 | 315 | } |
315 | 316 | auto destination_masks = |
316 | | - cudf::detail::make_device_uvector_async(h_destination_masks_ptrs, stream, temp_mr); |
| 317 | + cudf::detail::make_device_buffer_async(h_destination_masks_ptrs, stream, temp_mr); |
317 | 318 |
|
318 | 319 | // for destination size, pass number of words in each destination buffer instead of number of bits |
319 | 320 | auto null_counts = inplace_segmented_bitmask_binop(op, |
@@ -363,8 +364,8 @@ size_type inplace_bitmask_binop(Binop op, |
363 | 364 | auto const temp_mr = mr.get_temporary_mr(); |
364 | 365 | cudf::detail::device_scalar<size_type> d_counter{0, stream, temp_mr}; |
365 | 366 |
|
366 | | - auto d_masks = cudf::detail::make_device_uvector_async(masks, stream, temp_mr); |
367 | | - auto d_begin_bits = cudf::detail::make_device_uvector_async(masks_begin_bits, stream, temp_mr); |
| 367 | + auto d_masks = cudf::detail::make_device_buffer_async(masks, stream, temp_mr); |
| 368 | + auto d_begin_bits = cudf::detail::make_device_buffer_async(masks_begin_bits, stream, temp_mr); |
368 | 369 |
|
369 | 370 | auto constexpr block_size = 256; |
370 | 371 | cudf::detail::grid_1d config(dest_mask.size(), block_size); |
@@ -427,10 +428,9 @@ rmm::device_uvector<size_type> inplace_segmented_bitmask_binop( |
427 | 428 | auto d_null_counts = cudf::detail::make_zeroed_device_uvector_async<size_type>( |
428 | 429 | num_segments, stream, mr.get_output_mr()); |
429 | 430 | auto const temp_mr = mr.get_temporary_mr(); |
430 | | - auto d_masks = cudf::detail::make_device_uvector_async(masks, stream, temp_mr); |
431 | | - auto d_begin_bits = cudf::detail::make_device_uvector_async(masks_begin_bits, stream, temp_mr); |
432 | | - auto d_segment_offsets = |
433 | | - cudf::detail::make_device_uvector_async(segment_offsets, stream, temp_mr); |
| 431 | + auto d_masks = cudf::detail::make_device_buffer_async(masks, stream, temp_mr); |
| 432 | + auto d_begin_bits = cudf::detail::make_device_buffer_async(masks_begin_bits, stream, temp_mr); |
| 433 | + auto d_segment_offsets = cudf::detail::make_device_buffer_async(segment_offsets, stream, temp_mr); |
434 | 434 |
|
435 | 435 | auto constexpr block_size = 256; |
436 | 436 |
|
@@ -701,7 +701,7 @@ std::vector<size_type> segmented_count_bits(bitmask_type const* bitmask, |
701 | 701 | std::distance(indices_begin, indices_end), stream); |
702 | 702 | std::copy(indices_begin, indices_end, std::back_inserter(h_indices)); |
703 | 703 | auto const temp_mr = cudf::get_current_device_resource_ref(); |
704 | | - auto const d_indices = make_device_uvector_async(h_indices, stream, temp_mr); |
| 704 | + auto const d_indices = make_device_buffer_async(h_indices, stream, temp_mr); |
705 | 705 |
|
706 | 706 | // Compute the bit counts over each segment. |
707 | 707 | auto first_bit_indices_begin = cuda::transform_iterator( |
|
0 commit comments