xuning / sherpaonnx

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

Fixes #1512 (#1522)

内嵌 并排对比
正在显示 3 个修改的文件 包含 15 行增加 和 4 行删除
@@ -43,6 +43,13 @@ jobs: @@ -43,6 +43,13 @@ jobs:
43 steps: 43 steps:
44 - uses: actions/checkout@v4 44 - uses: actions/checkout@v4
45 45
  46 + - name: Build iOS shared
  47 + if: matrix.with_tts == 'ON'
  48 + shell: bash
  49 + run: |
  50 + export CMAKE_VERBOSE_MAKEFILE=ON
  51 + ./build-ios-shared.sh
  52 +
46 - name: Build iOS 53 - name: Build iOS
47 if: matrix.with_tts == 'ON' 54 if: matrix.with_tts == 'ON'
48 shell: bash 55 shell: bash
@@ -19,6 +19,10 @@ if [ "$SHERPA_ONNX_GITHUB_MIRROW" == true ]; then @@ -19,6 +19,10 @@ if [ "$SHERPA_ONNX_GITHUB_MIRROW" == true ]; then
19 SHERPA_ONNX_GITHUB=hub.nuaa.cf 19 SHERPA_ONNX_GITHUB=hub.nuaa.cf
20 fi 20 fi
21 21
  22 +if [ ! -z CMAKE_VERBOSE_MAKEFILE ]; then
  23 + CMAKE_VERBOSE_MAKEFILE=ON
  24 +fi
  25 +
22 if [ ! -f $onnxruntime_dir/onnxruntime.xcframework/ios-arm64/onnxruntime.a ]; then 26 if [ ! -f $onnxruntime_dir/onnxruntime.xcframework/ios-arm64/onnxruntime.a ]; then
23 mkdir -p $onnxruntime_dir 27 mkdir -p $onnxruntime_dir
24 pushd $onnxruntime_dir 28 pushd $onnxruntime_dir
@@ -50,7 +54,7 @@ if [[ ! -f build/simulator_x86_64/install/lib/libsherpa-onnx-c-api.dylib ]]; the @@ -50,7 +54,7 @@ if [[ ! -f build/simulator_x86_64/install/lib/libsherpa-onnx-c-api.dylib ]]; the
50 -DBUILD_PIPER_PHONMIZE_TESTS=OFF \ 54 -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
51 -DBUILD_ESPEAK_NG_EXE=OFF \ 55 -DBUILD_ESPEAK_NG_EXE=OFF \
52 -DBUILD_ESPEAK_NG_TESTS=OFF \ 56 -DBUILD_ESPEAK_NG_TESTS=OFF \
53 - -S .. \ 57 + -S .. -D CMAKE_VERBOSE_MAKEFILE=$CMAKE_VERBOSE_MAKEFILE \
54 -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \ 58 -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
55 -DPLATFORM=SIMULATOR64 \ 59 -DPLATFORM=SIMULATOR64 \
56 -DENABLE_BITCODE=0 \ 60 -DENABLE_BITCODE=0 \
@@ -81,7 +85,7 @@ if [[ ! -f build/simulator_arm64/install/lib/libsherpa-onnx-c-api.dylib ]]; then @@ -81,7 +85,7 @@ if [[ ! -f build/simulator_arm64/install/lib/libsherpa-onnx-c-api.dylib ]]; then
81 -DBUILD_PIPER_PHONMIZE_TESTS=OFF \ 85 -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
82 -DBUILD_ESPEAK_NG_EXE=OFF \ 86 -DBUILD_ESPEAK_NG_EXE=OFF \
83 -DBUILD_ESPEAK_NG_TESTS=OFF \ 87 -DBUILD_ESPEAK_NG_TESTS=OFF \
84 - -S .. \ 88 + -S .. -D CMAKE_VERBOSE_MAKEFILE=$CMAKE_VERBOSE_MAKEFILE \
85 -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \ 89 -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
86 -DPLATFORM=SIMULATORARM64 \ 90 -DPLATFORM=SIMULATORARM64 \
87 -DENABLE_BITCODE=0 \ 91 -DENABLE_BITCODE=0 \
@@ -114,7 +118,7 @@ if [[ ! -f build/os64/install/lib/libsherpa-onnx-c-api.dylib ]]; then @@ -114,7 +118,7 @@ if [[ ! -f build/os64/install/lib/libsherpa-onnx-c-api.dylib ]]; then
114 -DBUILD_PIPER_PHONMIZE_TESTS=OFF \ 118 -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
115 -DBUILD_ESPEAK_NG_EXE=OFF \ 119 -DBUILD_ESPEAK_NG_EXE=OFF \
116 -DBUILD_ESPEAK_NG_TESTS=OFF \ 120 -DBUILD_ESPEAK_NG_TESTS=OFF \
117 - -S .. \ 121 + -S .. -D CMAKE_VERBOSE_MAKEFILE=$CMAKE_VERBOSE_MAKEFILE \
118 -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \ 122 -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
119 -DPLATFORM=OS64 \ 123 -DPLATFORM=OS64 \
120 -DENABLE_BITCODE=0 \ 124 -DENABLE_BITCODE=0 \
@@ -214,7 +214,7 @@ if(SHERPA_ONNX_ENABLE_GPU) @@ -214,7 +214,7 @@ if(SHERPA_ONNX_ENABLE_GPU)
214 ) 214 )
215 endif() 215 endif()
216 216
217 -if(BUILD_SHARED_LIBS) 217 +if(BUILD_SHARED_LIBS AND NOT DEFINED onnxruntime_lib_files)
218 target_link_libraries(sherpa-onnx-core onnxruntime) 218 target_link_libraries(sherpa-onnx-core onnxruntime)
219 else() 219 else()
220 target_link_libraries(sherpa-onnx-core ${onnxruntime_lib_files}) 220 target_link_libraries(sherpa-onnx-core ${onnxruntime_lib_files})