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

raise an exception when TreeEnsemble request a feature out of boundaries #12859

Merged
merged 3 commits into from
Sep 7, 2022
Merged

raise an exception when TreeEnsemble request a feature out of boundaries #12859

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb2755c
Catch a potential error when the number of featues is low than the fe…
xadupre Sep 5, 2022
0faaad7
add unit test
xadupre Sep 6, 2022
1abc447
remove extra spaces
xadupre Sep 6, 2022
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
12 changes: 12 additions & 0 deletions onnxruntime/core/providers/cpu/ml/tree_ensemble_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class TreeEnsembleCommonAttributes {
AGGREGATE_FUNCTION aggregate_function_;
int64_t n_nodes_;
int64_t max_tree_depth_;
int64_t max_feature_id_;
int64_t n_trees_;
bool same_mode_;
bool has_missing_tracks_;
Expand Down Expand Up @@ -196,12 +197,16 @@ Status TreeEnsembleCommon<InputType, ThresholdType, OutputType>::Init(int parall
nodes_.resize(n_nodes_);
roots_.clear();
std::unordered_map<TreeNodeElementId, TreeNodeElement<ThresholdType>*, TreeNodeElementId::hash_fn> idi;
max_feature_id_ = 0;

for (i = 0, limit = nodes_treeids.size(); i < limit; ++i) {
TreeNodeElement<ThresholdType>& node = nodes_[i];
node.id.tree_id = static_cast<int>(nodes_treeids[i]);
node.id.node_id = static_cast<int>(nodes_nodeids[i]);
node.feature_id = static_cast<int>(nodes_featureids[i]);
if (node.feature_id > max_feature_id_) {
max_feature_id_ = node.feature_id;
}
if (nodes_values_as_tensor.empty()) {
node.value = static_cast<ThresholdType>(nodes_values[i]);
} else {
Expand Down Expand Up @@ -344,8 +349,15 @@ template <typename AGG>
void TreeEnsembleCommon<InputType, ThresholdType, OutputType>::ComputeAgg(concurrency::ThreadPool* ttp,
const Tensor* X, Tensor* Z,
Tensor* label, const AGG& agg) const {
if (X->Shape().NumDimensions() > 2) {
ORT_THROW("TreeEnsemble only works on 1D, 2D tensors.");
}
int64_t stride = X->Shape().NumDimensions() == 1 ? X->Shape()[0] : X->Shape()[1];
int64_t N = X->Shape().NumDimensions() == 1 ? 1 : X->Shape()[0];
int64_t C = X->Shape().NumDimensions() == 2 ? X->Shape()[1] : 1;
if (max_feature_id_ >= C) {
ORT_THROW("One path in the graph requests feature ", max_feature_id_, " but input tensor has ", C, " features.");
}
OutputType* z_data = Z->MutableData<OutputType>();

const InputType* x_data = X->Data<InputType>();
Expand Down