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.

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

Missing device_storage_dispatch change affecting cudf::gather #7449

Merged
merged 3 commits into from
Feb 25, 2021
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
16 changes: 8 additions & 8 deletions cpp/include/cudf/detail/gather.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -557,14 +557,14 @@ struct column_gatherer_impl<struct_view, MapItRoot> {
std::back_inserter(output_struct_members),
[&gather_map_begin, &gather_map_end, nullify_out_of_bounds, stream, mr](
cudf::column_view const& col) {
return cudf::type_dispatcher(col.type(),
column_gatherer{},
col,
gather_map_begin,
gather_map_end,
nullify_out_of_bounds,
stream,
mr);
return cudf::type_dispatcher<dispatch_storage_type>(col.type(),
column_gatherer{},
col,
gather_map_begin,
gather_map_end,
nullify_out_of_bounds,
stream,
mr);
});

gather_bitmask(
Expand Down
24 changes: 12 additions & 12 deletions cpp/src/lists/copying/gather.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, NVIDIA CORPORATION.
* Copyright (c) 2020-2021, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -96,17 +96,17 @@ std::unique_ptr<column> gather_list_leaf(column_view const& column,
size_type gather_map_size = gd.gather_map_size;

// call the normal gather
auto leaf_column =
cudf::type_dispatcher(column.type(),
cudf::detail::column_gatherer{},
column,
gather_map_begin,
gather_map_begin + gather_map_size,
// note : we don't need to bother checking for out-of-bounds here since
// our inputs at this stage aren't coming from the user.
false,
stream,
mr);
auto leaf_column = cudf::type_dispatcher<dispatch_storage_type>(
column.type(),
cudf::detail::column_gatherer{},
column,
gather_map_begin,
gather_map_begin + gather_map_size,
// note : we don't need to bother checking for out-of-bounds here since
// our inputs at this stage aren't coming from the user.
false,
stream,
mr);

// the column_gatherer doesn't create the null mask because it expects
// that will be done in the gather_bitmask() step. however, gather_bitmask()
Expand Down
6 changes: 4 additions & 2 deletions cpp/tests/collect_list/collect_list_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ template <typename T>
struct TypedCollectListTest : public CollectListTest {
};

using TypesForTest = cudf::test::
Concat<cudf::test::IntegralTypes, cudf::test::FloatingPointTypes, cudf::test::DurationTypes>;
using TypesForTest = cudf::test::Concat<cudf::test::IntegralTypes,
cudf::test::FloatingPointTypes,
cudf::test::DurationTypes,
cudf::test::FixedPointTypes>;

TYPED_TEST_CASE(TypedCollectListTest, TypesForTest);

Expand Down
1 change: 1 addition & 0 deletions cpp/tests/copying/gather_list_tests.cu
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ template <typename T>
class GatherTestListTyped : public cudf::test::BaseFixture {
};
using FixedWidthTypesNotBool = cudf::test::Concat<cudf::test::IntegralTypesNotBool,
cudf::test::FixedPointTypes,
cudf::test::FloatingPointTypes,
cudf::test::DurationTypes,
cudf::test::TimestampTypes>;
Expand Down