Remove cppinyin from zipvoice

CMakeLists.txt

@@ -496,8 +496,6 @@ if(SHERPA_ONNX_ENABLE_WEBSOCKET)
 endif()
 
 if(SHERPA_ONNX_ENABLE_TTS)
-  include(cppinyin)
-
   include(espeak-ng-for-piper)
   set(ESPEAK_NG_DIR ${espeak_ng_SOURCE_DIR})
   message(STATUS "ESPEAK_NG_DIR: ${ESPEAK_NG_DIR}")

build-ios.sh

@@ -127,7 +127,7 @@ cmake --build build/os64 --target install
 echo "Generate xcframework"
 
 mkdir -p "build/simulator/lib"
-for f in libcppinyin_core.a libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
+for f in libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
          libsherpa-onnx-fstfar.a libssentencepiece_core.a \
          libsherpa-onnx-fst.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a \
          libucd.a libpiper_phonemize.a libespeak-ng.a; do
@@ -139,7 +139,6 @@ done
 # Merge archive first, because the following xcodebuild create xcframework
 # cannot accept multi archive with the same architecture.
 libtool -static -o build/simulator/libsherpa-onnx.a \
-  build/simulator/lib/libcppinyin_core.a \
   build/simulator/lib/libkaldi-native-fbank-core.a \
   build/simulator/lib/libkissfft-float.a \
   build/simulator/lib/libsherpa-onnx-c-api.a \
@@ -154,7 +153,6 @@ libtool -static -o build/simulator/libsherpa-onnx.a \
   build/simulator/lib/libssentencepiece_core.a
 
 libtool -static -o build/os64/libsherpa-onnx.a \
-  build/os64/lib/libcppinyin_core.a \
   build/os64/lib/libkaldi-native-fbank-core.a \
   build/os64/lib/libkissfft-float.a \
   build/os64/lib/libsherpa-onnx-c-api.a \

build-swift-macos.sh

@@ -27,7 +27,6 @@ make install
 rm -fv ./install/include/cargs.h
 
 libtool -static -o ./install/lib/libsherpa-onnx.a \
-  ./install/lib/libcppinyin_core.a \
   ./install/lib/libsherpa-onnx-c-api.a \
   ./install/lib/libsherpa-onnx-core.a \
   ./install/lib/libkaldi-native-fbank-core.a \

c-api-examples/Makefile

@@ -4,7 +4,7 @@ CUR_DIR :=$(shell pwd)
 CFLAGS := -I ../ -I ../build/_deps/cargs-src/include/
 LDFLAGS := -L ../build/lib
 LDFLAGS += -L ../build/_deps/onnxruntime-src/lib
-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
+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
 LDFLAGS += -framework Foundation
 LDFLAGS += -lc++
 LDFLAGS += -Wl,-rpath,${CUR_DIR}/../build/lib

cmake/sherpa-onnx-static.pc.in

@@ -22,4 +22,4 @@ Cflags: -I"${includedir}"
 # Note: -lcargs is required only for the following file
 # https://github.com/k2-fsa/sherpa-onnx/blob/master/c-api-examples/decode-file-c-api.c
 # We add it here so that users don't need to specify -lcargs when compiling decode-file-c-api.c
-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@
+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

@@ -15,7 +15,6 @@
         sherpa-onnx-fst.lib;
         kaldi-native-fbank-core.lib;
         kissfft-float.lib;
-        cppinyin_core.lib;
         onnxruntime.lib;
         piper_phonemize.lib;
         espeak-ng.lib;

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

@@ -15,7 +15,6 @@
         sherpa-onnx-fst.lib;
         kaldi-native-fbank-core.lib;
         kissfft-float.lib;
-        cppinyin_core.lib;
         onnxruntime.lib;
         piper_phonemize.lib;
         espeak-ng.lib;

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

@@ -15,7 +15,6 @@
         sherpa-onnx-fst.lib;
         kaldi-native-fbank-core.lib;
         kissfft-float.lib;
-        cppinyin_core.lib;
         onnxruntime.lib;
         piper_phonemize.lib;
         espeak-ng.lib;

sherpa-onnx/csrc/CMakeLists.txt

@@ -261,7 +261,6 @@ if(SHERPA_ONNX_ENABLE_TTS)
     offline-tts-model-config.cc
     offline-tts-vits-model-config.cc
     offline-tts-vits-model.cc
-    offline-tts-zipvoice-frontend.cc
     offline-tts-zipvoice-model-config.cc
     offline-tts-zipvoice-model.cc
     offline-tts.cc
@@ -417,7 +416,6 @@ target_link_libraries(sherpa-onnx-core fstfar fst)
 
 if(SHERPA_ONNX_ENABLE_TTS)
   target_link_libraries(sherpa-onnx-core
-    cppinyin_core
     piper_phonemize)
 endif()
 

sherpa-onnx/csrc/matcha-tts-lexicon.cc

