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

Use stream_allocator_adaptor constructor instead of factory. #4557

Merged
merged 7 commits into from
Aug 5, 2024
Merged

Use stream_allocator_adaptor constructor instead of factory. #4557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5953e02
Use stream_allocator_adaptor constructor instead of factory.
bdice Jul 26, 2024
42bfd54
No need for stream_allocator_adaptor factory, use the ctor and CTAD
harrism Jul 31, 2024
507777c
Add missing namespace
harrism Jul 31, 2024
899590e
Merge branch 'branch-24.10' into fea-remove-adaptor-factories
harrism Jul 31, 2024
100f627
Merge remote-tracking branch 'upstream/branch-24.10' into rmm-adaptor…
bdice Jul 31, 2024
174a73d
Merge branch 'fea-remove-adaptor-factories' into rmm-adaptor-constructor
bdice Jul 31, 2024
bacd790
Merge branch 'branch-24.10' into rmm-adaptor-constructor
bdice Jul 31, 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
3 changes: 2 additions & 1 deletion cpp/src/prims/key_store.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <cuco/static_set.cuh>

#include <algorithm>
#include <cstddef>
#include <memory>
#include <optional>
#include <type_traits>
Expand Down Expand Up @@ -322,7 +323,7 @@ class key_cuco_store_t {
static_cast<size_t>(static_cast<double>(num_keys) / load_factor),
static_cast<size_t>(num_keys) + 1); // cuco::static_map requires at least one empty slot

auto stream_adapter = rmm::mr::make_stream_allocator_adaptor(
auto stream_adapter = rmm::mr::stream_allocator_adaptor(
rmm::mr::polymorphic_allocator<std::byte>(rmm::mr::get_current_device_resource()), stream);
cuco_store_ =
std::make_unique<cuco_set_type>(cuco_size,
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/prims/kv_store.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ class kv_cuco_store_t {
static_cast<size_t>(static_cast<double>(num_keys) / load_factor),
static_cast<size_t>(num_keys) + 1); // cuco::static_map requires at least one empty slot

auto stream_adapter = rmm::mr::make_stream_allocator_adaptor(
auto stream_adapter = rmm::mr::stream_allocator_adaptor(
rmm::mr::polymorphic_allocator<std::byte>(rmm::mr::get_current_device_resource()), stream);
if constexpr (std::is_arithmetic_v<value_t>) {
cuco_store_ =
Expand Down
Loading