From 81da0fb7a690b50364b625988ab0c67d4c61c8b0 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Sat, 17 Feb 2024 12:43:42 +0800 Subject: [PATCH] Update onnxruntime from 1.16.3 to 1.17.0 (#581) --- .../workflows/aarch64-linux-gnu-shared.yaml | 31 ++++++++++++------- .../workflows/aarch64-linux-gnu-static.yaml | 7 ++--- build-android-arm64-v8a.sh | 2 +- build-android-armv7-eabi.sh | 2 +- build-android-x86-64.sh | 2 +- build-android-x86.sh | 2 +- cmake/onnxruntime-linux-aarch64-static.cmake | 16 +++++----- cmake/onnxruntime-linux-aarch64.cmake | 16 +++++----- cmake/onnxruntime-linux-arm-static.cmake | 16 +++++----- cmake/onnxruntime-linux-arm.cmake | 16 +++++----- cmake/onnxruntime-linux-x86_64-gpu.cmake | 16 +++++----- cmake/onnxruntime-linux-x86_64-static.cmake | 16 +++++----- cmake/onnxruntime-linux-x86_64.cmake | 16 +++++----- cmake/onnxruntime-osx-arm64-static.cmake | 14 ++++----- cmake/onnxruntime-osx-arm64.cmake | 14 ++++----- cmake/onnxruntime-osx-universal-static.cmake | 14 ++++----- cmake/onnxruntime-osx-universal.cmake | 14 ++++----- cmake/onnxruntime-osx-x86_64-static.cmake | 14 ++++----- cmake/onnxruntime-osx-x86_64.cmake | 14 ++++----- cmake/onnxruntime-win-x64-gpu.cmake | 14 ++++----- cmake/onnxruntime-win-x64-static.cmake | 14 ++++----- cmake/onnxruntime-win-x64.cmake | 14 ++++----- cmake/onnxruntime-win-x86-static.cmake | 14 ++++----- cmake/onnxruntime-win-x86.cmake | 14 ++++----- scripts/dotnet/generate.py | 4 +-- 25 files changed, 161 insertions(+), 155 deletions(-) diff --git a/.github/workflows/aarch64-linux-gnu-shared.yaml b/.github/workflows/aarch64-linux-gnu-shared.yaml index ddafe08a9..5619b861c 100644 --- a/.github/workflows/aarch64-linux-gnu-shared.yaml +++ b/.github/workflows/aarch64-linux-gnu-shared.yaml @@ -82,35 +82,43 @@ jobs: uses: actions/cache@v3 with: path: toolchain - key: gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu + key: gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz - name: Download toolchain if: steps.cache-toolchain.outputs.cache-hit != 'true' shell: bash run: | - wget https://releases.linaro.org/components/toolchain/binaries/latest-7/aarch64-linux-gnu/gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu.tar.xz + wget -qq https://huggingface.co/csukuangfj/sherpa-ncnn-toolchains/resolve/main/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz mkdir $GITHUB_WORKSPACE/toolchain - tar xvf ./gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain + tar xf ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain + + - name: Set environment variable + if: steps.cache-build-result.outputs.cache-hit != 'true' + shell: bash + run: | + echo "$GITHUB_WORKSPACE/toolchain/bin" >> "$GITHUB_PATH" + echo "$GITHUB_WORKSPACE/bin" >> "$GITHUB_PATH" + ls -lh "$GITHUB_WORKSPACE/toolchain/bin" + + echo "CC=aarch64-none-linux-gnu-gcc" >> "$GITHUB_ENV" + echo "CXX=aarch64-none-linux-gnu-g++" >> "$GITHUB_ENV" - name: Display toolchain info shell: bash run: | - export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH - aarch64-linux-gnu-gcc --version + aarch64-none-linux-gnu-gcc --version - name: Display qemu-aarch64 -h shell: bash run: | export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH - export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-linux-gnu/libc + export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-none-linux-gnu/libc qemu-aarch64 -h - name: build aarch64-linux-gnu shell: bash run: | - export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH - export CMAKE_CXX_COMPILER_LAUNCHER=ccache export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" @@ -130,7 +138,7 @@ jobs: run: | export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH - export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-linux-gnu/libc + export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-none-linux-gnu/libc ls -lh ./build-aarch64-linux-gnu/bin @@ -141,8 +149,7 @@ jobs: - name: Copy files shell: bash run: | - export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH - aarch64-linux-gnu-strip --version + aarch64-none-linux-gnu-strip --version SHERPA_ONNX_VERSION=v$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2) @@ -157,7 +164,7 @@ jobs: ls -lh $dst/bin/ echo "strip" - aarch64-linux-gnu-strip $dst/bin/* + aarch64-none-linux-gnu-strip $dst/bin/* tree $dst diff --git a/.github/workflows/aarch64-linux-gnu-static.yaml b/.github/workflows/aarch64-linux-gnu-static.yaml index e47cdae80..7bd21a005 100644 --- a/.github/workflows/aarch64-linux-gnu-static.yaml +++ b/.github/workflows/aarch64-linux-gnu-static.yaml @@ -82,17 +82,16 @@ jobs: uses: actions/cache@v3 with: path: toolchain - key: gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz + key: gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz - name: Download toolchain if: steps.cache-toolchain.outputs.cache-hit != 'true' shell: bash run: | - # wget wget https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz - wget -qq https://huggingface.co/csukuangfj/sherpa-ncnn-toolchains/resolve/main/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz + wget -qq https://huggingface.co/csukuangfj/sherpa-ncnn-toolchains/resolve/main/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz mkdir $GITHUB_WORKSPACE/toolchain - tar xf ./gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain + tar xf ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain - name: Display toolchain info shell: bash diff --git a/build-android-arm64-v8a.sh b/build-android-arm64-v8a.sh index 2ef803e13..0599748ba 100755 --- a/build-android-arm64-v8a.sh +++ b/build-android-arm64-v8a.sh @@ -42,7 +42,7 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -onnxruntime_version=v1.16.3 +onnxruntime_version=v1.17.0 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then if [ ! -d android-onnxruntime-libs ]; then diff --git a/build-android-armv7-eabi.sh b/build-android-armv7-eabi.sh index d8228ee58..d712b1ffb 100755 --- a/build-android-armv7-eabi.sh +++ b/build-android-armv7-eabi.sh @@ -43,7 +43,7 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -onnxruntime_version=v1.16.3 +onnxruntime_version=v1.17.0 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then if [ ! -d android-onnxruntime-libs ]; then diff --git a/build-android-x86-64.sh b/build-android-x86-64.sh index be232b2f3..0711805a1 100755 --- a/build-android-x86-64.sh +++ b/build-android-x86-64.sh @@ -43,7 +43,7 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -onnxruntime_version=v1.16.3 +onnxruntime_version=v1.17.0 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then if [ ! -d android-onnxruntime-libs ]; then diff --git a/build-android-x86.sh b/build-android-x86.sh index d8cf05f04..281675d79 100755 --- a/build-android-x86.sh +++ b/build-android-x86.sh @@ -43,7 +43,7 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -onnxruntime_version=v1.16.3 +onnxruntime_version=v1.17.0 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86/libonnxruntime.so ]; then if [ ! -d android-onnxruntime-libs ]; then diff --git a/cmake/onnxruntime-linux-aarch64-static.cmake b/cmake/onnxruntime-linux-aarch64-static.cmake index b07e9a407..9a7b9c7d7 100644 --- a/cmake/onnxruntime-linux-aarch64-static.cmake +++ b/cmake/onnxruntime-linux-aarch64-static.cmake @@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-linux-aarch64-static_lib-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-aarch64-static_lib-1.16.3.zip") -set(onnxruntime_HASH "SHA256=c46dbb2799605684193d8f3c1a4377c3478950ccdb7cc7bf49b914a54cde69ca") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-linux-aarch64-static_lib-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-aarch64-static_lib-1.17.0.zip") +set(onnxruntime_HASH "SHA256=8be35fa5d4c9cc42075bf90d1a095a44ab6bf4fc7306141aa1169fa49b382cc2") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-static_lib-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.16.3.zip - /tmp/onnxruntime-linux-aarch64-static_lib-1.16.3.zip - /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-static_lib-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.17.0.zip + /tmp/onnxruntime-linux-aarch64-static_lib-1.17.0.zip + /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-linux-aarch64.cmake b/cmake/onnxruntime-linux-aarch64.cmake index 13171c1a7..43ddbd277 100644 --- a/cmake/onnxruntime-linux-aarch64.cmake +++ b/cmake/onnxruntime-linux-aarch64.cmake @@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-linux-aarch64-1.16.3.tgz") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-aarch64-1.16.3.tgz") -set(onnxruntime_HASH "SHA256=784dbef93b40196aa668d29d78294a81c0d21361d36530b817bb24d87e8730e8") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-linux-aarch64-1.17.0.tgz") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-aarch64-1.17.0.tgz") +set(onnxruntime_HASH "SHA256=ee5069252f549ef94759b6b60bdf10b2dc2cd71d064a7045dd66a052f956a68b") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-1.16.3.tgz - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-1.16.3.tgz - ${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-1.16.3.tgz - /tmp/onnxruntime-linux-aarch64-1.16.3.tgz - /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-1.16.3.tgz + $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-1.17.0.tgz + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-1.17.0.tgz + ${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-1.17.0.tgz + /tmp/onnxruntime-linux-aarch64-1.17.0.tgz + /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-1.17.0.tgz ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-linux-arm-static.cmake b/cmake/onnxruntime-linux-arm-static.cmake index c0e045a54..cfa5bf253 100644 --- a/cmake/onnxruntime-linux-arm-static.cmake +++ b/cmake/onnxruntime-linux-arm-static.cmake @@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-linux-arm-static_lib-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-static_lib-1.16.3.zip") -set(onnxruntime_HASH "SHA256=f5808e40f89c151b1b11bb01041d8b011850af5038758875863fc86cf6c1d965") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-linux-arm-static_lib-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-static_lib-1.17.0.zip") +set(onnxruntime_HASH "SHA256=36a30732b2ccebdaabfee6e1e4473ce65d90cab12c6d2136874e847baeaa1571") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-linux-arm-static_lib-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.16.3.zip - /tmp/onnxruntime-linux-arm-static_lib-1.16.3.zip - /star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-linux-arm-static_lib-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.17.0.zip + /tmp/onnxruntime-linux-arm-static_lib-1.17.0.zip + /star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-linux-arm.cmake b/cmake/onnxruntime-linux-arm.cmake index d959e4ee0..e4ee727cd 100644 --- a/cmake/onnxruntime-linux-arm.cmake +++ b/cmake/onnxruntime-linux-arm.cmake @@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-linux-arm-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-1.16.3.zip") -set(onnxruntime_HASH "SHA256=2fa5a10f3f5c188dd42f69306b010bc112cf35c1634a3893535ef5b02a7275c6") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-linux-arm-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-1.17.0.zip") +set(onnxruntime_HASH "SHA256=6bdddba15193336ed26b7fbcc7e487f774cf52c8917899cc5b1d214089e6e855") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-linux-arm-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-1.16.3.zip - /tmp/onnxruntime-linux-arm-1.16.3.zip - /star-fj/fangjun/download/github/onnxruntime-linux-arm-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-linux-arm-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-1.17.0.zip + /tmp/onnxruntime-linux-arm-1.17.0.zip + /star-fj/fangjun/download/github/onnxruntime-linux-arm-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-linux-x86_64-gpu.cmake b/cmake/onnxruntime-linux-x86_64-gpu.cmake index 4fc9c1e68..475cc5826 100644 --- a/cmake/onnxruntime-linux-x86_64-gpu.cmake +++ b/cmake/onnxruntime-linux-x86_64-gpu.cmake @@ -18,19 +18,19 @@ if(NOT SHERPA_ONNX_ENABLE_GPU) message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-linux-x64-gpu-1.16.3.tgz") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-x64-gpu-1.16.3.tgz") -set(onnxruntime_HASH "SHA256=bbdc33367c056029b3ac0c042cbca2236b8f59a3a53b4daf23432ef1d8bf52de") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-linux-x64-gpu-1.17.0.tgz") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-x64-gpu-1.17.0.tgz") +set(onnxruntime_HASH "SHA256=27cfa22af7301868b55220f8733361889286b30be0569a8f46abb63e90342180") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-linux-x64-gpu-1.16.3.tgz - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-gpu-1.16.3.tgz - ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-gpu-1.16.3.tgz - /tmp/onnxruntime-linux-x64-gpu-1.16.3.tgz - /star-fj/fangjun/download/github/onnxruntime-linux-x64-gpu-1.16.3.tgz + $ENV{HOME}/Downloads/onnxruntime-linux-x64-gpu-1.17.0.tgz + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-gpu-1.17.0.tgz + ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-gpu-1.17.0.tgz + /tmp/onnxruntime-linux-x64-gpu-1.17.0.tgz + /star-fj/fangjun/download/github/onnxruntime-linux-x64-gpu-1.17.0.tgz ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-linux-x86_64-static.cmake b/cmake/onnxruntime-linux-x86_64-static.cmake index 2c1729d14..90885e2de 100644 --- a/cmake/onnxruntime-linux-x86_64-static.cmake +++ b/cmake/onnxruntime-linux-x86_64-static.cmake @@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-linux-x64-static_lib-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-x64-static_lib-1.16.3.zip") -set(onnxruntime_HASH "SHA256=ebf0f4f34d1720d8df7e0be0bc2553bcb1469c44121acb43c9d972dad9b00607") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-linux-x64-static_lib-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-x64-static_lib-1.17.0.zip") +set(onnxruntime_HASH "SHA256=137a5e5a9195c74452f3b772533545441ef0933a154fa006f2a13da8f956907d") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-linux-x64-static_lib-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-static_lib-1.16.3.zip - /tmp/onnxruntime-linux-x64-static_lib-1.16.3.zip - /star-fj/fangjun/download/github/onnxruntime-linux-x64-static_lib-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-linux-x64-static_lib-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-static_lib-1.17.0.zip + /tmp/onnxruntime-linux-x64-static_lib-1.17.0.zip + /star-fj/fangjun/download/github/onnxruntime-linux-x64-static_lib-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-linux-x86_64.cmake b/cmake/onnxruntime-linux-x86_64.cmake index e7f473699..8c3980dfd 100644 --- a/cmake/onnxruntime-linux-x86_64.cmake +++ b/cmake/onnxruntime-linux-x86_64.cmake @@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-linux-x64-1.16.3.tgz") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-x64-1.16.3.tgz") -set(onnxruntime_HASH "SHA256=b072f989d6315ac0e22dcb4771b083c5156d974a3496ac3504c77f4062eb248e") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-linux-x64-1.17.0.tgz") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-x64-1.17.0.tgz") +set(onnxruntime_HASH "SHA256=efc344d54d1969446ff5d3e55b54e205c6579c06333ecf1d34a04215eefae7c6") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-linux-x64-1.16.3.tgz - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-1.16.3.tgz - ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-1.16.3.tgz - /tmp/onnxruntime-linux-x64-1.16.3.tgz - /star-fj/fangjun/download/github/onnxruntime-linux-x64-1.16.3.tgz + $ENV{HOME}/Downloads/onnxruntime-linux-x64-1.17.0.tgz + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-1.17.0.tgz + ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-1.17.0.tgz + /tmp/onnxruntime-linux-x64-1.17.0.tgz + /star-fj/fangjun/download/github/onnxruntime-linux-x64-1.17.0.tgz ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-osx-arm64-static.cmake b/cmake/onnxruntime-osx-arm64-static.cmake index 0c356b6f8..605ea067c 100644 --- a/cmake/onnxruntime-osx-arm64-static.cmake +++ b/cmake/onnxruntime-osx-arm64-static.cmake @@ -12,18 +12,18 @@ if(BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-osx-arm64-static_lib-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-arm64-static_lib-1.16.3.zip") -set(onnxruntime_HASH "SHA256=0481532b262dac3d09845bf11dc8b93c493359947edc449e066f1943b820d789") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-osx-arm64-static_lib-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-arm64-static_lib-1.17.0.zip") +set(onnxruntime_HASH "SHA256=07798f7c91164e6870c438a3a1aeae0768b568bcefd71a3416a4c7a42837e31a") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-osx-arm64-static_lib-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-static_lib-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-static_lib-1.16.3.zip - /tmp/onnxruntime-osx-arm64-static_lib-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-osx-arm64-static_lib-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-static_lib-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-static_lib-1.17.0.zip + /tmp/onnxruntime-osx-arm64-static_lib-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-osx-arm64.cmake b/cmake/onnxruntime-osx-arm64.cmake index 66aa10742..912259196 100644 --- a/cmake/onnxruntime-osx-arm64.cmake +++ b/cmake/onnxruntime-osx-arm64.cmake @@ -12,18 +12,18 @@ if(NOT BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-osx-arm64-1.16.3.tgz") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-arm64-1.16.3.tgz") -set(onnxruntime_HASH "SHA256=30f3acaa17c51ccd7ae1f6c3d7ac3154031abb9f91a0eb834aeb804f097ce795") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-osx-arm64-1.17.0.tgz") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-arm64-1.17.0.tgz") +set(onnxruntime_HASH "SHA256=f72a2bcca40e2650756c6b96c69ef031236aaab1b98673e744da4eef0c4bddbd") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-osx-arm64-1.16.3.tgz - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-1.16.3.tgz - ${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-1.16.3.tgz - /tmp/onnxruntime-osx-arm64-1.16.3.tgz + $ENV{HOME}/Downloads/onnxruntime-osx-arm64-1.17.0.tgz + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-1.17.0.tgz + ${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-1.17.0.tgz + /tmp/onnxruntime-osx-arm64-1.17.0.tgz ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-osx-universal-static.cmake b/cmake/onnxruntime-osx-universal-static.cmake index c64cffc43..9b3e05020 100644 --- a/cmake/onnxruntime-osx-universal-static.cmake +++ b/cmake/onnxruntime-osx-universal-static.cmake @@ -13,18 +13,18 @@ if(BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-osx-universal2-static_lib-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-universal2-static_lib-1.16.3.zip") -set(onnxruntime_HASH "SHA256=19e39beefbb6d103c1d4c5a2d64bfbd6dd4c21f37d6545170ce3c59a5e2af452") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-osx-universal2-static_lib-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-universal2-static_lib-1.17.0.zip") +set(onnxruntime_HASH "SHA256=f5b0367e1be12e8697b34f41a0cec8dc92fc6c445bd5f39865d725e873ad0550") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-osx-universal2-static_lib-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-static_lib-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-static_lib-1.16.3.zip - /tmp/onnxruntime-osx-universal2-static_lib-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-osx-universal2-static_lib-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-static_lib-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-static_lib-1.17.0.zip + /tmp/onnxruntime-osx-universal2-static_lib-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-osx-universal.cmake b/cmake/onnxruntime-osx-universal.cmake index 43efd6c47..2e1ed06de 100644 --- a/cmake/onnxruntime-osx-universal.cmake +++ b/cmake/onnxruntime-osx-universal.cmake @@ -13,18 +13,18 @@ if(NOT BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-osx-universal2-1.16.3.tgz") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-universal2-1.16.3.tgz") -set(onnxruntime_HASH "SHA256=6428d0f0ff1386e8e8256a708e187c1f8861387c9554bfc9c5f3390ffa0df5cc") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-osx-universal2-1.17.0.tgz") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-universal2-1.17.0.tgz") +set(onnxruntime_HASH "SHA256=d6c81efc9be29d504d5f4cc01fec1317861b0ab34f172ad5e6198b486fa43cfd") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-osx-universal2-1.16.3.tgz - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-1.16.3.tgz - ${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-1.16.3.tgz - /tmp/onnxruntime-osx-universal2-1.16.3.tgz + $ENV{HOME}/Downloads/onnxruntime-osx-universal2-1.17.0.tgz + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-1.17.0.tgz + ${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-1.17.0.tgz + /tmp/onnxruntime-osx-universal2-1.17.0.tgz ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-osx-x86_64-static.cmake b/cmake/onnxruntime-osx-x86_64-static.cmake index c5b818497..973837910 100644 --- a/cmake/onnxruntime-osx-x86_64-static.cmake +++ b/cmake/onnxruntime-osx-x86_64-static.cmake @@ -12,18 +12,18 @@ if(BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-osx-x86_64-static_lib-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-x86_64-static_lib-1.16.3.zip") -set(onnxruntime_HASH "SHA256=c1444c34b8798aa5033e9247727262a2f2ae26a2dd6de0765547c22ba527cf22") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-osx-x86_64-static_lib-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-x86_64-static_lib-1.17.0.zip") +set(onnxruntime_HASH "SHA256=280c68f8ebb3d2c6ccb62b07192d888690dfa6e65abe92b97c85cbadd846d931") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-static_lib-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-static_lib-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-static_lib-1.16.3.zip - /tmp/onnxruntime-osx-x86_64-static_lib-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-static_lib-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-static_lib-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-static_lib-1.17.0.zip + /tmp/onnxruntime-osx-x86_64-static_lib-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-osx-x86_64.cmake b/cmake/onnxruntime-osx-x86_64.cmake index 26b88a828..7abef7d82 100644 --- a/cmake/onnxruntime-osx-x86_64.cmake +++ b/cmake/onnxruntime-osx-x86_64.cmake @@ -12,18 +12,18 @@ if(NOT BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-osx-x86_64-1.16.3.tgz") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-x86_64-1.16.3.tgz") -set(onnxruntime_HASH "SHA256=a395923ed91192e46bf50aec48d728dbf193dbd547ad50a231ba32df51608507") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-osx-x86_64-1.17.0.tgz") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-osx-x86_64-1.17.0.tgz") +set(onnxruntime_HASH "SHA256=b87b2febef24e5645e13859d176e76473124325a0b1526baf7f68b4aa1eb1b49") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-1.16.3.tgz - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-1.16.3.tgz - ${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-1.16.3.tgz - /tmp/onnxruntime-osx-x86_64-1.16.3.tgz + $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-1.17.0.tgz + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-1.17.0.tgz + ${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-1.17.0.tgz + /tmp/onnxruntime-osx-x86_64-1.17.0.tgz ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-win-x64-gpu.cmake b/cmake/onnxruntime-win-x64-gpu.cmake index b4a0dca0e..47546ca7c 100644 --- a/cmake/onnxruntime-win-x64-gpu.cmake +++ b/cmake/onnxruntime-win-x64-gpu.cmake @@ -19,18 +19,18 @@ if(NOT SHERPA_ONNX_ENABLE_GPU) message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-win-x64-gpu-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-gpu-1.16.3.zip") -set(onnxruntime_HASH "SHA256=4facf5abd081accb64da0b4caa267d98e536427111f3246a3ddb09c6325756b9") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-win-x64-gpu-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-gpu-1.17.0.zip") +set(onnxruntime_HASH "SHA256=3c90a38769e2f7bdb088c00410de4895b07b7d53a7c80955f18989775c2a25e7") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-win-x64-gpu-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-gpu-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-gpu-1.16.3.zip - /tmp/onnxruntime-win-x64-gpu-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-win-x64-gpu-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-gpu-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-gpu-1.17.0.zip + /tmp/onnxruntime-win-x64-gpu-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-win-x64-static.cmake b/cmake/onnxruntime-win-x64-static.cmake index 52161174a..04d50b61b 100644 --- a/cmake/onnxruntime-win-x64-static.cmake +++ b/cmake/onnxruntime-win-x64-static.cmake @@ -15,18 +15,18 @@ if(BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-win-x64-static_lib-1.16.3.tar.bz2") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-static_lib-1.16.3.tar.bz2") -set(onnxruntime_HASH "SHA256=5d49f4cd576c8a850dd61bf673315c9e6ec111b09ceb81934048a2afb23ee5d6") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-win-x64-static_lib-1.17.0.tar.bz2") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-static_lib-1.17.0.tar.bz2") +set(onnxruntime_HASH "SHA256=7ff33b989fbe32546d694284d46653fd4c38f47155105ec14907e6d3cd4b01bb") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-1.16.3.tar.bz2 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-1.16.3.tar.bz2 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-1.16.3.tar.bz2 - /tmp/onnxruntime-win-x64-static_lib-1.16.3.tar.bz2 + $ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-1.17.0.tar.bz2 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-1.17.0.tar.bz2 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-1.17.0.tar.bz2 + /tmp/onnxruntime-win-x64-static_lib-1.17.0.tar.bz2 ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-win-x64.cmake b/cmake/onnxruntime-win-x64.cmake index 989b12d93..d2301b297 100644 --- a/cmake/onnxruntime-win-x64.cmake +++ b/cmake/onnxruntime-win-x64.cmake @@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-win-x64-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-1.16.3.zip") -set(onnxruntime_HASH "SHA256=5eb01f69bb2d9fa2893c88310bb5c1eb8d79e8c460810817eef08b6f9b1078af") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-win-x64-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-1.17.0.zip") +set(onnxruntime_HASH "SHA256=b0436634108c001e2284cb685646047a7b088715b64c05e39ee8a1a8930776a9") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-win-x64-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-1.16.3.zip - /tmp/onnxruntime-win-x64-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-win-x64-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-1.17.0.zip + /tmp/onnxruntime-win-x64-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-win-x86-static.cmake b/cmake/onnxruntime-win-x86-static.cmake index a76224eba..e212fb0e9 100644 --- a/cmake/onnxruntime-win-x86-static.cmake +++ b/cmake/onnxruntime-win-x86-static.cmake @@ -15,18 +15,18 @@ if(BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.3/onnxruntime-win-x86-static_lib-1.16.3.tar.bz2") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-static_lib-1.16.3.tar.bz2") -set(onnxruntime_HASH "SHA256=b291d25be9b6214d1ed058635a1fcaf5bb49b996c3d77b1a60b5e7767718a036") +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.0/onnxruntime-win-x86-static_lib-1.17.0.tar.bz2") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-static_lib-1.17.0.tar.bz2") +set(onnxruntime_HASH "SHA256=3c40c53fef937452bf6cfbac1584875d5627bd908ca731d120642112526c8352") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-1.16.3.tar.bz2 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-1.16.3.tar.bz2 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-1.16.3.tar.bz2 - /tmp/onnxruntime-win-x86-static_lib-1.16.3.tar.bz2 + $ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-1.17.0.tar.bz2 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-1.17.0.tar.bz2 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-1.17.0.tar.bz2 + /tmp/onnxruntime-win-x86-static_lib-1.17.0.tar.bz2 ) foreach(f IN LISTS possible_file_locations) diff --git a/cmake/onnxruntime-win-x86.cmake b/cmake/onnxruntime-win-x86.cmake index cc568a45d..a7e35d447 100644 --- a/cmake/onnxruntime-win-x86.cmake +++ b/cmake/onnxruntime-win-x86.cmake @@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS) message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") endif() -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.3/onnxruntime-win-x86-1.16.3.zip") -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-1.16.3.zip") -set(onnxruntime_HASH "SHA256=9731c6d43588b34fd9b74c704cbc2864ff4384820d7a7f177062c1524bea624b") +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.0/onnxruntime-win-x86-1.17.0.zip") +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-1.17.0.zip") +set(onnxruntime_HASH "SHA256=3f3214f99165d3282cc5647c5a18451aaaaf326599c7e98913ce6c50e50c6463") # If you don't have access to the Internet, # please download onnxruntime to one of the following locations. # You can add more if you want. set(possible_file_locations - $ENV{HOME}/Downloads/onnxruntime-win-x86-1.16.3.zip - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-1.16.3.zip - ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-1.16.3.zip - /tmp/onnxruntime-win-x86-1.16.3.zip + $ENV{HOME}/Downloads/onnxruntime-win-x86-1.17.0.zip + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-1.17.0.zip + ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-1.17.0.zip + /tmp/onnxruntime-win-x86-1.17.0.zip ) foreach(f IN LISTS possible_file_locations) diff --git a/scripts/dotnet/generate.py b/scripts/dotnet/generate.py index bbd44d3be..dc413c565 100755 --- a/scripts/dotnet/generate.py +++ b/scripts/dotnet/generate.py @@ -36,7 +36,7 @@ def process_linux(s): "libespeak-ng.so", "libkaldi-decoder-core.so", "libkaldi-native-fbank-core.so", - "libonnxruntime.so.1.16.3", + "libonnxruntime.so.1.17.0", "libpiper_phonemize.so.1", "libsherpa-onnx-c-api.so", "libsherpa-onnx-core.so", @@ -64,7 +64,7 @@ def process_macos(s): "libespeak-ng.dylib", "libkaldi-decoder-core.dylib", "libkaldi-native-fbank-core.dylib", - "libonnxruntime.1.16.3.dylib", + "libonnxruntime.1.17.0.dylib", "libpiper_phonemize.1.dylib", "libsherpa-onnx-c-api.dylib", "libsherpa-onnx-core.dylib",