Update ONNX to d94f99d21a9a0820d58966410ceaf525132f85f1 to pickup cha…

…nge to checker that makes ssd_mobilenet model load 20x faster by avoiding unnecessary copies. (microsoft#1307)
iiSeymour · Jun 27, 2019 · 0951f53 · 0951f53
1 parent 59de37a
commit 0951f53
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -49,7 +49,7 @@
          "component":{
             "type":"git",
             "git": {
-              "commitHash": "01f77251b74438bcde5c40a2533bdd289f257ea1",
+              "commitHash": "d94f99d21a9a0820d58966410ceaf525132f85f1",
               "repositoryUrl": "https://github.com/onnx/onnx.git"
             }
          }

diff --git a/cmake/external/onnx b/cmake/external/onnx
diff --git a/onnxruntime/core/graph/graph.cc b/onnxruntime/core/graph/graph.cc
@@ -1321,8 +1321,8 @@ Status Graph::InferAndVerifySubgraphTypes(const Node& node, Graph& subgraph,
                              " inputs and requires ", num_required_subgraph_inputs,
                              " inputs. Either provide all subgraph inputs, or just the required inputs.");
     }
-      subgraph_inputs = &required_subgraph_inputs;
-      num_subgraph_inputs = num_required_subgraph_inputs;
+    subgraph_inputs = &required_subgraph_inputs;
+    num_subgraph_inputs = num_required_subgraph_inputs;
   }
 
   // apply type/shape info to the subgraph's inputs
@@ -1619,7 +1619,9 @@ Status Graph::VerifyNodeAndOpMatch() {
   ctx.set_opset_imports(DomainToVersionMap());
   ctx.set_schema_registry(schema_registry_.get());
 
-  LexicalScopeContext lsc{resolve_context_.inputs_and_initializers};
+  LexicalScopeContext lsc;
+  lsc.output_names.insert(resolve_context_.inputs_and_initializers.cbegin(),
+                          resolve_context_.inputs_and_initializers.cend());
 
   // technically we could add values from Node.GetDefinitions().implicit_input_defs on a per-node basis inside
   // the below loop so that we only check against the specific outer dependencies of the node.

diff --git a/tools/ci_build/github/linux/docker/scripts/install_onnx.sh b/tools/ci_build/github/linux/docker/scripts/install_onnx.sh
@@ -13,7 +13,7 @@ version2tag=(5af210ca8a1c73aa6bae8754c9346ec54d0a756e-onnx123
              bae6333e149a59a3faa9c4d9c44974373dcf5256-onnx130
              9e55ace55aad1ada27516038dfbdc66a8a0763db-onnx141
              7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef-onnx150
-             01f77251b74438bcde5c40a2533bdd289f257ea1-onnxtip)
+             d94f99d21a9a0820d58966410ceaf525132f85f1-onnxtip)
 for v2t in ${version2tag[*]}; do
   onnx_version="$(cut -d'-' -f1<<<${v2t})"
   onnx_tag="$(cut -d'-' -f2<<<${v2t})"