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

Jump to bottom

Do not initialise data structures to maximum possible tree size. #7919

Merged
merged 2 commits into from May 19, 2022
Merged

Do not initialise data structures to maximum possible tree size. #7919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4e9d2f
Do not initialise data structures to maximum possible tree size.
RAMitchell May 19, 2022
4079314
Review comment
RAMitchell May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/tree/split_evaluator.h
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
#include <utility>
#include <vector>
#include <limits>
#include <algorithm>

#include "xgboost/tree_model.h"
#include "xgboost/host_device_vector.h"
Expand Down Expand Up @@ -49,8 +50,9 @@ class TreeEvaluator {
} else {
monotone_.HostVector() = p.monotone_constraints;
monotone_.HostVector().resize(n_features, 0);
lower_bounds_.Resize(p.MaxNodes(), -std::numeric_limits<float>::max());
upper_bounds_.Resize(p.MaxNodes(), std::numeric_limits<float>::max());
// Initialised to some small size, can grow if needed
lower_bounds_.Resize(256, -std::numeric_limits<float>::max());
upper_bounds_.Resize(256, std::numeric_limits<float>::max());
has_constraint_ = true;
}

Expand Down Expand Up @@ -157,6 +159,15 @@ class TreeEvaluator {
if (!has_constraint_) {
return;
}

auto max_nidx = std::max(leftid, rightid);
if (lower_bounds_.Size() <= max_nidx) {
RAMitchell marked this conversation as resolved.
Show resolved Hide resolved
lower_bounds_.Resize(max_nidx * 2 + 1, -std::numeric_limits<float>::max());
}
if (upper_bounds_.Size() <= max_nidx) {
upper_bounds_.Resize(max_nidx * 2 + 1, std::numeric_limits<float>::max());
}

common::Transform<>::Init(
[=] XGBOOST_DEVICE(size_t, common::Span<float> lower,
common::Span<float> upper,
Expand Down
17 changes: 11 additions & 6 deletions src/tree/updater_gpu_hist.cu
View file
Open in desktop
Expand Up @@ -223,7 +223,7 @@ struct GPUHistMakerDevice {
// Copy assigning an empty vector causes an exception in MSVC debug builds
monotone_constraints = param.monotone_constraints;
}
node_sum_gradients.resize(param.MaxNodes());
node_sum_gradients.resize(256);

// Init histogram
hist.Init(ctx_->gpu_id, page->Cuts().TotalBins());
Expand Down Expand Up @@ -614,12 +614,17 @@ struct GPUHistMakerDevice {
}
evaluator_.ApplyTreeSplit(candidate, p_tree);

node_sum_gradients[tree[candidate.nid].LeftChild()] = candidate.split.left_sum;
node_sum_gradients[tree[candidate.nid].RightChild()] = candidate.split.right_sum;
const auto& parent = tree[candidate.nid];
std::size_t max_nidx = std::max(parent.LeftChild(), parent.RightChild());
// Grow as needed
if (node_sum_gradients.size() <= max_nidx) {
node_sum_gradients.resize(max_nidx * 2 + 1);
}
node_sum_gradients[parent.LeftChild()] = candidate.split.left_sum;
node_sum_gradients[parent.RightChild()] = candidate.split.right_sum;

interaction_constraints.Split(candidate.nid, tree[candidate.nid].SplitIndex(),
tree[candidate.nid].LeftChild(),
tree[candidate.nid].RightChild());
interaction_constraints.Split(candidate.nid, parent.SplitIndex(), parent.LeftChild(),
parent.RightChild());
}

GPUExpandEntry InitRoot(RegTree* p_tree, dh::AllReducer* reducer) {
Expand Down