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

Pass std::optional instead of thrust::optional to RMM #2199

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Pass std::optional instead of thrust::optional to RMM #2199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91fbcb7
update thrust::optional to std::optional to align with https://github…
trxcllnt Feb 26, 2024
c4c8f13
remove #include <thrust/optional.h>
trxcllnt Feb 26, 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
10 changes: 5 additions & 5 deletions cpp/include/raft/core/device_resources_manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <rmm/cuda_stream_pool.hpp>
#include <rmm/mr/device/cuda_memory_resource.hpp>
#include <rmm/mr/device/per_device_resource.hpp>
#include <thrust/optional.h>

namespace raft {

/**
Expand Down Expand Up @@ -116,11 +116,11 @@ struct device_resources_manager {
// this initial size for the pool in bytes. Must be a multiple of 256.
// If nullopt, use half of the available memory on the current
// device.
thrust::optional<std::size_t> init_mem_pool_size{thrust::nullopt};
std::optional<std::size_t> init_mem_pool_size{std::nullopt};
// If set to any non-zero value, create a memory pool with this
// maximum size. If nullopt, use up to the entire available memory of the
// device
thrust::optional<std::size_t> max_mem_pool_size{std::size_t{}};
std::optional<std::size_t> max_mem_pool_size{std::size_t{}};
// Limit on workspace memory for the returned device_resources object
std::optional<std::size_t> workspace_allocation_limit{std::nullopt};
// Optional specification of separate workspace memory resources for each
Expand Down Expand Up @@ -360,7 +360,7 @@ struct device_resources_manager {
if (memory_limit) {
params_.max_mem_pool_size.emplace(*memory_limit);
} else {
params_.max_mem_pool_size = thrust::nullopt;
params_.max_mem_pool_size = std::nullopt;
}
}
}
Expand All @@ -377,7 +377,7 @@ struct device_resources_manager {
if (init_memory) {
params_.init_mem_pool_size.emplace(*init_memory);
} else {
params_.init_mem_pool_size = thrust::nullopt;
params_.init_mem_pool_size = std::nullopt;
}
}
}
Expand Down
Loading