diff --git a/cgmanifest.json b/cgmanifest.json index b462cd06947ed..7cf507425dd8b 100644 --- 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 index 0b5adab18b81a..673aef09ba6cb 160000 --- a/cmake/external/onnx +++ b/cmake/external/onnx @@ -1 +1 @@ -Subproject commit 0b5adab18b81aceb773731353db85ee118c0322a +Subproject commit 673aef09ba6cb56e7c34f807255f8372f253c0ed diff --git a/onnxruntime/core/session/environment.cc b/onnxruntime/core/session/environment.cc index f2eb9a58a4a28..ce732a205c026 100644 --- 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 index 194428a7b19ef..1a81e88fbe0ac 100644 --- 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 index 8d29f0540187e..790693f3d89d4 100755 --- 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})"