From 7ed178d9b9d176c50eadf9d26e98385a2eaca03a Mon Sep 17 00:00:00 2001 From: benjaminwan Date: Mon, 23 May 2022 09:46:04 +0800 Subject: [PATCH] edit workflows:onnxruntime 1.10.0 --- .github/workflows/builder.yml | 30 ++++++++++++++-------------- .github/workflows/linux.yml | 6 +++--- .github/workflows/macos.yml | 6 +++--- .github/workflows/windows-vs2019.yml | 6 +++--- README.md | 5 ++++- build-onnxruntime.sh | 4 ++-- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 99a5dd5..af70942 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -16,9 +16,9 @@ jobs: python-version: [ 3.8.5 ] env: - ONNX_VERSION: v1.9.1 - SHARED_PKG_NAME: onnxruntime-1.9.1-ubuntu1804-shared - STATIC_PKG_NAME: onnxruntime-1.9.1-ubuntu1804-static + ONNX_VERSION: v1.10.0 + SHARED_PKG_NAME: onnxruntime-1.10.0-ubuntu1804-shared + STATIC_PKG_NAME: onnxruntime-1.10.0-ubuntu1804-static steps: # 检出代码 @@ -80,9 +80,9 @@ jobs: runs-on: macos-10.15 env: - ONNX_VERSION: v1.9.1 - SHARED_PKG_NAME: onnxruntime-1.9.1-macos1015-shared - STATIC_PKG_NAME: onnxruntime-1.9.1-macos1015-static + ONNX_VERSION: v1.10.0 + SHARED_PKG_NAME: onnxruntime-1.10.0-macos1015-shared + STATIC_PKG_NAME: onnxruntime-1.10.0-macos1015-static steps: # 检出代码 @@ -143,9 +143,9 @@ jobs: runs-on: windows-2019 env: - ONNX_VERSION: v1.9.1 - SHARED_PKG_NAME: onnxruntime-1.9.1-vs2019-shared - STATIC_PKG_NAME: onnxruntime-1.9.1-vs2019-static + ONNX_VERSION: v1.10.0 + SHARED_PKG_NAME: onnxruntime-1.10.0-vs2019-shared + STATIC_PKG_NAME: onnxruntime-1.10.0-vs2019-static steps: # 检出代码 @@ -262,7 +262,7 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PKG_NAME: onnxruntime-1.9.1-ubuntu1804-shared + PKG_NAME: onnxruntime-1.10.0-ubuntu1804-shared with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: artifacts/${{ env.PKG_NAME }}/${{ env.PKG_NAME }}.7z @@ -273,7 +273,7 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PKG_NAME: onnxruntime-1.9.1-ubuntu1804-static + PKG_NAME: onnxruntime-1.10.0-ubuntu1804-static with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: artifacts/${{ env.PKG_NAME }}/${{ env.PKG_NAME }}.7z @@ -284,7 +284,7 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PKG_NAME: onnxruntime-1.9.1-macos1015-shared + PKG_NAME: onnxruntime-1.10.0-macos1015-shared with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: artifacts/${{ env.PKG_NAME }}/${{ env.PKG_NAME }}.7z @@ -295,7 +295,7 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PKG_NAME: onnxruntime-1.9.1-macos1015-static + PKG_NAME: onnxruntime-1.10.0-macos1015-static with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: artifacts/${{ env.PKG_NAME }}/${{ env.PKG_NAME }}.7z @@ -306,7 +306,7 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PKG_NAME: onnxruntime-1.9.1-vs2019-shared + PKG_NAME: onnxruntime-1.10.0-vs2019-shared with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: artifacts/${{ env.PKG_NAME }}/${{ env.PKG_NAME }}.7z @@ -317,7 +317,7 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PKG_NAME: onnxruntime-1.9.1-vs2019-static + PKG_NAME: onnxruntime-1.10.0-vs2019-static with: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: artifacts/${{ env.PKG_NAME }}/${{ env.PKG_NAME }}.7z diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6239fa1..a09bcfb 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -12,9 +12,9 @@ jobs: python-version: [ 3.8.5 ] env: - ONNX_VERSION: v1.9.1 - SHARED_PKG_NAME: onnxruntime-1.9.1-ubuntu1804-shared - STATIC_PKG_NAME: onnxruntime-1.9.1-ubuntu1804-static + ONNX_VERSION: v1.10.0 + SHARED_PKG_NAME: onnxruntime-1.10.0-ubuntu1804-shared + STATIC_PKG_NAME: onnxruntime-1.10.0-ubuntu1804-static steps: # 检出代码 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 10cb66c..107c0da 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,9 +8,9 @@ jobs: runs-on: macos-10.15 env: - ONNX_VERSION: v1.9.1 - SHARED_PKG_NAME: onnxruntime-1.9.1-macos1015-shared - STATIC_PKG_NAME: onnxruntime-1.9.1-macos1015-static + ONNX_VERSION: v1.10.0 + SHARED_PKG_NAME: onnxruntime-1.10.0-macos1015-shared + STATIC_PKG_NAME: onnxruntime-1.10.0-macos1015-static steps: # 检出代码 diff --git a/.github/workflows/windows-vs2019.yml b/.github/workflows/windows-vs2019.yml index 725ee1e..2a63d91 100644 --- a/.github/workflows/windows-vs2019.yml +++ b/.github/workflows/windows-vs2019.yml @@ -8,9 +8,9 @@ jobs: runs-on: windows-2019 env: - ONNX_VERSION: v1.9.0 - SHARED_PKG_NAME: onnxruntime-1.9.0-vs2019-shared - STATIC_PKG_NAME: onnxruntime-1.9.0-vs2019-static + ONNX_VERSION: v1.10.0 + SHARED_PKG_NAME: onnxruntime-1.10.0-vs2019-shared + STATIC_PKG_NAME: onnxruntime-1.10.0-vs2019-static steps: # 检出代码 diff --git a/README.md b/README.md index 8736e22..f90f2f4 100644 --- a/README.md +++ b/README.md @@ -32,4 +32,7 @@ Starting from this release, all ONNX Runtime CPU packages are now built without 从1.9.0开始，移除OpenMP编译选项，保持与官方一致 #### 20220521 -1.9.1 \ No newline at end of file +1.9.1 + +#### 20220523 +1.10.0 diff --git a/build-onnxruntime.sh b/build-onnxruntime.sh index ce5ce34..1af7995 100755 --- a/build-onnxruntime.sh +++ b/build-onnxruntime.sh @@ -1,5 +1,5 @@ #!/bin/bash -# build onnxruntime 1.7 by benjaminwan +# build onnxruntime 1.10 by benjaminwan # CMakeFiles/onnxruntime.dir/link.txt/link/lib*.a function collectLibs() { @@ -13,8 +13,8 @@ function collectLibs() { cp libonnxruntime_util.a install-static/lib cp libonnxruntime_framework.a install-static/lib cp libonnxruntime_graph.a install-static/lib - cp libonnxruntime_common.a install-static/lib cp libonnxruntime_mlas.a install-static/lib + cp libonnxruntime_common.a install-static/lib cp libonnxruntime_flatbuffers.a install-static/lib cp external/onnx/libonnx.a install-static/lib cp external/onnx/libonnx_proto.a install-static/lib