Skip to content

Handle implicit usage of an initializer from multiple levels above a subgraph #200

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
skottmckay merged 1 commit into from
Dec 18, 2018
Merged

Handle implicit usage of an initializer from multiple levels above a subgraph #200

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
20 changes: 4 additions & 16 deletions onnxruntime/core/graph/graph.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,12 +892,12 @@ Status Graph::BuildConnections(std::vector<std::string>& outer_scope_node_args_c
subgraph->BuildConnections(node_args_consumed);

for (auto& node_arg_name : node_args_consumed) {
bool node_arg_in_parent_graph = false;
auto node_arg = GetNodeArg(node_arg_name);

if (node_arg == nullptr) {
// it's a node arg from outside this graph's scope, so add that to the list we return
// so that we can add the dependency at the next level up
// so that we can add the dependency at the next level up. this happens if you have multiple
// levels of subgraphs between the graph with the original NodeArg and the subgraph with implicit usage.
outer_scope_node_args_consumed.push_back(node_arg_name);

if (!parent_graph_) {
Expand All @@ -917,8 +917,6 @@ Status Graph::BuildConnections(std::vector<std::string>& outer_scope_node_args_c
"Failed to find NodeArg in all parent graphs. Name=", node_arg_name,
" Graph may not conform to the ONNX spec and contain initializers that are not graph inputs.");
}

node_arg_in_parent_graph = true;
}

// add it to the Node's list of implicit inputs
Expand All @@ -932,18 +930,8 @@ Status Graph::BuildConnections(std::vector<std::string>& outer_scope_node_args_c
input_slot_index += static_cast<int>(iter - implicit_inputs.cbegin());
}

if (node_arg_in_parent_graph ||
resolve_context_.inputs_and_initializers.find(node_arg_name) !=
resolve_context_.inputs_and_initializers.cend()) {
// no connection required if it's an input or initializer.
// if the node arg is from a parent graph we link the nodes in the parent graph by passing the
// node_arg_name back up in outer_scope_node_args_consumed

} else {
// if it's an output nodearg in this graph we need to create a link to the node the output is coming from
auto entry = resolve_context_.output_args.find(node_arg_name);
ORT_ENFORCE(entry != resolve_context_.output_args.end());

auto entry = resolve_context_.output_args.find(node_arg_name);
if (entry != resolve_context_.output_args.end()) {
// Create relationship between this node (node), and the node providing the output (output_node).
Node& output_node = *entry->second.first;
AddEdge(output_node.Index(), node->Index(), entry->second.second, input_slot_index);
Expand Down