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

Jump to bottom

Support scatter() for list columns #6768

Merged
merged 15 commits into from
Nov 21, 2020
Merged

Support scatter() for list columns #6768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5741f69
[scatter<list>] Initial impl:
mythrocks Nov 3, 2020
3cac246
[scatter<list>] Minor refactoring:
mythrocks Nov 14, 2020
bce24b4
[scatter<list>] Changelog, + clang-format.
mythrocks Nov 15, 2020
a7dc525
[scatter<list>] Switch to rmm::cuda_stream_view
mythrocks Nov 16, 2020
c764de2
[scatter<list>] Move label_t to scoped label_type
mythrocks Nov 16, 2020
b1caeef
[scatter<list>] Switch from device_vector to device_uvector.
mythrocks Nov 16, 2020
2da4f15
[scatter<list>] Fix documentation. Switch size types to size_type.
mythrocks Nov 16, 2020
09325c7
[scatter<list>] Fix documentation.
mythrocks Nov 16, 2020
4b6a54f
[scatter<list>] More documentation fixes, const correctness
mythrocks Nov 16, 2020
bf6993c
[scatter<list>] Switch device_vector to device_uvector for string_view
mythrocks Nov 18, 2020
203e806
[scatter<list>] Code formatting
mythrocks Nov 18, 2020
c51f7f4
Merge remote-tracking branch 'origin/branch-0.17' into scatter-lists
mythrocks Nov 19, 2020
97e00f3
Merge remote-tracking branch 'origin/branch-0.17' into scatter-lists
mythrocks Nov 20, 2020
8538d81
Merge remote-tracking branch 'origin/branch-0.17' into scatter-lists
mythrocks Nov 20, 2020
845ea85
List scatter: Rebase for cuda_stream_view changes.
mythrocks Nov 20, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- PR #6652 Add support for struct columns in concatenate
- PR #6675 Add DecimalDtype to cuDF
- PR #6739 Add Java bindings for is_timestamp
- PR #6768 Add support for scatter() on list columns
- PR #6796 Add create_metadata_file in dask_cudf
- PR #6765 Cupy fallback for __array_function__ and __array_ufunc__ for cudf.Series

Expand Down
15 changes: 15 additions & 0 deletions cpp/include/cudf/detail/scatter.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <cudf/dictionary/detail/update_keys.hpp>
#include <cudf/dictionary/dictionary_column_view.hpp>
#include <cudf/dictionary/dictionary_factories.hpp>
#include <cudf/lists/detail/scatter.cuh>
#include <cudf/strings/detail/scatter.cuh>
#include <cudf/strings/string_view.cuh>
#include <cudf/utilities/traits.hpp>
Expand Down Expand Up @@ -120,6 +121,20 @@ struct column_scatterer_impl<string_view, MapIterator> {
}
};

template <typename MapIterator>
struct column_scatterer_impl<list_view, MapIterator> {
std::unique_ptr<column> operator()(column_view const& source,
MapIterator scatter_map_begin,
MapIterator scatter_map_end,
column_view const& target,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr) const
{
return cudf::lists::detail::scatter(
source, scatter_map_begin, scatter_map_end, target, stream, mr);
}
};

template <typename MapIterator>
struct column_scatterer {
template <typename Element>
Expand Down
Loading