saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-29 20:14:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix function inliner bug re. outer-scope names (#14734)

Browse source 
### Description

Fix the function inliner logic for renaming variables. Typically, a
FunctionProto does not contain references to outer-scope names. However,
special cases, such as the function-expansion of SequenceMap, can
generate such FunctionProtos. Extend the renaming logic to ensure that
references to outer-scope names are not renamed.

### Motivation and Context
Fixes https://github.com/onnx/onnx/issues/4892

Signed-off-by: Ganesan Ramalingam <grama@microsoft.com>
This commit is contained in:
G. Ramalingam 2023-03-02 12:08:37 -08:00 committed by GitHub
parent 603026fb84
commit 2facc5efe6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
onnxruntime/core/graph/function_utils.cc
View file

@ -348,7 +348,7 @@ class Inliner {
name = new_name;
}
void rename(std::string& name) {
void rename(std::string& name, bool is_new_def) {
if (name.empty()) return;
for (auto i = rename_scopes.size(); i > 0; --i) {
const auto& map = rename_scopes[i - 1];
@ -358,7 +358,10 @@ class Inliner {
return;
}
}
make_unique(name);
if (is_new_def) {
make_unique(name);
}
// Otherwise, it is a reference to an outer-scope variable that should not be renamed.
}
template <bool isOutput>
@ -396,10 +399,10 @@ class Inliner {
n.set_name(prefix + n.name());
for (auto& x : *n.mutable_input()) {
rename(x);
rename(x, false);
}
for (auto& y : *n.mutable_output()) {
rename(y);
rename(y, true);
}
auto& attributes = *n.mutable_attribute();
for (auto attr_iter = attributes.begin(); attr_iter != attributes.end();) {

20
onnxruntime/test/framework/function_test.cc
View file

@ -352,5 +352,25 @@ TEST(FunctionTest, Variadics) {
ASSERT_STATUS_OK(session_object.Load(model_uri));
ASSERT_STATUS_OK(session_object.Initialize());
}
// Test use of outer-scope names inside sub-graphs in functions that are inlined.
TEST(FunctionTest, OuterScopeName) {
const char* code = R"(
<ir_version: 8, opset_import: [ "" : 17 ]>
agraph (float[N] x) => (float[N] y)
{
xseq = SequenceConstruct (x)
zeros = Constant <value = float[3] {0.0, 0.0, 0.0}> ()
yseq = SequenceMap (xseq) <body =
zeropad (float[3] lx) => (float[6] ly) {
ly = Concat <axis = 0> (lx, zeros)
}>
zero = Constant <value = int64{0}> ()
y = SequenceAt (yseq, zero)
}
)";
Check(code, "x", {1.0, 2.0, 3.0}, "y", {1.0, 2.0, 3.0, 0.0, 0.0, 0.0});
}
} // namespace test
} // namespace onnxruntime