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 stream usage in segmented_gather() #9679

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Fix stream usage in segmented_gather() #9679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffeb2dd
Fix thread-sync in segmented_gather()
mythrocks Nov 12, 2021
b242e94
Removing unnecessary header.
mythrocks Nov 15, 2021
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
21 changes: 12 additions & 9 deletions cpp/src/lists/copying/segmented_gather.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <cudf/detail/copy_range.cuh>
#include <cudf/detail/gather.cuh>
#include <cudf/detail/gather.hpp>
#include <cudf/detail/indexalator.cuh>
#include <cudf/detail/iterator.cuh>
#include <cudf/detail/null_mask.hpp>
Expand Down Expand Up @@ -88,22 +88,25 @@ std::unique_ptr<column> segmented_gather(lists_column_view const& value_column,
auto child = std::move(child_table->release().front());

// Create list offsets from gather_map.
auto output_offset = cudf::allocate_like(
gather_map.offsets(), gather_map.size() + 1, mask_allocation_policy::RETAIN, mr);
auto output_offset = cudf::detail::allocate_like(
gather_map.offsets(), gather_map.size() + 1, mask_allocation_policy::RETAIN, stream, mr);
auto output_offset_view = output_offset->mutable_view();
cudf::copy_range_in_place(gather_map.offsets(),
output_offset_view,
gather_map.offset(),
gather_map.offset() + output_offset_view.size(),
0);
cudf::detail::copy_range_in_place(gather_map.offsets(),
output_offset_view,
gather_map.offset(),
gather_map.offset() + output_offset_view.size(),
0,
stream);
// Assemble list column & return
auto null_mask = cudf::detail::copy_bitmask(value_column.parent(), stream, mr);
size_type null_count = value_column.null_count();
return make_lists_column(gather_map.size(),
std::move(output_offset),
std::move(child),
null_count,
std::move(null_mask));
std::move(null_mask),
stream,
mr);
}

} // namespace detail
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/lists/extract.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ std::unique_ptr<cudf::column> make_index_child(column_view const& indices,
// `segmented_gather()` on a null index should produce a null row.
if (not indices.nullable()) { return std::make_unique<column>(indices, stream); }

auto const d_indices = column_device_view::create(indices);
auto const d_indices = column_device_view::create(indices, stream);
// Replace null indices with MAX_SIZE_TYPE, so that gather() returns null for them.
auto const null_replaced_iter_begin =
cudf::detail::make_null_replacement_iterator(*d_indices, std::numeric_limits<size_type>::max());
Expand Down