Skip to content

Update the GraphProto for subgraphs when saving the Graph. #647

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 7 commits into from
Oct 23, 2019
Merged

Update the GraphProto for subgraphs when saving the Graph. #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8edb90f
Update the GraphProto for subgraphs when saving the Graph. This is re…
skottmckay Mar 18, 2019
8208835
Add a couple of unsaved cleanups.
skottmckay Mar 18, 2019
9e194b8
Merge with master
skottmckay May 25, 2019
2570810
Merge
skottmckay Jul 29, 2019
cabad3b
Merge
skottmckay Jul 29, 2019
8a0347f
Merge remote-tracking branch 'origin/master' into skottmckay/UpdateSu…
skottmckay Oct 22, 2019
dd3fe8f
Merge branch 'skottmckay/UpdateSubgraphsWhenSavingGraph' of https://g…
skottmckay Oct 22, 2019
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
8 changes: 6 additions & 2 deletions include/onnxruntime/core/graph/graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,12 @@ class Node {
/** Sets the execution ProviderType that this Node will be executed by. */
void SetExecutionProviderType(ProviderType execution_provider_type);

/** Gets the NodeProto representation of this Node. */
void ToProto(ONNX_NAMESPACE::NodeProto& proto) const;
/** Gets the NodeProto representation of this Node.
@param update_subgraphs Update the GraphProto values for any subgraphs in the returned NodeProto.
If graph optimization has been run this is most likely required
to ensure the complete Graph is valid.
*/
void ToProto(ONNX_NAMESPACE::NodeProto& proto, bool update_subgraphs = false) const;

/** Call the provided function for all explicit inputs, implicit inputs, and outputs of this Node.
If the NodeArg is an explicit or implicit input, is_input will be true when func is called.
Expand Down
24 changes: 15 additions & 9 deletions onnxruntime/core/graph/graph.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,21 +399,25 @@ void Node::SetExecutionProviderType(ProviderType execution_provider_type) {
execution_provider_type_ = execution_provider_type;
}

void Node::ToProto(NodeProto& proto) const {
// Set name.
void Node::ToProto(NodeProto& proto, bool update_subgraphs) const {
proto.set_name(name_);
// Set op type.
proto.set_op_type(op_type_);
// Set op domain;
proto.set_domain(domain_);
// Set doc string.
proto.set_doc_string(description_);

if (!domain_.empty())
proto.set_domain(domain_);

if (!description_.empty())
proto.set_doc_string(description_);

// Set attributes.
proto.clear_attribute();
for (const auto& attribute : attributes_) {
const gsl::not_null<AttributeProto*> attr{proto.add_attribute()};
*attr = attribute.second;
*attr = attribute.second; // copy
if (update_subgraphs && attr->has_g()) {
attr->clear_g();
*attr->mutable_g() = attr_to_subgraph_map_.find(attribute.first)->second->ToGraphProto();
}
}

// Set inputs' definitions.
Expand Down Expand Up @@ -2327,7 +2331,9 @@ void Graph::ToGraphProtoInternal(ONNX_NAMESPACE::GraphProto& graph_proto) const
for (auto& node_idx : graph_viewer.GetNodesInTopologicalOrder()) {
const gsl::not_null<NodeProto*> node_proto{graph_proto.add_node()};
const gsl::not_null<const Node*> p_node{GetNode(node_idx)};
p_node->ToProto(*node_proto);
// we need to update any GraphProto attributes for subgraphs so that any changes made by things
// such as the optimizers are captured. otherwise we can end up saving an invalid graph.
p_node->ToProto(*node_proto, /* update_subgraphs */ true);
}
}

Expand Down