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

Adding workspace resource #1137

Merged
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
11 changes: 10 additions & 1 deletion cpp/include/raft/core/device_resources.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <raft/core/resource/cusolver_sp_handle.hpp>
#include <raft/core/resource/cusparse_handle.hpp>
#include <raft/core/resource/device_id.hpp>
#include <raft/core/resource/device_memory_resource.hpp>
#include <raft/core/resource/device_properties.hpp>
#include <raft/core/resource/sub_comms.hpp>
#include <raft/core/resource/thrust_policy.hpp>
Expand Down Expand Up @@ -73,14 +74,17 @@ class device_resources : public resources {
* @param[in] stream_pool the stream pool used (which has default of nullptr if unspecified)
*/
device_resources(rmm::cuda_stream_view stream_view = rmm::cuda_stream_per_thread,
std::shared_ptr<rmm::cuda_stream_pool> stream_pool = {nullptr})
std::shared_ptr<rmm::cuda_stream_pool> stream_pool = {nullptr},
rmm::mr::device_memory_resource* workspace_resource = nullptr)
: resources{}
{
resources::add_resource_factory(std::make_shared<resource::device_id_resource_factory>());
resources::add_resource_factory(
std::make_shared<resource::cuda_stream_resource_factory>(stream_view));
resources::add_resource_factory(
std::make_shared<resource::cuda_stream_pool_resource_factory>(stream_pool));
resources::add_resource_factory(
std::make_shared<resource::workspace_resource_factory>(workspace_resource));
}

/** Destroys all held-up resources */
Expand Down Expand Up @@ -206,6 +210,11 @@ class device_resources : public resources {
return resource::get_subcomm(*this, key);
}

const rmm::mr::device_memory_resource* get_workspace_resource() const
{
return resource::get_workspace_resource(*this);
}

bool comms_initialized() const { return resource::comms_initialized(*this); }

const cudaDeviceProp& get_device_properties() const
Expand Down
7 changes: 4 additions & 3 deletions cpp/include/raft/core/handle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ class handle_t : public raft::device_resources {
* unspecified)
* @param[in] stream_pool the stream pool used (which has default of nullptr if unspecified)
*/
handle_t(rmm::cuda_stream_view stream_view = rmm::cuda_stream_per_thread,
std::shared_ptr<rmm::cuda_stream_pool> stream_pool = {nullptr})
: device_resources{stream_view, stream_pool}
handle_t(rmm::cuda_stream_view stream_view = rmm::cuda_stream_per_thread,
std::shared_ptr<rmm::cuda_stream_pool> stream_pool = {nullptr},
rmm::mr::device_memory_resource* workspace_resource = nullptr)
: device_resources{stream_view, stream_pool, workspace_resource}
{
}

Expand Down
76 changes: 76 additions & 0 deletions cpp/include/raft/core/resource/device_memory_resource.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) 2022-2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once

#include <raft/core/resource/resource_types.hpp>
#include <raft/core/resources.hpp>
#include <rmm/mr/device/device_memory_resource.hpp>

namespace raft::resource {
class device_memory_resource : public resource {
public:
device_memory_resource(rmm::mr::device_memory_resource* mr_ = nullptr) : mr(mr_)
{
if (mr_ == nullptr) { mr = rmm::mr::get_current_device_resource(); }
}
void* get_resource() override { return mr; }

~device_memory_resource() override {}

private:
rmm::mr::device_memory_resource* mr;
};

/**
* Factory that knows how to construct a specific raft::resource to populate
* the resources instance.
*/
class workspace_resource_factory : public resource_factory {
public:
workspace_resource_factory(rmm::mr::device_memory_resource* mr_ = nullptr) : mr(mr_) {}
resource_type get_resource_type() override { return resource_type::WORKSPACE_RESOURCE; }
resource* make_resource() override { return new device_memory_resource(mr); }

private:
rmm::mr::device_memory_resource* mr;
};

/**
* Load a temp workspace resource from a resources instance (and populate it on the res
* if needed).
* @param res raft resources object for managing resources
* @return device memory resource object
*/
inline rmm::mr::device_memory_resource* get_workspace_resource(resources const& res)
{
if (!res.has_resource_factory(resource_type::WORKSPACE_RESOURCE)) {
res.add_resource_factory(std::make_shared<workspace_resource_factory>());
}
return res.get_resource<rmm::mr::device_memory_resource>(resource_type::WORKSPACE_RESOURCE);
};

/**
* Set a temp workspace resource on a resources instance.
*
* @param res raft resources object for managing resources
* @param mr a valid rmm device_memory_resource
* @return
*/
inline void set_workspace_resource(resources const& res, rmm::mr::device_memory_resource* mr)
{
res.add_resource_factory(std::make_shared<workspace_resource_factory>(mr));
};
} // namespace raft::resource
1 change: 1 addition & 0 deletions cpp/include/raft/core/resource/resource_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ enum resource_type {
DEVICE_PROPERTIES, // cuda device properties
DEVICE_ID, // cuda device id
THRUST_POLICY, // thrust execution policy
WORKSPACE_RESOURCE, // rmm device memory resource

LAST_KEY // reserved for the last key
};
Expand Down
20 changes: 20 additions & 0 deletions cpp/test/core/handle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <memory>
#include <raft/core/comms.hpp>
#include <raft/core/handle.hpp>
#include <rmm/mr/device/device_memory_resource.hpp>
#include <unordered_map>

namespace raft {
Expand Down Expand Up @@ -248,4 +249,23 @@ TEST(Raft, SubComms)
ASSERT_EQ(handle.get_subcomm("key2").get_size(), 2);
}

TEST(Raft, WorkspaceResource)
{
handle_t handle;

ASSERT_TRUE(dynamic_cast<const rmm::mr::pool_memory_resource<rmm::mr::device_memory_resource>*>(
handle.get_workspace_resource()) == nullptr);
ASSERT_EQ(rmm::mr::get_current_device_resource(), handle.get_workspace_resource());

auto pool_mr = new rmm::mr::pool_memory_resource(rmm::mr::get_current_device_resource());
std::shared_ptr<rmm::cuda_stream_pool> pool = {nullptr};
handle_t handle2(rmm::cuda_stream_per_thread, pool, pool_mr);

ASSERT_TRUE(dynamic_cast<const rmm::mr::pool_memory_resource<rmm::mr::device_memory_resource>*>(
handle2.get_workspace_resource()) != nullptr);
ASSERT_EQ(pool_mr, handle2.get_workspace_resource());

delete pool_mr;
}

} // namespace raft