Skip to content

Commit 1b59efd

Browse files
authored
Remove cppinyin from zipvoice (#2892)
1 parent 42dcaf1 commit 1b59efd

22 files changed

Lines changed: 60 additions & 760 deletions

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,6 @@ if(SHERPA_ONNX_ENABLE_WEBSOCKET)
496496
endif()
497497

498498
if(SHERPA_ONNX_ENABLE_TTS)
499-
include(cppinyin)
500-
501499
include(espeak-ng-for-piper)
502500
set(ESPEAK_NG_DIR ${espeak_ng_SOURCE_DIR})
503501
message(STATUS "ESPEAK_NG_DIR: ${ESPEAK_NG_DIR}")

build-ios.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ cmake --build build/os64 --target install
127127
echo "Generate xcframework"
128128

129129
mkdir -p "build/simulator/lib"
130-
for f in libcppinyin_core.a libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
130+
for f in libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
131131
libsherpa-onnx-fstfar.a libssentencepiece_core.a \
132132
libsherpa-onnx-fst.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a \
133133
libucd.a libpiper_phonemize.a libespeak-ng.a; do
@@ -139,7 +139,6 @@ done
139139
# Merge archive first, because the following xcodebuild create xcframework
140140
# cannot accept multi archive with the same architecture.
141141
libtool -static -o build/simulator/libsherpa-onnx.a \
142-
build/simulator/lib/libcppinyin_core.a \
143142
build/simulator/lib/libkaldi-native-fbank-core.a \
144143
build/simulator/lib/libkissfft-float.a \
145144
build/simulator/lib/libsherpa-onnx-c-api.a \
@@ -154,7 +153,6 @@ libtool -static -o build/simulator/libsherpa-onnx.a \
154153
build/simulator/lib/libssentencepiece_core.a
155154

156155
libtool -static -o build/os64/libsherpa-onnx.a \
157-
build/os64/lib/libcppinyin_core.a \
158156
build/os64/lib/libkaldi-native-fbank-core.a \
159157
build/os64/lib/libkissfft-float.a \
160158
build/os64/lib/libsherpa-onnx-c-api.a \

build-swift-macos.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ make install
2727
rm -fv ./install/include/cargs.h
2828

2929
libtool -static -o ./install/lib/libsherpa-onnx.a \
30-
./install/lib/libcppinyin_core.a \
3130
./install/lib/libsherpa-onnx-c-api.a \
3231
./install/lib/libsherpa-onnx-core.a \
3332
./install/lib/libkaldi-native-fbank-core.a \

c-api-examples/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CUR_DIR :=$(shell pwd)
44
CFLAGS := -I ../ -I ../build/_deps/cargs-src/include/
55
LDFLAGS := -L ../build/lib
66
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 -lcppinyin_core
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
88
LDFLAGS += -framework Foundation
99
LDFLAGS += -lc++
1010
LDFLAGS += -Wl,-rpath,${CUR_DIR}/../build/lib

cmake/cppinyin.cmake

Lines changed: 0 additions & 82 deletions
This file was deleted.

cmake/cppinyin.patch

Lines changed: 0 additions & 81 deletions
This file was deleted.

cmake/sherpa-onnx-static.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ Cflags: -I"${includedir}"
2222
# Note: -lcargs is required only for the following file
2323
# https://github.com/k2-fsa/sherpa-onnx/blob/master/c-api-examples/decode-file-c-api.c
2424
# 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 -lcppinyin_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 -Wl,-rpath,${libdir} @SHERPA_ONNX_PKG_WITH_CARGS@ @SHERPA_ONNX_PKG_CONFIG_EXTRA_LIBS@

mfc-examples/NonStreamingSpeechRecognition/sherpa-onnx-deps.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
sherpa-onnx-fst.lib;
1616
kaldi-native-fbank-core.lib;
1717
kissfft-float.lib;
18-
cppinyin_core.lib;
1918
onnxruntime.lib;
2019
piper_phonemize.lib;
2120
espeak-ng.lib;

mfc-examples/NonStreamingTextToSpeech/sherpa-onnx-deps.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
sherpa-onnx-fst.lib;
1616
kaldi-native-fbank-core.lib;
1717
kissfft-float.lib;
18-
cppinyin_core.lib;
1918
onnxruntime.lib;
2019
piper_phonemize.lib;
2120
espeak-ng.lib;

mfc-examples/StreamingSpeechRecognition/sherpa-onnx-deps.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
sherpa-onnx-fst.lib;
1616
kaldi-native-fbank-core.lib;
1717
kissfft-float.lib;
18-
cppinyin_core.lib;
1918
onnxruntime.lib;
2019
piper_phonemize.lib;
2120
espeak-ng.lib;

0 commit comments

Comments
 (0)