@@ -123,8 +123,12 @@ std::vector<std::string> SplitTokensUTF8(const std::string &s) {
 }
 
 std::vector<std::string> ProcessPhonemes(
-    const std::vector<std::vector<char32_t>> &phonemes) {
+    const std::vector<std::vector<char32_t>> &phonemes, bool skip_replacement) {
   auto tokens = ConvertPhonemesToUTF8(phonemes);
+  if (skip_replacement) {
+    return tokens;
+  }
+
   std::string joined = Join(tokens);
   std::string replaced = ApplyReplacements(joined);
   return SplitTokensUTF8(replaced);
@@ -139,8 +143,8 @@ void CallPhonemizeEspeak(const std::string &text,
 class MatchaTtsLexicon::Impl {
  public:
   Impl(const std::string &lexicon, const std::string &tokens,
-       const std::string &data_dir, bool debug)
-      : debug_(debug) {
+       const std::string &data_dir, bool debug, bool skip_replacement)
+      : debug_(debug), skip_replacement_(skip_replacement) {
     if (lexicon.empty()) {
       SHERPA_ONNX_LOGE("Please provide lexicon.txt for this model");
       SHERPA_ONNX_EXIT(-1);
@@ -163,8 +167,8 @@ class MatchaTtsLexicon::Impl {
 
   template <typename Manager>
   Impl(Manager *mgr, const std::string &lexicon, const std::string &tokens,
-       const std::string &data_dir, bool debug)
-      : debug_(debug) {
+       const std::string &data_dir, bool debug, bool skip_replacement)
+      : debug_(debug), skip_replacement_(skip_replacement) {
     if (lexicon.empty()) {
       SHERPA_ONNX_LOGE("Please provide lexicon.txt for this model");
       SHERPA_ONNX_EXIT(-1);
@@ -360,7 +364,7 @@ class MatchaTtsLexicon::Impl {
         std::vector<std::vector<piper::Phoneme>> phonemes;
         CallPhonemizeEspeak(w, config, &phonemes);
 
-        auto pp = ProcessPhonemes(phonemes);
+        auto pp = ProcessPhonemes(phonemes, skip_replacement_);
 
         for (const auto &p : pp) {
           if (token2id_.count(p)) {
@@ -477,20 +481,25 @@ class MatchaTtsLexicon::Impl {
   std::unordered_map<int32_t, std::string> id2token_;
 
   bool debug_ = false;
+  bool skip_replacement_ = false;
 };  // namespace sherpa_onnx
 
 MatchaTtsLexicon::~MatchaTtsLexicon() = default;
 
 MatchaTtsLexicon::MatchaTtsLexicon(const std::string &lexicon,
                                    const std::string &tokens,
-                                   const std::string &data_dir, bool debug)
-    : impl_(std::make_unique<Impl>(lexicon, tokens, data_dir, debug)) {}
+                                   const std::string &data_dir, bool debug,
+                                   bool skip_replacement)
+    : impl_(std::make_unique<Impl>(lexicon, tokens, data_dir, debug,
+                                   skip_replacement)) {}
 
 template <typename Manager>
 MatchaTtsLexicon::MatchaTtsLexicon(Manager *mgr, const std::string &lexicon,
                                    const std::string &tokens,
-                                   const std::string &data_dir, bool debug)
-    : impl_(std::make_unique<Impl>(mgr, lexicon, tokens, data_dir, debug)) {}
+                                   const std::string &data_dir, bool debug,
+                                   bool skip_replacement)
+    : impl_(std::make_unique<Impl>(mgr, lexicon, tokens, data_dir, debug,
+                                   skip_replacement)) {}
 
 std::vector<TokenIDs> MatchaTtsLexicon::ConvertTextToTokenIds(
     const std::string &text, const std::string & /*unused_voice = ""*/) const {
@@ -502,15 +511,15 @@ template MatchaTtsLexicon::MatchaTtsLexicon(AAssetManager *mgr,
                                             const std::string &lexicon,
                                             const std::string &tokens,
                                             const std::string &data_dir,
-                                            bool debug);
+                                            bool debug, bool skip_replacement);
 #endif
 
 #if __OHOS__
 template MatchaTtsLexicon::MatchaTtsLexicon(NativeResourceManager *mgr,
                                             const std::string &lexicon,
                                             const std::string &tokens,
                                             const std::string &data_dir,
-                                            bool debug);
+                                            bool debug, bool skip_replacement);
 #endif
 
 }  // namespace sherpa_onnx

sherpa-onnx/csrc/matcha-tts-lexicon.h

@@ -20,12 +20,13 @@ class MatchaTtsLexicon : public OfflineTtsFrontend {
   ~MatchaTtsLexicon() override;
 
   MatchaTtsLexicon(const std::string &lexicon, const std::string &tokens,
-                   const std::string &data_dir, bool debug);
+                   const std::string &data_dir, bool debug,
+                   bool skip_replacement);
 
   template <typename Manager>
   MatchaTtsLexicon(Manager *mgr, const std::string &lexicon,
                    const std::string &tokens, const std::string &data_dir,
-                   bool debug);
+                   bool debug, bool skip_replacement);
 
   std::vector<TokenIDs> ConvertTextToTokenIds(
       const std::string &text,

sherpa-onnx/csrc/offline-tts-matcha-impl.h

@@ -386,7 +386,7 @@ class OfflineTtsMatchaImpl : public OfflineTtsImpl {
     if (meta_data.is_zh_en) {
       frontend_ = std::make_unique<MatchaTtsLexicon>(
           mgr, config_.model.matcha.lexicon, config_.model.matcha.tokens,
-          config_.model.matcha.data_dir, config_.model.debug);
+          config_.model.matcha.data_dir, config_.model.debug, false);
     } else if (meta_data.jieba) {
       frontend_ = std::make_unique<CharacterLexicon>(
           mgr, config_.model.matcha.lexicon, config_.model.matcha.tokens,
@@ -407,7 +407,7 @@ class OfflineTtsMatchaImpl : public OfflineTtsImpl {
     if (meta_data.is_zh_en) {
       frontend_ = std::make_unique<MatchaTtsLexicon>(
           config_.model.matcha.lexicon, config_.model.matcha.tokens,
-          config_.model.matcha.data_dir, config_.model.debug);
+          config_.model.matcha.data_dir, config_.model.debug, false);
     } else if (meta_data.jieba) {
       frontend_ = std::make_unique<CharacterLexicon>(
           config_.model.matcha.lexicon, config_.model.matcha.tokens,