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

* Update ONNX submodule to ONNX 1.7 release candidate 2.

* fix build error.

* Update ONNX submodule to latest and disable preview op tests.
This commit is contained in:
M. Zeeshan Siddiqui 2020-05-05 15:08:40 -07:00 committed by GitHub
parent 5db30a470e
commit ef4d73e887
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 5 deletions

View file

@ -49,7 +49,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "0b5adab18b81aceb773731353db85ee118c0322a",
"commitHash": "673aef09ba6cb56e7c34f807255f8372f253c0ed",
"repositoryUrl": "https://github.com/onnx/onnx.git"
}
}

2
cmake/external/onnx vendored

@ -1 +1 @@
Subproject commit 0b5adab18b81aceb773731353db85ee118c0322a
Subproject commit 673aef09ba6cb56e7c34f807255f8372f253c0ed

View file

@ -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

View file

@ -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) {

View file

@ -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})"