diff --git a/README.md b/README.md index f0ca7bbb9a..703f215c35 100644 --- a/README.md +++ b/README.md @@ -74,8 +74,8 @@ system. | API Documentation | CPU package | GPU package | |-----|-------------|-------------| | [Python](https://aka.ms/onnxruntime-python) | [Available on Pypi](https://pypi.org/project/onnxruntime)

| [Available on Pypi](https://pypi.org/project/onnxruntime-gpu)


| -| [C#](docs/CSharp_API.md) | Available on Nuget : [MLAS+Eigen](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime/), [MKL-ML](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.MKLML/)
| [Available on Nuget](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.Gpu/)

| -| [C](docs/C_API.md) | Available on Nuget : [MLAS+Eigen](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime/), [MKL-ML](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.MKLML/)

[Files (.zip, .tgz)](https://aka.ms/onnxruntime-release)
| [Available on Nuget](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.Gpu/)


[Files (.zip, .tgz)](https://aka.ms/onnxruntime-release)

| +| [C#](docs/CSharp_API.md) | **Available on Nuget :**
[MLAS+Eigen](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime/)

[MKL-ML](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.MKLML/)| [Available on Nuget](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.Gpu/)

| +| [C](docs/C_API.md) | **Available on Nuget :**
[MLAS+Eigen](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime/)

[MKL-ML](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.MKLML/)
[Binaries (.zip, .tgz)](https://aka.ms/onnxruntime-release)
| [Available on Nuget](https://www.nuget.org/packages/Microsoft.ML.OnnxRuntime.Gpu/)


[Binaries (.zip, .tgz)](https://aka.ms/onnxruntime-release)

| | [C++](onnxruntime/core/session/inference_session.h) | [Build from source](https://github.com/Microsoft/onnxruntime/blob/master/BUILD.md) | [Build from source](https://github.com/Microsoft/onnxruntime/blob/master/BUILD.md) | For builds using other execution providers, see Build Details below. diff --git a/cgmanifest.json b/cgmanifest.json index f6b5066a82..3e397eadd5 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -49,7 +49,7 @@ "component":{ "type":"git", "git":{ - "commitHash":"c1c04af4e9fa0c96fbc1fda7b330bb994118f3c5", + "commitHash":"7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef", "repositoryUrl":"https://github.com/onnx/onnx.git" } } diff --git a/cmake/external/onnx b/cmake/external/onnx index c1c04af4e9..7d7bc83d29 160000 --- a/cmake/external/onnx +++ b/cmake/external/onnx @@ -1 +1 @@ -Subproject commit c1c04af4e9fa0c96fbc1fda7b330bb994118f3c5 +Subproject commit 7d7bc83d29a328233d3e8affa4c4ea8b3e3599ef diff --git a/docs/How_To_Update_ONNX_Dev_Notes.md b/docs/How_To_Update_ONNX_Dev_Notes.md index 9ff9019ccf..2f312aacfe 100644 --- a/docs/How_To_Update_ONNX_Dev_Notes.md +++ b/docs/How_To_Update_ONNX_Dev_Notes.md @@ -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 diff --git a/onnxruntime/test/python/onnx_backend_test_series.py b/onnxruntime/test/python/onnx_backend_test_series.py index 0bd0c5a261..bc617de200 100644 --- a/onnxruntime/test/python/onnx_backend_test_series.py +++ b/onnxruntime/test/python/onnx_backend_test_series.py @@ -91,6 +91,9 @@ backend_test.exclude(r'(' '|^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 diff --git a/tools/ci_build/github/linux/docker/scripts/install_deps.sh b/tools/ci_build/github/linux/docker/scripts/install_deps.sh index ffb20d2e5e..ff1a243e08 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_deps.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_deps.sh @@ -38,8 +38,8 @@ else #5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3 #bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0 #9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1 - #c1c04af4e9fa0c96fbc1fda7b330bb994118f3c5 is v1.4.1 latest - for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "c1c04af4e9fa0c96fbc1fda7b330bb994118f3c5"; 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 diff --git a/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh b/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh index 722d1a1e4b..27e417f624 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh @@ -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