xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
f0e68cde 1 parent 27311b8a

Fix linking (#2546)

内嵌 并排对比
正在显示 11 个修改的文件 包含 19 行增加 和 10 行删除
@@ -372,7 +372,6 @@ endif() @@ -372,7 +372,6 @@ endif()
372 include(kaldi-native-fbank) 372 include(kaldi-native-fbank)
373 include(kaldi-decoder) 373 include(kaldi-decoder)
374 include(onnxruntime) 374 include(onnxruntime)
375 -include(cppinyin)  
376 include(simple-sentencepiece) 375 include(simple-sentencepiece)
377 set(ONNXRUNTIME_DIR ${onnxruntime_SOURCE_DIR}) 376 set(ONNXRUNTIME_DIR ${onnxruntime_SOURCE_DIR})
378 message(STATUS "ONNXRUNTIME_DIR: ${ONNXRUNTIME_DIR}") 377 message(STATUS "ONNXRUNTIME_DIR: ${ONNXRUNTIME_DIR}")
@@ -398,6 +397,8 @@ if(SHERPA_ONNX_ENABLE_WEBSOCKET) @@ -398,6 +397,8 @@ if(SHERPA_ONNX_ENABLE_WEBSOCKET)
398 endif() 397 endif()
399 398
400 if(SHERPA_ONNX_ENABLE_TTS) 399 if(SHERPA_ONNX_ENABLE_TTS)
  400 + include(cppinyin)
  401 +
401 include(espeak-ng-for-piper) 402 include(espeak-ng-for-piper)
402 set(ESPEAK_NG_DIR ${espeak_ng_SOURCE_DIR}) 403 set(ESPEAK_NG_DIR ${espeak_ng_SOURCE_DIR})
403 message(STATUS "ESPEAK_NG_DIR: ${ESPEAK_NG_DIR}") 404 message(STATUS "ESPEAK_NG_DIR: ${ESPEAK_NG_DIR}")
@@ -127,7 +127,7 @@ cmake --build build/os64 --target install @@ -127,7 +127,7 @@ cmake --build build/os64 --target install
127 echo "Generate xcframework" 127 echo "Generate xcframework"
128 128
129 mkdir -p "build/simulator/lib" 129 mkdir -p "build/simulator/lib"
130 -for f in libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \ 130 +for f in libcppinyin_core.a libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
131 libsherpa-onnx-fstfar.a libssentencepiece_core.a \ 131 libsherpa-onnx-fstfar.a libssentencepiece_core.a \
132 libsherpa-onnx-fst.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a \ 132 libsherpa-onnx-fst.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a \
133 libucd.a libpiper_phonemize.a libespeak-ng.a; do 133 libucd.a libpiper_phonemize.a libespeak-ng.a; do
@@ -139,6 +139,7 @@ done @@ -139,6 +139,7 @@ done
139 # Merge archive first, because the following xcodebuild create xcframework 139 # Merge archive first, because the following xcodebuild create xcframework
140 # cannot accept multi archive with the same architecture. 140 # cannot accept multi archive with the same architecture.
141 libtool -static -o build/simulator/sherpa-onnx.a \ 141 libtool -static -o build/simulator/sherpa-onnx.a \
  142 + build/simulator/lib/libcppinyin_core.a \
142 build/simulator/lib/libkaldi-native-fbank-core.a \ 143 build/simulator/lib/libkaldi-native-fbank-core.a \
143 build/simulator/lib/libkissfft-float.a \ 144 build/simulator/lib/libkissfft-float.a \
144 build/simulator/lib/libsherpa-onnx-c-api.a \ 145 build/simulator/lib/libsherpa-onnx-c-api.a \
@@ -153,6 +154,7 @@ libtool -static -o build/simulator/sherpa-onnx.a \ @@ -153,6 +154,7 @@ libtool -static -o build/simulator/sherpa-onnx.a \
153 build/simulator/lib/libssentencepiece_core.a 154 build/simulator/lib/libssentencepiece_core.a
154 155
155 libtool -static -o build/os64/sherpa-onnx.a \ 156 libtool -static -o build/os64/sherpa-onnx.a \
  157 + build/os64/lib/libcppinyin_core.a \
156 build/os64/lib/libkaldi-native-fbank-core.a \ 158 build/os64/lib/libkaldi-native-fbank-core.a \
157 build/os64/lib/libkissfft-float.a \ 159 build/os64/lib/libkissfft-float.a \
158 build/os64/lib/libsherpa-onnx-c-api.a \ 160 build/os64/lib/libsherpa-onnx-c-api.a \
@@ -27,6 +27,7 @@ make install @@ -27,6 +27,7 @@ make install
27 rm -fv ./install/include/cargs.h 27 rm -fv ./install/include/cargs.h
28 28
29 libtool -static -o ./install/lib/libsherpa-onnx.a \ 29 libtool -static -o ./install/lib/libsherpa-onnx.a \
  30 + ./install/lib/libcppinyin_core.a \
30 ./install/lib/libsherpa-onnx-c-api.a \ 31 ./install/lib/libsherpa-onnx-c-api.a \
31 ./install/lib/libsherpa-onnx-core.a \ 32 ./install/lib/libsherpa-onnx-core.a \
32 ./install/lib/libkaldi-native-fbank-core.a \ 33 ./install/lib/libkaldi-native-fbank-core.a \
@@ -4,7 +4,7 @@ CUR_DIR :=$(shell pwd) @@ -4,7 +4,7 @@ CUR_DIR :=$(shell pwd)
4 CFLAGS := -I ../ -I ../build/_deps/cargs-src/include/ 4 CFLAGS := -I ../ -I ../build/_deps/cargs-src/include/
5 LDFLAGS := -L ../build/lib 5 LDFLAGS := -L ../build/lib
6 LDFLAGS += -L ../build/_deps/onnxruntime-src/lib 6 LDFLAGS += -L ../build/_deps/onnxruntime-src/lib
7 -LDFLAGS += -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lcargs -lonnxruntime 7 +LDFLAGS += -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lcargs -lonnxruntime -lcppinyin_core
8 LDFLAGS += -framework Foundation 8 LDFLAGS += -framework Foundation
9 LDFLAGS += -lc++ 9 LDFLAGS += -lc++
10 LDFLAGS += -Wl,-rpath,${CUR_DIR}/../build/lib 10 LDFLAGS += -Wl,-rpath,${CUR_DIR}/../build/lib
@@ -22,4 +22,4 @@ Cflags: -I"${includedir}" @@ -22,4 +22,4 @@ Cflags: -I"${includedir}"
22 # Note: -lcargs is required only for the following file 22 # Note: -lcargs is required only for the following file
23 # https://github.com/k2-fsa/sherpa-onnx/blob/master/c-api-examples/decode-file-c-api.c 23 # https://github.com/k2-fsa/sherpa-onnx/blob/master/c-api-examples/decode-file-c-api.c
24 # We add it here so that users don't need to specify -lcargs when compiling decode-file-c-api.c 24 # We add it here so that users don't need to specify -lcargs when compiling decode-file-c-api.c
25 -Libs: -L"${libdir}" -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lonnxruntime -lssentencepiece_core -Wl,-rpath,${libdir} @SHERPA_ONNX_PKG_WITH_CARGS@ @SHERPA_ONNX_PKG_CONFIG_EXTRA_LIBS@ 25 +Libs: -L"${libdir}" -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lonnxruntime -lssentencepiece_core -lcppinyin_core -Wl,-rpath,${libdir} @SHERPA_ONNX_PKG_WITH_CARGS@ @SHERPA_ONNX_PKG_CONFIG_EXTRA_LIBS@
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 sherpa-onnx-fst.lib; 15 sherpa-onnx-fst.lib;
16 kaldi-native-fbank-core.lib; 16 kaldi-native-fbank-core.lib;
17 kissfft-float.lib; 17 kissfft-float.lib;
  18 + cppinyin_core.lib;
18 onnxruntime.lib; 19 onnxruntime.lib;
19 piper_phonemize.lib; 20 piper_phonemize.lib;
20 espeak-ng.lib; 21 espeak-ng.lib;
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 sherpa-onnx-fst.lib; 15 sherpa-onnx-fst.lib;
16 kaldi-native-fbank-core.lib; 16 kaldi-native-fbank-core.lib;
17 kissfft-float.lib; 17 kissfft-float.lib;
  18 + cppinyin_core.lib;
18 onnxruntime.lib; 19 onnxruntime.lib;
19 piper_phonemize.lib; 20 piper_phonemize.lib;
20 espeak-ng.lib; 21 espeak-ng.lib;
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 sherpa-onnx-fst.lib; 15 sherpa-onnx-fst.lib;
16 kaldi-native-fbank-core.lib; 16 kaldi-native-fbank-core.lib;
17 kissfft-float.lib; 17 kissfft-float.lib;
  18 + cppinyin_core.lib;
18 onnxruntime.lib; 19 onnxruntime.lib;
19 piper_phonemize.lib; 20 piper_phonemize.lib;
20 espeak-ng.lib; 21 espeak-ng.lib;
@@ -354,11 +354,11 @@ OfflineRecognizerResult OfflineRecognizer::GetResult( @@ -354,11 +354,11 @@ OfflineRecognizerResult OfflineRecognizer::GetResult(
354 ans.lang = r->lang ? r->lang : ""; 354 ans.lang = r->lang ? r->lang : "";
355 ans.emotion = r->emotion ? r->emotion : ""; 355 ans.emotion = r->emotion ? r->emotion : "";
356 ans.event = r->event ? r->event : ""; 356 ans.event = r->event ? r->event : "";
357 - }  
358 357
359 - if (r->durations) {  
360 - ans.durations.resize(r->count);  
361 - std::copy(r->durations, r->durations + r->count, ans.durations.data()); 358 + if (r->durations) {
  359 + ans.durations.resize(r->count);
  360 + std::copy(r->durations, r->durations + r->count, ans.durations.data());
  361 + }
362 } 362 }
363 363
364 SherpaOnnxDestroyOfflineRecognizerResult(r); 364 SherpaOnnxDestroyOfflineRecognizerResult(r);
@@ -268,7 +268,6 @@ if(ANDROID_NDK) @@ -268,7 +268,6 @@ if(ANDROID_NDK)
268 endif() 268 endif()
269 269
270 target_link_libraries(sherpa-onnx-core 270 target_link_libraries(sherpa-onnx-core
271 - cppinyin_core  
272 kaldi-native-fbank-core 271 kaldi-native-fbank-core
273 kaldi-decoder-core 272 kaldi-decoder-core
274 ssentencepiece_core 273 ssentencepiece_core
@@ -311,7 +310,9 @@ endif() @@ -311,7 +310,9 @@ endif()
311 target_link_libraries(sherpa-onnx-core fstfar fst) 310 target_link_libraries(sherpa-onnx-core fstfar fst)
312 311
313 if(SHERPA_ONNX_ENABLE_TTS) 312 if(SHERPA_ONNX_ENABLE_TTS)
314 - target_link_libraries(sherpa-onnx-core piper_phonemize) 313 + target_link_libraries(sherpa-onnx-core
  314 + cppinyin_core
  315 + piper_phonemize)
315 endif() 316 endif()
316 target_link_libraries(sherpa-onnx-core cppjieba) 317 target_link_libraries(sherpa-onnx-core cppjieba)
317 318
@@ -663,6 +663,7 @@ const @@ -663,6 +663,7 @@ const
663 {$linklib sherpa-onnx-kaldifst-core} 663 {$linklib sherpa-onnx-kaldifst-core}
664 {$linklib sherpa-onnx-fstfar} 664 {$linklib sherpa-onnx-fstfar}
665 {$linklib sherpa-onnx-fst} 665 {$linklib sherpa-onnx-fst}
  666 + {$linklib cppinyin_core}
666 {$linklib kissfft-float} 667 {$linklib kissfft-float}
667 {$linklib kaldi-native-fbank-core} 668 {$linklib kaldi-native-fbank-core}
668 {$linklib piper_phonemize} 669 {$linklib piper_phonemize}