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

Change rmm::exec_policy to take async_resource_ref #1449

Merged
merged 4 commits into from
Feb 2, 2024
Merged

Change rmm::exec_policy to take async_resource_ref #1449

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aba5c97
Move `rmm::exec_policy` over to `async_resource_ref`
miscco Jan 30, 2024
0e251a4
Merge branch 'branch-24.04' into refactor_exec_policy
miscco Feb 1, 2024
152243c
Adopt `rmm::device_async_resource_ref` alias
miscco Feb 1, 2024
6e58efa
Do not use `rmm::` inside `rmm` namespace itself
miscco Feb 1, 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
20 changes: 10 additions & 10 deletions include/rmm/exec_policy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2021, NVIDIA CORPORATION.
* Copyright (c) 2020-2024, 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 All @@ -23,6 +23,7 @@

#include <rmm/cuda_stream_view.hpp>
#include <rmm/mr/device/thrust_allocator_adaptor.hpp>
#include <rmm/resource_ref.hpp>

#include <rmm/detail/thrust_namespace.h>
#include <thrust/system/cuda/execution_policy.h>
Expand All @@ -39,7 +40,7 @@ namespace rmm {
* @brief Synchronous execution policy for allocations using thrust
*/
using thrust_exec_policy_t =
thrust::detail::execute_with_allocator<rmm::mr::thrust_allocator<char>,
thrust::detail::execute_with_allocator<mr::thrust_allocator<char>,
thrust::cuda_cub::execute_on_stream_base>;

/**
Expand All @@ -54,10 +55,10 @@ class exec_policy : public thrust_exec_policy_t {
* @param stream The stream on which to allocate temporary memory
* @param mr The resource to use for allocating temporary memory
*/
explicit exec_policy(cuda_stream_view stream = cuda_stream_default,
rmm::mr::device_memory_resource* mr = mr::get_current_device_resource())
explicit exec_policy(cuda_stream_view stream = cuda_stream_default,
device_async_resource_ref mr = mr::get_current_device_resource())
: thrust_exec_policy_t(
thrust::cuda::par(rmm::mr::thrust_allocator<char>(stream, mr)).on(stream.value()))
thrust::cuda::par(mr::thrust_allocator<char>(stream, mr)).on(stream.value()))
{
}
};
Expand All @@ -68,7 +69,7 @@ class exec_policy : public thrust_exec_policy_t {
* @brief Asynchronous execution policy for allocations using thrust
*/
using thrust_exec_policy_nosync_t =
thrust::detail::execute_with_allocator<rmm::mr::thrust_allocator<char>,
thrust::detail::execute_with_allocator<mr::thrust_allocator<char>,
thrust::cuda_cub::execute_on_stream_nosync_base>;
/**
* @brief Helper class usable as a Thrust CUDA execution policy
Expand All @@ -78,11 +79,10 @@ using thrust_exec_policy_nosync_t =
*/
class exec_policy_nosync : public thrust_exec_policy_nosync_t {
public:
explicit exec_policy_nosync(
cuda_stream_view stream = cuda_stream_default,
rmm::mr::device_memory_resource* mr = mr::get_current_device_resource())
explicit exec_policy_nosync(cuda_stream_view stream = cuda_stream_default,
device_async_resource_ref mr = mr::get_current_device_resource())
: thrust_exec_policy_nosync_t(
thrust::cuda::par_nosync(rmm::mr::thrust_allocator<char>(stream, mr)).on(stream.value()))
thrust::cuda::par_nosync(mr::thrust_allocator<char>(stream, mr)).on(stream.value()))
{
}
};
Expand Down
Loading