Update ONNX submodule to ONNX 1.7 release candidate 2. (microsoft#3818)

* Update ONNX submodule to ONNX 1.7 release candidate 2. * fix build error. * Update ONNX submodule to latest and disable preview op tests.
shaoboyan091 · May 5, 2020 · ef4d73e · ef4d73e
1 parent 5db30a4
commit ef4d73e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -49,7 +49,7 @@
          "component": {
             "type": "git",
             "git": {
-               "commitHash": "0b5adab18b81aceb773731353db85ee118c0322a",
+               "commitHash": "673aef09ba6cb56e7c34f807255f8372f253c0ed",
                "repositoryUrl": "https://github.com/onnx/onnx.git"
             }
          }

diff --git a/cmake/external/onnx b/cmake/external/onnx
diff --git a/onnxruntime/core/session/environment.cc b/onnxruntime/core/session/environment.cc
@@ -6,8 +6,8 @@
 #include "core/graph/constants.h"
 #include "core/graph/op.h"
 #include "onnx/defs/operator_sets.h"
-#include "onnx/defs/operator_sets-ml.h"
-#include "onnx/defs/operator_sets-training.h"
+#include "onnx/defs/operator_sets_ml.h"
+#include "onnx/defs/operator_sets_training.h"
 #ifndef DISABLE_CONTRIB_OPS
 #include "core/graph/contrib_ops/contrib_defs.h"
 #endif

diff --git a/onnxruntime/test/onnx/main.cc b/onnxruntime/test/onnx/main.cc
@@ -503,6 +503,15 @@ int real_main(int argc, char* argv[], Ort::Env& env) {
       {"training_dropout_default", "result differs", {}},       // Temporary, subsequent PR will remove this.
       {"training_dropout_default_mask", "result differs", {}},  // Temporary, subsequent PR will remove this.
       {"training_dropout_mask", "result differs", {}},          // Temporary, subsequent PR will remove this.
+      {"adagrad", "not a registered function/op", {}},          // Op not registered.
+      {"adagrad_multiple", "not a registered function/op", {}}, // Op not registered.
+      {"adam", "not a registered function/op", {}},  // Op not registered.
+      {"adam_multiple", "not a registered function/op", {}}, // Op not registered.
+      {"gradient_of_add", "not a registered function/op", {}}, // Op not registered.
+      {"gradient_of_add_and_mul", "not a registered function/op", {}}, // Op not registered.
+      {"momentum", "not a registered function/op", {}},  // Op not registered.
+      {"momentum_multiple", "not a registered function/op", {}}, // Op not registered.
+      {"nesterov_momentum", "not a registered function/op", {}}, // Op not registered.
   };
 
   if (enable_ngraph) {

diff --git a/tools/ci_build/github/linux/docker/scripts/install_onnx.sh b/tools/ci_build/github/linux/docker/scripts/install_onnx.sh
@@ -31,7 +31,7 @@ version2tag=(5af210ca8a1c73aa6bae8754c9346ec54d0a756e-onnx123
              9e55ace55aad1ada27516038dfbdc66a8a0763db-onnx141
              7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef-onnx150
              1facb4c1bb9cc2107d4dbaf9fd647fefdbbeb0ab-onnx161
-             0b5adab18b81aceb773731353db85ee118c0322a-onnxtip) #1.7.0
+             673aef09ba6cb56e7c34f807255f8372f253c0ed-onnxtip) #1.7.0
 for v2t in ${version2tag[*]}; do
   onnx_version="$(cut -d'-' -f1<<<${v2t})"
   onnx_tag="$(cut -d'-' -f2<<<${v2t})"
+12 −12		docs/Changelog.md
+37 −37		docs/Operators.md
+20 −20		docs/TestCoverage.md
+7 −6		onnx/backend/test/case/model/gradient.py
+5 −4		onnx/backend/test/case/node/adagrad.py
+5 −4		onnx/backend/test/case/node/adam.py
+7 −6		onnx/backend/test/case/node/momentum.py
+ −		onnx/backend/test/data/node/test_adagrad/model.onnx
+ −		onnx/backend/test/data/node/test_adagrad_multiple/model.onnx
+ −		onnx/backend/test/data/node/test_adam/model.onnx
+ −		onnx/backend/test/data/node/test_adam_multiple/model.onnx
+ −		onnx/backend/test/data/node/test_momentum/model.onnx
+ −		onnx/backend/test/data/node/test_momentum_multiple/model.onnx
+ −		onnx/backend/test/data/node/test_nesterov_momentum/model.onnx
+ −		onnx/backend/test/data/simple/test_gradient_of_add/model.onnx
+ −		onnx/backend/test/data/simple/test_gradient_of_add_and_mul/model.onnx
+1 −0		onnx/common/constants.h
+1 −0		onnx/defs/__init__.py
+0 −34		onnx/defs/operator_sets-training.h
+0 −0		onnx/defs/operator_sets_ml.h
+38 −0		onnx/defs/operator_sets_preview.h
+24 −0		onnx/defs/operator_sets_training.h
+6 −2		onnx/defs/schema.cc
+11 −0		onnx/defs/schema.h
+5 −5		onnx/defs/training/defs.cc
+42 −41		onnx/test/shape_inference_test.py
+6 −2		setup.py