Skip to content

Commit

Permalink
Update onnx commit (#949)
Browse files Browse the repository at this point in the history 
* Update onnx commit

* disable failing tests which don't have to be fixed for this release
  • Loading branch information
@askhade
askhade authored May 1, 2019
1 parent d28c35d commit bf859a9
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"component":{
"type":"git",
"git":{
"commitHash":"27d4b617e7097cda7d0d4c45ff2b09d248f33179",
"commitHash":"7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef",
"repositoryUrl":"https://github.com/onnx/onnx.git"
}
}
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/onnx
Submodule onnx updated 75 files
+1 −1 .travis/script.sh
+1 −1 VERSION_NUMBER
+12 −0 docs/ManagingExperimentalOps.md
+53 −0 docs/OnnxReleases.md
+208 −16 docs/Operators.md
+191 −17 docs/TestCoverage.md
+63 −0 docs/TypeAnnotations.md
+1 −0 docs/Versioning.md
+43 −0 docs/proposals/ArchiveFileFormatProposal.md
+19 −0 docs/proposals/FunctionsProposal.md
+67 −0 docs/proposals/NLPinONNXproposal.md
+114 −0 docs/proposals/ONNXIFIproposal.md
+152 −14 onnx/backend/test/case/node/mod.py
+2 −2 onnx/backend/test/data/node/test_mod_broadcast/model.onnx
+ − onnx/backend/test/data/node/test_mod_broadcast/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_broadcast/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_broadcast/test_data_set_0/output_0.pb
+0 −16 onnx/backend/test/data/node/test_mod_float_mixed_sign_example/model.onnx
+ − onnx/backend/test/data/node/test_mod_float_mixed_sign_example/test_data_set_0/output_0.pb
+ − onnx/backend/test/data/node/test_mod_fmod_mixed_sign_example/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_fmod_mixed_sign_example/test_data_set_0/input_1.pb
+17 −0 onnx/backend/test/data/node/test_mod_int64_fmod/model.onnx
+ − onnx/backend/test/data/node/test_mod_int64_fmod/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_int64_fmod/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_int64_fmod/test_data_set_0/output_0.pb
+0 −16 onnx/backend/test/data/node/test_mod_int64_mixed_sign_example/model.onnx
+20 −0 onnx/backend/test/data/node/test_mod_mixed_sign_float16/model.onnx
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float16/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float16/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float16/test_data_set_0/output_0.pb
+17 −0 onnx/backend/test/data/node/test_mod_mixed_sign_float32/model.onnx
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float32/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float32/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float32/test_data_set_0/output_0.pb
+2 −2 onnx/backend/test/data/node/test_mod_mixed_sign_float64/model.onnx
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float64/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float64/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_float64/test_data_set_0/output_0.pb
+16 −0 onnx/backend/test/data/node/test_mod_mixed_sign_int16/model.onnx
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int16/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int16/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int16/test_data_set_0/output_0.pb
+16 −0 onnx/backend/test/data/node/test_mod_mixed_sign_int32/model.onnx
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int32/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int32/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int32/test_data_set_0/output_0.pb
+16 −0 onnx/backend/test/data/node/test_mod_mixed_sign_int64/model.onnx
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int64/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int64/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int64/test_data_set_0/output_0.pb
+16 −0 onnx/backend/test/data/node/test_mod_mixed_sign_int8/model.onnx
+1 −0 onnx/backend/test/data/node/test_mod_mixed_sign_int8/test_data_set_0/input_0.pb
+1 −0 onnx/backend/test/data/node/test_mod_mixed_sign_int8/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_mixed_sign_int8/test_data_set_0/output_0.pb
+16 −0 onnx/backend/test/data/node/test_mod_uint16/model.onnx
+ − onnx/backend/test/data/node/test_mod_uint16/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_uint16/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_uint16/test_data_set_0/output_0.pb
+16 −0 onnx/backend/test/data/node/test_mod_uint32/model.onnx
+ − onnx/backend/test/data/node/test_mod_uint32/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_uint32/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_uint32/test_data_set_0/output_0.pb
+16 −0 onnx/backend/test/data/node/test_mod_uint64/model.onnx
+ − onnx/backend/test/data/node/test_mod_uint64/test_data_set_0/input_0.pb
+ − onnx/backend/test/data/node/test_mod_uint64/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_uint64/test_data_set_0/output_0.pb
+16 −0 onnx/backend/test/data/node/test_mod_uint8/model.onnx
+1 −0 onnx/backend/test/data/node/test_mod_uint8/test_data_set_0/input_0.pb
+1 −0 onnx/backend/test/data/node/test_mod_uint8/test_data_set_0/input_1.pb
+ − onnx/backend/test/data/node/test_mod_uint8/test_data_set_0/output_0.pb
+5 −4 onnx/defs/nn/defs.cc
+28 −6 onnx/defs/tensor/defs.cc
+29 −6 onnx/defs/tensor/old.cc
+1 −0 onnx/defs/tensor_proto_util.cc
+14 −0 onnx/test/shape_inference_test.py
3 changes: 2 additions & 1 deletion docs/How_To_Update_ONNX_Dev_Notes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ git add onnx
2. Update [cgmanifest.json](/cgmanifest.json)
Search 'https://github.com/onnx/onnx.git', update the commitHash with it.

3. Update [tools/ci_build/github/linux/docker/scripts/install_deps.sh](/tools/ci_build/github/linux/docker/scripts/install_deps.sh)
3. Update [tools/ci_build/github/linux/docker/scripts/install_deps.sh](/tools/ci_build/github/linux/docker/scripts/install_deps.sh)
and [tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh](/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh)
Search 'for onnx_version in', update the commit hashes. The list should contain every release version from ONNX 1.2, and the latest one in our cmake/external/onnx folder.

4. Update onnxruntime/core/protobuf
Expand Down
3 changes: 3 additions & 0 deletions onnxruntime/test/python/onnx_backend_test_series.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ def assert_similar_outputs(cls, ref_outputs, outputs, rtol, atol):
'|^test_reversesequence_batch_cpu.*'
'|^test_reversesequence_time_cpu.*'
'|^test_roialign_cpu.*'
'|^test_mod_mixed_sign_float16_cpu.*'
'|^test_mod_uint32_cpu.*'
'|^test_mod_uint64_cpu.*'
')')

# import all test cases at global scope to make
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/linux/docker/scripts/install_deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ else
#5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3
#bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0
#9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1
#27d4b617e7097cda7d0d4c45ff2b09d248f33179 is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "27d4b617e7097cda7d0d4c45ff2b09d248f33179"; do
#7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef is v1.5.0
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef"; do
if [ -z ${lastest_onnx_version+x} ]; then
echo "first pass";
else
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ else
#5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3
#bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0
#9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1
#27d4b617e7097cda7d0d4c45ff2b09d248f33179 is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "27d4b617e7097cda7d0d4c45ff2b09d248f33179"; do
#7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef is v1.5.0
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef"; do
if [ -z ${lastest_onnx_version+x} ]; then
echo "first pass";
else
Expand Down

0 comments on commit bf859a9

Please sign in to comment.