Skip to content

Move buffers into decision_forest, to avoid triggering copy constructor #196

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

Merged
chyunsu3 merged 1 commit into from
Aug 13, 2026
Merged

Move buffers into decision_forest, to avoid triggering copy constructor #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions cpp/include/nvforest/decision_forest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <cstddef>
#include <limits>
#include <optional>
#include <utility>
#include <variant>

namespace nvforest {
Expand Down Expand Up @@ -161,12 +162,12 @@ struct decision_forest {
element_op elem_postproc = element_op::disable,
io_type average_factor = io_type{1},
io_type postproc_constant = io_type{1})
: nodes_{nodes},
root_node_indexes_{root_node_indexes},
node_id_mapping_{node_id_mapping},
bias_{bias},
vector_output_{vector_output},
categorical_storage_{categorical_storage},
: nodes_{std::move(nodes)},
root_node_indexes_{std::move(root_node_indexes)},
node_id_mapping_{std::move(node_id_mapping)},
bias_{std::move(bias)},
vector_output_{std::move(vector_output)},
categorical_storage_{std::move(categorical_storage)},
num_features_{num_features},
num_outputs_{num_outputs},
leaf_size_{leaf_size},
Expand All @@ -176,15 +177,15 @@ struct decision_forest {
average_factor_{average_factor},
postproc_constant_{postproc_constant}
{
if (nodes.memory_type() != root_node_indexes.memory_type()) {
if (nodes_.memory_type() != root_node_indexes_.memory_type()) {
throw detail::mem_type_mismatch(
"Nodes and indexes of forest must both be stored on either host or device");
}
if (nodes.device_index() != root_node_indexes.device_index()) {
if (nodes_.device_index() != root_node_indexes_.device_index()) {
throw detail::mem_type_mismatch(
"Nodes and indexes of forest must both be stored on same device");
}
detail::initialize_device<forest_type>(nodes.device());
detail::initialize_device<forest_type>(nodes_.device());
}

/** The number of features per row expected by the model */
Expand Down
3 changes: 2 additions & 1 deletion cpp/include/nvforest/forest_model.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include <cstddef>
#include <type_traits>
#include <utility>
#include <variant>

namespace nvforest {
Expand All @@ -34,7 +35,7 @@ namespace nvforest {
struct forest_model {
/** Wrap a decision_forest in a full forest_model object */
forest_model(decision_forest_variant&& forest = decision_forest_variant{})
: decision_forest_{forest}
: decision_forest_{std::move(forest)}
{
}

Expand Down
Loading