xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
cf199ad4 1 parent b640c295

Support onnxruntime 1.16.0 (#330)

内嵌 并排对比
正在显示 27 个修改的文件 包含 139 行增加 和 119 行删除
@@ -55,3 +55,4 @@ jobs: @@ -55,3 +55,4 @@ jobs:
55 with: 55 with:
56 file_glob: true 56 file_glob: true
57 file: apks/*.apk 57 file: apks/*.apk
  58 + overwrite: true
@@ -76,7 +76,7 @@ jobs: @@ -76,7 +76,7 @@ jobs:
76 uses: actions/cache@v3 76 uses: actions/cache@v3
77 with: 77 with:
78 path: toolchain 78 path: toolchain
79 - key: gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf 79 + key: gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf
80 80
81 - name: Download toolchain 81 - name: Download toolchain
82 if: steps.cache-toolchain.outputs.cache-hit != 'true' 82 if: steps.cache-toolchain.outputs.cache-hit != 'true'
@@ -87,19 +87,19 @@ jobs: @@ -87,19 +87,19 @@ jobs:
87 ls -lh arm-linux-gcc 87 ls -lh arm-linux-gcc
88 88
89 mkdir $GITHUB_WORKSPACE/toolchain 89 mkdir $GITHUB_WORKSPACE/toolchain
90 - tar xvf ./arm-linux-gcc/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain 90 + tar xvf ./arm-linux-gcc/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain
91 91
92 - name: Display toolchain info 92 - name: Display toolchain info
93 shell: bash 93 shell: bash
94 run: | 94 run: |
95 export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH 95 export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH
96 - arm-linux-gnueabihf-gcc --version 96 + arm-none-linux-gnueabihf-gcc --version
97 97
98 - name: Display qemu-arm -h 98 - name: Display qemu-arm -h
99 shell: bash 99 shell: bash
100 run: | 100 run: |
101 export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH 101 export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH
102 - export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/arm-linux-gnueabihf/libc 102 + export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/arm-none-linux-gnueabihf/libc
103 qemu-arm -h 103 qemu-arm -h
104 104
105 - name: build arm-linux-gnueabihf 105 - name: build arm-linux-gnueabihf
@@ -119,7 +119,7 @@ jobs: @@ -119,7 +119,7 @@ jobs:
119 run: | 119 run: |
120 export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH 120 export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH
121 export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH 121 export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH
122 - export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/arm-linux-gnueabihf/libc 122 + export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/arm-none-linux-gnueabihf/libc
123 123
124 ls -lh ./build-arm-linux-gnueabihf/bin 124 ls -lh ./build-arm-linux-gnueabihf/bin
125 125
@@ -24,7 +24,7 @@ jobs: @@ -24,7 +24,7 @@ jobs:
24 - name: Install dependencies 24 - name: Install dependencies
25 shell: bash 25 shell: bash
26 run: | 26 run: |
27 - python3 -m pip install openai-whisper torch onnxruntime==1.15.1 onnx 27 + python3 -m pip install openai-whisper torch onnxruntime onnx
28 28
29 - name: export ${{ matrix.model }} 29 - name: export ${{ matrix.model }}
30 shell: bash 30 shell: bash
1 cmake_minimum_required(VERSION 3.13 FATAL_ERROR) 1 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
2 project(sherpa-onnx) 2 project(sherpa-onnx)
3 3
4 -set(SHERPA_ONNX_VERSION "1.7.16") 4 +set(SHERPA_ONNX_VERSION "1.7.17")
5 5
6 # Disable warning about 6 # Disable warning about
7 # 7 #
@@ -42,7 +42,7 @@ fi @@ -42,7 +42,7 @@ fi
42 42
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 -onnxruntime_version=v1.15.1 45 +onnxruntime_version=v1.16.0
46 46
47 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then 47 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then
48 GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs 48 GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs
@@ -43,7 +43,7 @@ fi @@ -43,7 +43,7 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=v1.15.1 46 +onnxruntime_version=v1.16.0
47 47
48 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then 48 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then
49 GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs 49 GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs
@@ -43,7 +43,7 @@ fi @@ -43,7 +43,7 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=v1.15.1 46 +onnxruntime_version=v1.16.0
47 47
48 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then 48 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then
49 GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs 49 GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs
@@ -43,7 +43,7 @@ fi @@ -43,7 +43,7 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=v1.15.1 46 +onnxruntime_version=v1.16.0
47 47
48 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86/libonnxruntime.so ]; then 48 if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86/libonnxruntime.so ]; then
49 GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs 49 GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs
1 #!/usr/bin/env bash 1 #!/usr/bin/env bash
2 2
  3 +if command -v arm-none-linux-gnueabihf-gcc &> /dev/null; then
  4 + ln -svf $(which arm-none-linux-gnueabihf-gcc) ./arm-linux-gnueabihf-gcc
  5 + ln -svf $(which arm-none-linux-gnueabihf-g++) ./arm-linux-gnueabihf-g++
  6 + export PATH=$PWD:$PATH
  7 +fi
  8 +
3 if ! command -v arm-linux-gnueabihf-gcc &> /dev/null; then 9 if ! command -v arm-linux-gnueabihf-gcc &> /dev/null; then
4 echo "Please install a toolchain for cross-compiling." 10 echo "Please install a toolchain for cross-compiling."
5 echo "You can refer to: " 11 echo "You can refer to: "
@@ -5,12 +5,17 @@ set -e @@ -5,12 +5,17 @@ set -e
5 dir=build-ios 5 dir=build-ios
6 mkdir -p $dir 6 mkdir -p $dir
7 cd $dir 7 cd $dir
8 -onnxruntime_version=1.15.1 8 +onnxruntime_version=1.16.0
9 9
10 if [ ! -f ios-onnxruntime/$onnxruntime_version/onnxruntime.xcframework/ios-arm64/onnxruntime.a ]; then 10 if [ ! -f ios-onnxruntime/$onnxruntime_version/onnxruntime.xcframework/ios-arm64/onnxruntime.a ]; then
11 - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/ios-onnxruntime 11 + if [ ! -d ios-onnxruntime ]; then
  12 + GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/ios-onnxruntime
  13 + fi
  14 +
12 pushd ios-onnxruntime 15 pushd ios-onnxruntime
13 - ln -s $onnxruntime_version/onnxruntime.xcframework . 16 + git pull
  17 +
  18 + ln -sf $onnxruntime_version/onnxruntime.xcframework .
14 git lfs pull --include $onnxruntime_version/onnxruntime.xcframework/ios-arm64/onnxruntime.a 19 git lfs pull --include $onnxruntime_version/onnxruntime.xcframework/ios-arm64/onnxruntime.a
15 git lfs pull --include $onnxruntime_version/onnxruntime.xcframework/ios-arm64_x86_64-simulator/onnxruntime.a 20 git lfs pull --include $onnxruntime_version/onnxruntime.xcframework/ios-arm64_x86_64-simulator/onnxruntime.a
16 popd 21 popd
@@ -10,19 +10,19 @@ if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) @@ -10,19 +10,19 @@ if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
10 message(FATAL_ERROR "This file is for aarch64 only. Given: ${CMAKE_SYSTEM_PROCESSOR}") 10 message(FATAL_ERROR "This file is for aarch64 only. Given: ${CMAKE_SYSTEM_PROCESSOR}")
11 endif() 11 endif()
12 12
13 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-linux-aarch64-1.15.1.tgz")  
14 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-aarch64-1.15.1.tgz")  
15 -set(onnxruntime_HASH "SHA256=85272e75d8dd841138de4b774a9672ea93c1be108d96038c6c34a62d7f976aee") 13 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-aarch64-1.16.0.tgz")
  14 +set(onnxruntime_URL2 )
  15 +set(onnxruntime_HASH "SHA256=8b15781d974803203c09df7d52c84d8c9f1ac7d949a97f515e4d2f5dc978d8af")
16 16
17 # If you don't have access to the Internet, 17 # If you don't have access to the Internet,
18 # please download onnxruntime to one of the following locations. 18 # please download onnxruntime to one of the following locations.
19 # You can add more if you want. 19 # You can add more if you want.
20 set(possible_file_locations 20 set(possible_file_locations
21 - $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-1.15.1.tgz  
22 - ${PROJECT_SOURCE_DIR}/onnxruntime-linux-aarch64-1.15.1.tgz  
23 - ${PROJECT_BINARY_DIR}/onnxruntime-linux-aarch64-1.15.1.tgz  
24 - /tmp/onnxruntime-linux-aarch64-1.15.1.tgz  
25 - /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-1.15.1.tgz 21 + $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-1.16.0.tgz
  22 + ${PROJECT_SOURCE_DIR}/onnxruntime-linux-aarch64-1.16.0.tgz
  23 + ${PROJECT_BINARY_DIR}/onnxruntime-linux-aarch64-1.16.0.tgz
  24 + /tmp/onnxruntime-linux-aarch64-1.16.0.tgz
  25 + /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-1.16.0.tgz
26 ) 26 )
27 27
28 foreach(f IN LISTS possible_file_locations) 28 foreach(f IN LISTS possible_file_locations)
@@ -10,19 +10,19 @@ if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL arm) @@ -10,19 +10,19 @@ if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL arm)
10 message(FATAL_ERROR "This file is for arm only. Given: ${CMAKE_SYSTEM_PROCESSOR}") 10 message(FATAL_ERROR "This file is for arm only. Given: ${CMAKE_SYSTEM_PROCESSOR}")
11 endif() 11 endif()
12 12
13 -set(onnxruntime_URL "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-1.15.1.zip")  
14 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-arm-1.15.1.zip")  
15 -set(onnxruntime_HASH "SHA256=867b96210a347e4b1bb949e7c9a3f222371ea0c00c9deaaba9fdd66c689f7fb7") 13 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-1.16.0.zip")
  14 +set(onnxruntime_URL2 )
  15 +set(onnxruntime_HASH "SHA256=0a63ea99fbba3ee399d6626c36752844ae93ae19bab30e4bf00d45cc8a13da02")
16 16
17 # If you don't have access to the Internet, 17 # If you don't have access to the Internet,
18 # please download onnxruntime to one of the following locations. 18 # please download onnxruntime to one of the following locations.
19 # You can add more if you want. 19 # You can add more if you want.
20 set(possible_file_locations 20 set(possible_file_locations
21 - $ENV{HOME}/Downloads/onnxruntime-linux-arm-1.15.1.zip  
22 - ${PROJECT_SOURCE_DIR}/onnxruntime-linux-arm-1.15.1.zip  
23 - ${PROJECT_BINARY_DIR}/onnxruntime-linux-arm-1.15.1.zip  
24 - /tmp/onnxruntime-linux-arm-1.15.1.zip  
25 - /star-fj/fangjun/download/github/onnxruntime-linux-arm-1.15.1.zip 21 + $ENV{HOME}/Downloads/onnxruntime-linux-arm-1.16.0.zip
  22 + ${PROJECT_SOURCE_DIR}/onnxruntime-linux-arm-1.16.0.zip
  23 + ${PROJECT_BINARY_DIR}/onnxruntime-linux-arm-1.16.0.zip
  24 + /tmp/onnxruntime-linux-arm-1.16.0.zip
  25 + /star-fj/fangjun/download/github/onnxruntime-linux-arm-1.16.0.zip
26 ) 26 )
27 27
28 foreach(f IN LISTS possible_file_locations) 28 foreach(f IN LISTS possible_file_locations)
@@ -18,19 +18,19 @@ if(NOT SHERPA_ONNX_ENABLE_GPU) @@ -18,19 +18,19 @@ if(NOT SHERPA_ONNX_ENABLE_GPU)
18 message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}") 18 message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}")
19 endif() 19 endif()
20 20
21 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-linux-x64-gpu-1.15.1.tgz")  
22 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-gpu-1.15.1.tgz")  
23 -set(onnxruntime_HASH "SHA256=eab891393025edd5818d1aa26a42860e5739fcc49e3ca3f876110ec8736fe7f1") 21 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-gpu-1.16.0.tgz")
  22 +set(onnxruntime_URL2 )
  23 +set(onnxruntime_HASH "SHA256=f9cbf3d711f46d7e03ea43746ee9d1c7d8e82c171a4655f6591dd4d1ba1b9ec7")
24 24
25 # If you don't have access to the Internet, 25 # If you don't have access to the Internet,
26 # please download onnxruntime to one of the following locations. 26 # please download onnxruntime to one of the following locations.
27 # You can add more if you want. 27 # You can add more if you want.
28 set(possible_file_locations 28 set(possible_file_locations
29 - $ENV{HOME}/Downloads/onnxruntime-linux-x64-gpu-1.15.1.tgz  
30 - ${PROJECT_SOURCE_DIR}/onnxruntime-linux-x64-gpu-1.15.1.tgz  
31 - ${PROJECT_BINARY_DIR}/onnxruntime-linux-x64-gpu-1.15.1.tgz  
32 - /tmp/onnxruntime-linux-x64-gpu-1.15.1.tgz  
33 - /star-fj/fangjun/download/github/onnxruntime-linux-x64-gpu-1.15.1.tgz 29 + $ENV{HOME}/Downloads/onnxruntime-linux-x64-gpu-1.16.0.tgz
  30 + ${PROJECT_SOURCE_DIR}/onnxruntime-linux-x64-gpu-1.16.0.tgz
  31 + ${PROJECT_BINARY_DIR}/onnxruntime-linux-x64-gpu-1.16.0.tgz
  32 + /tmp/onnxruntime-linux-x64-gpu-1.16.0.tgz
  33 + /star-fj/fangjun/download/github/onnxruntime-linux-x64-gpu-1.16.0.tgz
34 ) 34 )
35 35
36 foreach(f IN LISTS possible_file_locations) 36 foreach(f IN LISTS possible_file_locations)
@@ -14,22 +14,19 @@ if(BUILD_SHARED_LIBS) @@ -14,22 +14,19 @@ if(BUILD_SHARED_LIBS)
14 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 14 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
15 endif() 15 endif()
16 16
17 -# TODO(fangjun): update the URL  
18 -set(onnxruntime_URL "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-static_lib-1.15.1.tgz")  
19 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-static_lib-1.15.1.tgz")  
20 -set(onnxruntime_HASH "SHA256=b64fcf4115e3d02193c7406461d582703ccc1f0c24ad320ef74b07e5f71681c6") 17 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-static_lib-1.16.0.tgz")
  18 +set(onnxruntime_URL2 )
  19 +set(onnxruntime_HASH "SHA256=a36e989c9a07f12bf16f63acb2217b02a0cf4ac75aa7bc27de76ae08706a5c1f")
21 20
22 # If you don't have access to the Internet, 21 # If you don't have access to the Internet,
23 # please download onnxruntime to one of the following locations. 22 # please download onnxruntime to one of the following locations.
24 # You can add more if you want. 23 # You can add more if you want.
25 set(possible_file_locations 24 set(possible_file_locations
26 - ${PROJECT_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.15.1.tgz  
27 -  
28 - $ENV{HOME}/Downloads/onnxruntime-linux-x64-static_lib-1.15.1.tgz  
29 - ${PROJECT_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.15.1.tgz  
30 - ${PROJECT_BINARY_DIR}/onnxruntime-linux-x64-static_lib-1.15.1.tgz  
31 - /tmp/onnxruntime-linux-x64-static_lib-1.15.1.tgz  
32 - /star-fj/fangjun/download/github/onnxruntime-linux-x64-static_lib-1.15.1.tgz 25 + $ENV{HOME}/Downloads/onnxruntime-linux-x64-static_lib-1.16.0.tgz
  26 + ${PROJECT_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.16.0.tgz
  27 + ${PROJECT_BINARY_DIR}/onnxruntime-linux-x64-static_lib-1.16.0.tgz
  28 + /tmp/onnxruntime-linux-x64-static_lib-1.16.0.tgz
  29 + /star-fj/fangjun/download/github/onnxruntime-linux-x64-static_lib-1.16.0.tgz
33 ) 30 )
34 31
35 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS) @@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS)
14 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 14 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
15 endif() 15 endif()
16 16
17 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-linux-x64-1.15.1.tgz")  
18 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-1.15.1.tgz")  
19 -set(onnxruntime_HASH "SHA256=5492f9065f87538a286fb04c8542e9ff7950abb2ea6f8c24993a940006787d87") 17 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-1.16.0.tgz")
  18 +set(onnxruntime_URL2 )
  19 +set(onnxruntime_HASH "SHA256=02bcd1e4fef295dacc3b232774efeaa0a83527f439f29147c3badade4df1f6dc")
20 20
21 # If you don't have access to the Internet, 21 # If you don't have access to the Internet,
22 # please download onnxruntime to one of the following locations. 22 # please download onnxruntime to one of the following locations.
23 # You can add more if you want. 23 # You can add more if you want.
24 set(possible_file_locations 24 set(possible_file_locations
25 - $ENV{HOME}/Downloads/onnxruntime-linux-x64-1.15.1.tgz  
26 - ${PROJECT_SOURCE_DIR}/onnxruntime-linux-x64-1.15.1.tgz  
27 - ${PROJECT_BINARY_DIR}/onnxruntime-linux-x64-1.15.1.tgz  
28 - /tmp/onnxruntime-linux-x64-1.15.1.tgz  
29 - /star-fj/fangjun/download/github/onnxruntime-linux-x64-1.15.1.tgz 25 + $ENV{HOME}/Downloads/onnxruntime-linux-x64-1.16.0.tgz
  26 + ${PROJECT_SOURCE_DIR}/onnxruntime-linux-x64-1.16.0.tgz
  27 + ${PROJECT_BINARY_DIR}/onnxruntime-linux-x64-1.16.0.tgz
  28 + /tmp/onnxruntime-linux-x64-1.16.0.tgz
  29 + /star-fj/fangjun/download/github/onnxruntime-linux-x64-1.16.0.tgz
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -8,18 +8,18 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) @@ -8,18 +8,18 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
8 message(FATAL_ERROR "This file is for macOS only. Given: ${CMAKE_SYSTEM_NAME}") 8 message(FATAL_ERROR "This file is for macOS only. Given: ${CMAKE_SYSTEM_NAME}")
9 endif() 9 endif()
10 10
11 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-osx-arm64-1.15.1.tgz")  
12 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-osx-arm64-1.15.1.tgz")  
13 -set(onnxruntime_HASH "SHA256=df97832fc7907c6677a6da437f92339d84a462becb74b1d65217fcb859ee9460") 11 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-osx-arm64-1.16.0.tgz")
  12 +set(onnxruntime_URL2 )
  13 +set(onnxruntime_HASH "SHA256=fec3b70ca4f642a5c6d5c3a6f3a4eddd4c1b9281893fe2c7ae03a3086e20c316")
14 14
15 # If you don't have access to the Internet, 15 # If you don't have access to the Internet,
16 # please download onnxruntime to one of the following locations. 16 # please download onnxruntime to one of the following locations.
17 # You can add more if you want. 17 # You can add more if you want.
18 set(possible_file_locations 18 set(possible_file_locations
19 - $ENV{HOME}/Downloads/onnxruntime-osx-arm64-1.15.1.tgz  
20 - ${PROJECT_SOURCE_DIR}/onnxruntime-osx-arm64-1.15.1.tgz  
21 - ${PROJECT_BINARY_DIR}/onnxruntime-osx-arm64-1.15.1.tgz  
22 - /tmp/onnxruntime-osx-arm64-1.15.1.tgz 19 + $ENV{HOME}/Downloads/onnxruntime-osx-arm64-1.16.0.tgz
  20 + ${PROJECT_SOURCE_DIR}/onnxruntime-osx-arm64-1.16.0.tgz
  21 + ${PROJECT_BINARY_DIR}/onnxruntime-osx-arm64-1.16.0.tgz
  22 + /tmp/onnxruntime-osx-arm64-1.16.0.tgz
23 ) 23 )
24 24
25 foreach(f IN LISTS possible_file_locations) 25 foreach(f IN LISTS possible_file_locations)
@@ -9,18 +9,18 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) @@ -9,18 +9,18 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
9 message(FATAL_ERROR "This file is for macOS only. Given: ${CMAKE_SYSTEM_NAME}") 9 message(FATAL_ERROR "This file is for macOS only. Given: ${CMAKE_SYSTEM_NAME}")
10 endif() 10 endif()
11 11
12 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-osx-universal2-1.15.1.tgz")  
13 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-osx-universal2-1.15.1.tgz")  
14 -set(onnxruntime_HASH "SHA256=ecb7651c216fe6ffaf4c578e135d98341bc5bc944c5dc6b725ef85b0d7747be0") 12 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-osx-universal2-1.16.0.tgz")
  13 +set(onnxruntime_URL2 )
  14 +set(onnxruntime_HASH "SHA256=e5b69ece634cf1cd5cf4b45ab478417199a5e8ab5775f6f12560e09dc5ef7749")
15 15
16 # If you don't have access to the Internet, 16 # If you don't have access to the Internet,
17 # please download onnxruntime to one of the following locations. 17 # please download onnxruntime to one of the following locations.
18 # You can add more if you want. 18 # You can add more if you want.
19 set(possible_file_locations 19 set(possible_file_locations
20 - $ENV{HOME}/Downloads/onnxruntime-osx-universal2-1.15.1.tgz  
21 - ${PROJECT_SOURCE_DIR}/onnxruntime-osx-universal2-1.15.1.tgz  
22 - ${PROJECT_BINARY_DIR}/onnxruntime-osx-universal2-1.15.1.tgz  
23 - /tmp/onnxruntime-osx-universal2-1.15.1.tgz 20 + $ENV{HOME}/Downloads/onnxruntime-osx-universal2-1.16.0.tgz
  21 + ${PROJECT_SOURCE_DIR}/onnxruntime-osx-universal2-1.16.0.tgz
  22 + ${PROJECT_BINARY_DIR}/onnxruntime-osx-universal2-1.16.0.tgz
  23 + /tmp/onnxruntime-osx-universal2-1.16.0.tgz
24 ) 24 )
25 25
26 foreach(f IN LISTS possible_file_locations) 26 foreach(f IN LISTS possible_file_locations)
@@ -8,18 +8,18 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) @@ -8,18 +8,18 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
8 message(FATAL_ERROR "This file is for macOS only. Given: ${CMAKE_SYSTEM_NAME}") 8 message(FATAL_ERROR "This file is for macOS only. Given: ${CMAKE_SYSTEM_NAME}")
9 endif() 9 endif()
10 10
11 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-osx-x86_64-1.15.1.tgz")  
12 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-osx-x86_64-1.15.1.tgz")  
13 -set(onnxruntime_HASH "SHA256=4b66ebbca24b8b96f6b74655fee3610a7e529b4e01f6790632f24ee82b778e5a") 11 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-osx-x86_64-1.16.0.tgz")
  12 +set(onnxruntime_URL2 )
  13 +set(onnxruntime_HASH "SHA256=3d639a269af4e97a455f23cff363a709ef3a5f3e086162e65e3395c339122285")
14 14
15 # If you don't have access to the Internet, 15 # If you don't have access to the Internet,
16 # please download onnxruntime to one of the following locations. 16 # please download onnxruntime to one of the following locations.
17 # You can add more if you want. 17 # You can add more if you want.
18 set(possible_file_locations 18 set(possible_file_locations
19 - $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-1.15.1.tgz  
20 - ${PROJECT_SOURCE_DIR}/onnxruntime-osx-x86_64-1.15.1.tgz  
21 - ${PROJECT_BINARY_DIR}/onnxruntime-osx-x86_64-1.15.1.tgz  
22 - /tmp/onnxruntime-osx-x86_64-1.15.1.tgz 19 + $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-1.16.0.tgz
  20 + ${PROJECT_SOURCE_DIR}/onnxruntime-osx-x86_64-1.16.0.tgz
  21 + ${PROJECT_BINARY_DIR}/onnxruntime-osx-x86_64-1.16.0.tgz
  22 + /tmp/onnxruntime-osx-x86_64-1.16.0.tgz
23 ) 23 )
24 24
25 foreach(f IN LISTS possible_file_locations) 25 foreach(f IN LISTS possible_file_locations)
@@ -19,18 +19,18 @@ if(NOT SHERPA_ONNX_ENABLE_GPU) @@ -19,18 +19,18 @@ if(NOT SHERPA_ONNX_ENABLE_GPU)
19 message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}") 19 message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}")
20 endif() 20 endif()
21 21
22 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-win-x64-gpu-1.15.1.zip")  
23 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-win-x64-gpu-1.15.1.zip")  
24 -set(onnxruntime_HASH "SHA256=dcc3a385b415dd2e4a813018b71da5085d9b97774552edf17947826a255a3732") 22 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.0/onnxruntime-win-x64-gpu-1.16.0.zip")
  23 +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-win-x64-gpu-1.16.0.zip")
  24 +set(onnxruntime_HASH "SHA256=2a824d2a98fe7328980fcd27016fe797137f7050b047eecf3a3f6b82a24f63c1")
25 25
26 # If you don't have access to the Internet, 26 # If you don't have access to the Internet,
27 # please download onnxruntime to one of the following locations. 27 # please download onnxruntime to one of the following locations.
28 # You can add more if you want. 28 # You can add more if you want.
29 set(possible_file_locations 29 set(possible_file_locations
30 - $ENV{HOME}/Downloads/onnxruntime-win-x64-gpu-1.15.1.zip  
31 - ${PROJECT_SOURCE_DIR}/onnxruntime-win-x64-gpu-1.15.1.zip  
32 - ${PROJECT_BINARY_DIR}/onnxruntime-win-x64-gpu-1.15.1.zip  
33 - /tmp/onnxruntime-win-x64-gpu-1.15.1.zip 30 + $ENV{HOME}/Downloads/onnxruntime-win-x64-gpu-1.16.0.zip
  31 + ${PROJECT_SOURCE_DIR}/onnxruntime-win-x64-gpu-1.16.0.zip
  32 + ${PROJECT_BINARY_DIR}/onnxruntime-win-x64-gpu-1.16.0.zip
  33 + /tmp/onnxruntime-win-x64-gpu-1.16.0.zip
34 ) 34 )
35 35
36 foreach(f IN LISTS possible_file_locations) 36 foreach(f IN LISTS possible_file_locations)
@@ -15,18 +15,18 @@ if(BUILD_SHARED_LIBS) @@ -15,18 +15,18 @@ if(BUILD_SHARED_LIBS)
15 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 15 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
16 endif() 16 endif()
17 17
18 -set(onnxruntime_URL "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-static-1.15.1.tar.bz2") 18 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-static-1.16.0.tar.bz2")
19 set(onnxruntime_URL2 "") 19 set(onnxruntime_URL2 "")
20 -set(onnxruntime_HASH "SHA256=c809a8510a89b8b37ae7d563c39229db22bac8fbefcbfe5c81a60b367d065b1b") 20 +set(onnxruntime_HASH "SHA256=d1b87e8a438a7e31b46bf13a194c5ac38fdf60ebeefef82692008e42e3242776")
21 21
22 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
23 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
24 # You can add more if you want. 24 # You can add more if you want.
25 set(possible_file_locations 25 set(possible_file_locations
26 - $ENV{HOME}/Downloads/onnxruntime-win-x64-static-1.15.1.tar.bz2  
27 - ${PROJECT_SOURCE_DIR}/onnxruntime-win-x64-static-1.15.1.tar.bz2  
28 - ${PROJECT_BINARY_DIR}/onnxruntime-win-x64-static-1.15.1.tar.bz2  
29 - /tmp/onnxruntime-win-x64-static-1.15.1.tar.bz2 26 + $ENV{HOME}/Downloads/onnxruntime-win-x64-static-1.16.0.tar.bz2
  27 + ${PROJECT_SOURCE_DIR}/onnxruntime-win-x64-static-1.16.0.tar.bz2
  28 + ${PROJECT_BINARY_DIR}/onnxruntime-win-x64-static-1.16.0.tar.bz2
  29 + /tmp/onnxruntime-win-x64-static-1.16.0.tar.bz2
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS) @@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS)
15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
16 endif() 16 endif()
17 17
18 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-win-x64-1.15.1.zip")  
19 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-win-x64-1.15.1.zip")  
20 -set(onnxruntime_HASH "SHA256=261308ee5526dfd3f405ce8863e43d624a2e0bcd16b2d33cdea8c120ab3534d3") 18 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.0/onnxruntime-win-x64-1.16.0.zip")
  19 +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-win-x64-1.16.0.zip")
  20 +set(onnxruntime_HASH "SHA256=ce6777ecde7d4a6c9d4eab9774089fe04be1bad979323ae502e667b95222e08f")
21 21
22 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
23 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
24 # You can add more if you want. 24 # You can add more if you want.
25 set(possible_file_locations 25 set(possible_file_locations
26 - $ENV{HOME}/Downloads/onnxruntime-win-x64-1.15.1.zip  
27 - ${PROJECT_SOURCE_DIR}/onnxruntime-win-x64-1.15.1.zip  
28 - ${PROJECT_BINARY_DIR}/onnxruntime-win-x64-1.15.1.zip  
29 - /tmp/onnxruntime-win-x64-1.15.1.zip 26 + $ENV{HOME}/Downloads/onnxruntime-win-x64-1.16.0.zip
  27 + ${PROJECT_SOURCE_DIR}/onnxruntime-win-x64-1.16.0.zip
  28 + ${PROJECT_BINARY_DIR}/onnxruntime-win-x64-1.16.0.zip
  29 + /tmp/onnxruntime-win-x64-1.16.0.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -15,18 +15,18 @@ if(BUILD_SHARED_LIBS) @@ -15,18 +15,18 @@ if(BUILD_SHARED_LIBS)
15 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 15 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
16 endif() 16 endif()
17 17
18 -set(onnxruntime_URL "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-static-1.15.1.tar.bz2") 18 +set(onnxruntime_URL "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-static-1.16.0.tar.bz2")
19 set(onnxruntime_URL2 "") 19 set(onnxruntime_URL2 "")
20 -set(onnxruntime_HASH "SHA256=94d9a30976b5c4a5dff7508d00f141835916e5a36315d5f53be9b3edb85148b5") 20 +set(onnxruntime_HASH "SHA256=aedb6b5275f7832ac5117db8e40328a0842ae8ce6749a0c99bcb4218c53fdc60")
21 21
22 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
23 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
24 # You can add more if you want. 24 # You can add more if you want.
25 set(possible_file_locations 25 set(possible_file_locations
26 - $ENV{HOME}/Downloads/onnxruntime-win-x86-static-1.15.1.tar.bz2  
27 - ${PROJECT_SOURCE_DIR}/onnxruntime-win-x86-static-1.15.1.tar.bz2  
28 - ${PROJECT_BINARY_DIR}/onnxruntime-win-x86-static-1.15.1.tar.bz2  
29 - /tmp/onnxruntime-win-x86-static-1.15.1.tar.bz2 26 + $ENV{HOME}/Downloads/onnxruntime-win-x86-static-1.16.0.tar.bz2
  27 + ${PROJECT_SOURCE_DIR}/onnxruntime-win-x86-static-1.16.0.tar.bz2
  28 + ${PROJECT_BINARY_DIR}/onnxruntime-win-x86-static-1.16.0.tar.bz2
  29 + /tmp/onnxruntime-win-x86-static-1.16.0.tar.bz2
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS) @@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS)
15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
16 endif() 16 endif()
17 17
18 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.15.1/onnxruntime-win-x86-1.15.1.zip")  
19 -set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-win-x86-1.15.1.zip")  
20 -set(onnxruntime_HASH "SHA256=8de18fdf274a8adcd95272fcf58beda0fe2fb37f0cd62c02bc4bb6200429e4e2") 18 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.16.0/onnxruntime-win-x86-1.16.0.zip")
  19 +set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-win-x86-1.16.0.zip")
  20 +set(onnxruntime_HASH "SHA256=a1da9e0739336c826c04ab7cb63a3e7bf6ab0dda5fb8bbba17bba4cf8c7d4e20")
21 21
22 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
23 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
24 # You can add more if you want. 24 # You can add more if you want.
25 set(possible_file_locations 25 set(possible_file_locations
26 - $ENV{HOME}/Downloads/onnxruntime-win-x86-1.15.1.zip  
27 - ${PROJECT_SOURCE_DIR}/onnxruntime-win-x86-1.15.1.zip  
28 - ${PROJECT_BINARY_DIR}/onnxruntime-win-x86-1.15.1.zip  
29 - /tmp/onnxruntime-win-x86-1.15.1.zip 26 + $ENV{HOME}/Downloads/onnxruntime-win-x86-1.16.0.zip
  27 + ${PROJECT_SOURCE_DIR}/onnxruntime-win-x86-1.16.0.zip
  28 + ${PROJECT_BINARY_DIR}/onnxruntime-win-x86-1.16.0.zip
  29 + /tmp/onnxruntime-win-x86-1.16.0.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 /* End PBXContainerItemProxy section */ 40 /* End PBXContainerItemProxy section */
41 41
42 /* Begin PBXFileReference section */ 42 /* Begin PBXFileReference section */
43 - C93989AF2A89FE33009AB859 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.15.1/onnxruntime.xcframework"; sourceTree = "<group>"; }; 43 + C93989AF2A89FE33009AB859 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.16.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
44 C93989B12A89FF78009AB859 /* decoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; name = decoder.int8.onnx; path = "../../../icefall-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en/decoder.int8.onnx"; sourceTree = "<group>"; }; 44 C93989B12A89FF78009AB859 /* decoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; name = decoder.int8.onnx; path = "../../../icefall-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en/decoder.int8.onnx"; sourceTree = "<group>"; };
45 C93989B22A89FF78009AB859 /* encoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; name = encoder.int8.onnx; path = "../../../icefall-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en/encoder.int8.onnx"; sourceTree = "<group>"; }; 45 C93989B22A89FF78009AB859 /* encoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; name = encoder.int8.onnx; path = "../../../icefall-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en/encoder.int8.onnx"; sourceTree = "<group>"; };
46 C93989B32A89FF78009AB859 /* tokens.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = tokens.txt; path = "../../../icefall-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en/tokens.txt"; sourceTree = "<group>"; }; 46 C93989B32A89FF78009AB859 /* tokens.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = tokens.txt; path = "../../../icefall-models/sherpa-onnx-streaming-paraformer-bilingual-zh-en/tokens.txt"; sourceTree = "<group>"; };
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 C9A2588D2AAF039D00E555CA /* Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; }; 30 C9A2588D2AAF039D00E555CA /* Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; };
31 C9A258922AAF057E00E555CA /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; }; 31 C9A258922AAF057E00E555CA /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; };
32 C9A258952AAF05D100E555CA /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; }; 32 C9A258952AAF05D100E555CA /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
33 - C9A258972AAF05E400E555CA /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.15.1/onnxruntime.xcframework"; sourceTree = "<group>"; }; 33 + C9A258972AAF05E400E555CA /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.16.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
34 /* End PBXFileReference section */ 34 /* End PBXFileReference section */
35 35
36 /* Begin PBXFrameworksBuildPhase section */ 36 /* Begin PBXFrameworksBuildPhase section */
@@ -34,7 +34,7 @@ def get_dict(): @@ -34,7 +34,7 @@ def get_dict():
34 def process_linux(s): 34 def process_linux(s):
35 libs = [ 35 libs = [
36 "libkaldi-native-fbank-core.so", 36 "libkaldi-native-fbank-core.so",
37 - "libonnxruntime.so.1.15.1", 37 + "libonnxruntime.so.1.16.0",
38 "libsherpa-onnx-c-api.so", 38 "libsherpa-onnx-c-api.so",
39 "libsherpa-onnx-core.so", 39 "libsherpa-onnx-core.so",
40 ] 40 ]
@@ -56,7 +56,7 @@ def process_linux(s): @@ -56,7 +56,7 @@ def process_linux(s):
56 def process_macos(s): 56 def process_macos(s):
57 libs = [ 57 libs = [
58 "libkaldi-native-fbank-core.dylib", 58 "libkaldi-native-fbank-core.dylib",
59 - "libonnxruntime.1.15.1.dylib", 59 + "libonnxruntime.1.16.0.dylib",
60 "libsherpa-onnx-c-api.dylib", 60 "libsherpa-onnx-c-api.dylib",
61 "libsherpa-onnx-core.dylib", 61 "libsherpa-onnx-core.dylib",
62 ] 62 ]
@@ -31,9 +31,18 @@ extern "C" { @@ -31,9 +31,18 @@ extern "C" {
31 #define SHERPA_ONNX_IMPORT 31 #define SHERPA_ONNX_IMPORT
32 #endif 32 #endif
33 #else // WIN32 33 #else // WIN32
34 -#define SHERPA_ONNX_EXPORT __attribute__((visibility("default"))) 34 +#if __APPLE__
  35 +// it throws a warning on macOS when using
  36 +// __attribute__((visibility("default")))
  37 +//
  38 +// warning: 'visibility' attribute ignored [-Wignored-attributes]
  39 +#define SHERPA_ONNX_EXPORT
  40 +#else
  41 +#define SHERPA_ONNX_EXPORT __attribute__((visibility("default")))
  42 +#endif // __APPLE__
  43 +
35 #define SHERPA_ONNX_IMPORT SHERPA_ONNX_EXPORT 44 #define SHERPA_ONNX_IMPORT SHERPA_ONNX_EXPORT
36 -#endif 45 +#endif // WIN32
37 46
38 #if defined(SHERPA_ONNX_BUILD_MAIN_LIB) 47 #if defined(SHERPA_ONNX_BUILD_MAIN_LIB)
39 #define SHERPA_ONNX_API SHERPA_ONNX_EXPORT 48 #define SHERPA_ONNX_API SHERPA_ONNX_EXPORT
@@ -178,12 +187,14 @@ SHERPA_ONNX_API void DestroyOnlineRecognizer( @@ -178,12 +187,14 @@ SHERPA_ONNX_API void DestroyOnlineRecognizer(
178 SHERPA_ONNX_API SherpaOnnxOnlineStream *CreateOnlineStream( 187 SHERPA_ONNX_API SherpaOnnxOnlineStream *CreateOnlineStream(
179 const SherpaOnnxOnlineRecognizer *recognizer); 188 const SherpaOnnxOnlineRecognizer *recognizer);
180 189
181 -/// Create an online stream for accepting wave samples with the specified hot words. 190 +/// Create an online stream for accepting wave samples with the specified hot
  191 +/// words.
182 /// 192 ///
183 /// @param recognizer A pointer returned by CreateOnlineRecognizer() 193 /// @param recognizer A pointer returned by CreateOnlineRecognizer()
184 /// @return Return a pointer to an OnlineStream. The user has to invoke 194 /// @return Return a pointer to an OnlineStream. The user has to invoke
185 /// DestroyOnlineStream() to free it to avoid memory leak. 195 /// DestroyOnlineStream() to free it to avoid memory leak.
186 -SHERPA_ONNX_API SherpaOnnxOnlineStream *CreateOnlineStreamWithHotwords(const SherpaOnnxOnlineRecognizer *recognizer, const char *hotwords); 196 +SHERPA_ONNX_API SherpaOnnxOnlineStream *CreateOnlineStreamWithHotwords(
  197 + const SherpaOnnxOnlineRecognizer *recognizer, const char *hotwords);
187 198
188 /// Destroy an online stream. 199 /// Destroy an online stream.
189 /// 200 ///