From 7fd60efe0949f1e2fb3bb5a54bc719b3d250b0b4 Mon Sep 17 00:00:00 2001 From: rich04lin <152049331+rich04lin@users.noreply.github.com> Date: Sun, 23 Mar 2025 11:36:56 +0800 Subject: [PATCH] Revert "code style CI" This reverts commit 076134a4f63b2cbb294a54806eeb2ff3ae4c3383. --- .../src/front/front_interface.cpp | 32 +++++----- examples/csmsc/tts0/README.md | 2 +- .../decoder/ctc_prefix_beam_search_decoder.cc | 2 +- runtime/engine/common/matrix/kaldi-matrix.cc | 2 +- runtime/engine/common/matrix/kaldi-vector.cc | 64 +++++++++---------- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/demos/TTSCppFrontend/src/front/front_interface.cpp b/demos/TTSCppFrontend/src/front/front_interface.cpp index b9acc9600..e7b08c798 100644 --- a/demos/TTSCppFrontend/src/front/front_interface.cpp +++ b/demos/TTSCppFrontend/src/front/front_interface.cpp @@ -226,7 +226,7 @@ int FrontEngineInterface::GetSentenceIds(const std::string &sentence, std::vector *phoneids, std::vector *toneids) { std::vector> - cut_result; // 分词结果包含词和词性 + cut_result; //分词结果包含词和词性 if (0 != Cut(sentence, &cut_result)) { LOG(ERROR) << "Cut sentence: \"" << sentence << "\" failed"; return -1; @@ -375,7 +375,7 @@ bool FrontEngineInterface::AllToneThree( const std::vector &finals) { bool flags = true; for (int i = 0; i < finals.size(); i++) { - if (static_cast(finals[i].back()) != 51) { // 如果读音不为第三声 + if (static_cast(finals[i].back()) != 51) { //如果读音不为第三声 flags = false; } } @@ -400,9 +400,9 @@ int FrontEngineInterface::GetInitialsFinals( std::vector *word_initials, std::vector *word_finals) { std::string phone; - GetPhone(word, &phone); // 获取字词对应的音素 + GetPhone(word, &phone); //获取字词对应的音素 std::vector phone_vec = absl::StrSplit(phone, " "); - // 获取韵母，每个字的音素有1或者2个，start为单个字音素的起始位置。 + //获取韵母，每个字的音素有1或者2个，start为单个字音素的起始位置。 int start = 0; while (start < phone_vec.size()) { if (phone_vec[start] == "sp" || phone_vec[start] == "sp0") { @@ -573,7 +573,7 @@ FrontEngineInterface::MergeThreeTones( std::vector> result; std::string word; std::string pos; - std::vector> finals; // 韵母数组 + std::vector> finals; //韵母数组 std::vector word_final; std::vector merge_last(seg_result->size(), false); @@ -629,7 +629,7 @@ FrontEngineInterface::MergeThreeTones( } } - // 把标点的分词结果补上 + //把标点的分词结果补上 if (word_num < seg_result->size()) { result.push_back( // seg_result[word_num].first seg_result[word_num].second @@ -648,7 +648,7 @@ FrontEngineInterface::MergeThreeTones2( std::vector> result; std::string word; std::string pos; - std::vector> finals; // 韵母数组 + std::vector> finals; //韵母数组 std::vector word_final; std::vector merge_last(seg_result->size(), false); @@ -706,7 +706,7 @@ FrontEngineInterface::MergeThreeTones2( } } - // 把标点的分词结果补上 + //把标点的分词结果补上 if (word_num < seg_result->size()) { result.push_back(make_pair(std::get<0>((*seg_result)[word_num]), std::get<1>((*seg_result)[word_num]))); @@ -804,7 +804,7 @@ int FrontEngineInterface::YiSandhi(const std::string &word, return -1; } - // 情况1："一" in number sequences, e.g. 一零零, 二一零 + //情况1："一" in number sequences, e.g. 一零零, 二一零 std::wstring num_wstr = L"零一二三四六七八九"; std::wstring word_wstr = ppspeech::utf8string2wstring(word); if (word_wstr.find(yi) != word_wstr.npos && wordvec.back() != yi) { @@ -822,7 +822,7 @@ int FrontEngineInterface::YiSandhi(const std::string &word, wordvec[0] == wordvec[2]) { // "一" between reduplication words shold be yi5, e.g. 看一看 (*finals)[1] = (*finals)[1].replace((*finals)[1].length() - 1, 1, "5"); - } else if (wordvec[0] == L"第" && wordvec[1] == yi) { // 以第一位开始 + } else if (wordvec[0] == L"第" && wordvec[1] == yi) { //以第一位开始 (*finals)[1] = (*finals)[1].replace((*finals)[1].length() - 1, 1, "1"); } else { for (int i = 0; i < wordvec.size(); i++) { @@ -916,11 +916,11 @@ int FrontEngineInterface::NeuralSandhi(const std::string &word, if (find(must_neural_tone_words.begin(), must_neural_tone_words.end(), word) != must_neural_tone_words.end() || - (word_num >= 2 && find(must_neural_tone_words.begin(), - must_neural_tone_words.end(), - ppspeech::wstring2utf8string( - word_wstr.substr(word_num - 2))) != - must_neural_tone_words.end())) { + (word_num >= 2 && + find(must_neural_tone_words.begin(), + must_neural_tone_words.end(), + ppspeech::wstring2utf8string(word_wstr.substr( + word_num - 2))) != must_neural_tone_words.end())) { (*finals).back() = (*finals).back().replace((*finals).back().length() - 1, 1, "5"); } @@ -1037,7 +1037,7 @@ int FrontEngineInterface::ThreeSandhi(const std::string &word, (*finals).end(), finals_list[1].begin(), finals_list[1].end()); } - } else if (word_num == 4) { // 将成语拆分为两个长度为 2 的单词 + } else if (word_num == 4) { //将成语拆分为两个长度为 2 的单词 // 创建对应的 韵母列表 finals_temp = {}; finals_list = {}; diff --git a/examples/csmsc/tts0/README.md b/examples/csmsc/tts0/README.md index 646999775..9aa46cc87 100644 --- a/examples/csmsc/tts0/README.md +++ b/examples/csmsc/tts0/README.md @@ -248,4 +248,4 @@ python3 ${BIN_DIR}/../synthesize_e2e.py \ --output_dir=exp/default/test_e2e \ --inference_dir=exp/default/inference \ --phones_dict=tacotron2_csmsc_ckpt_0.2.0/phone_id_map.txt -``` +``` \ No newline at end of file diff --git a/runtime/engine/asr/decoder/ctc_prefix_beam_search_decoder.cc b/runtime/engine/asr/decoder/ctc_prefix_beam_search_decoder.cc index f9df6a8ea..bf912af2e 100644 --- a/runtime/engine/asr/decoder/ctc_prefix_beam_search_decoder.cc +++ b/runtime/engine/asr/decoder/ctc_prefix_beam_search_decoder.cc @@ -239,7 +239,7 @@ void CTCPrefixBeamSearch::AdvanceDecoding( } } } // end for (const auto& it : cur_hyps_) - } // end for (int i = 0; i < topk_index.size(); ++i) + } // end for (int i = 0; i < topk_index.size(); ++i) // 3. second beam prune, only keep top n best paths std::vector, PrefixScore>> arr( diff --git a/runtime/engine/common/matrix/kaldi-matrix.cc b/runtime/engine/common/matrix/kaldi-matrix.cc index c891c4b1b..6f65fb0a0 100644 --- a/runtime/engine/common/matrix/kaldi-matrix.cc +++ b/runtime/engine/common/matrix/kaldi-matrix.cc @@ -1863,7 +1863,7 @@ prevent crash."; // if (!ans) { // KALDI_ERR << "Error doing Svd"; // This one will be caught. //} -// #endif +//#endif // if (prescale != 1.0) s->Scale(1.0/prescale); //} /* diff --git a/runtime/engine/common/matrix/kaldi-vector.cc b/runtime/engine/common/matrix/kaldi-vector.cc index 76f9bc734..3ab9a7ffa 100644 --- a/runtime/engine/common/matrix/kaldi-vector.cc +++ b/runtime/engine/common/matrix/kaldi-vector.cc @@ -759,36 +759,36 @@ template void VectorBase::CopyColFromMat(const MatrixBase &mat, // return max + sum; //} -// #ifdef HAVE_MKL -// template<> -// void VectorBase::Tanh(const VectorBase &src) { -// KALDI_ASSERT(dim_ == src.dim_); -// vsTanh(dim_, src.data_, data_); -// } -// template<> -// void VectorBase::Tanh(const VectorBase &src) { -// KALDI_ASSERT(dim_ == src.dim_); -// vdTanh(dim_, src.data_, data_); -// } -// #else -// template -// void VectorBase::Tanh(const VectorBase &src) { -// KALDI_ASSERT(dim_ == src.dim_); -// for (MatrixIndexT i = 0; i < dim_; i++) { -// Real x = src.data_[i]; -// if (x > 0.0) { -// Real inv_expx = Exp(-x); -// x = -1.0 + 2.0 / (1.0 + inv_expx * inv_expx); -// } else { -// Real expx = Exp(x); -// x = 1.0 - 2.0 / (1.0 + expx * expx); -// } -// data_[i] = x; -// } -// } -// #endif - -// #ifdef HAVE_MKL +//#ifdef HAVE_MKL +// template<> +// void VectorBase::Tanh(const VectorBase &src) { +// KALDI_ASSERT(dim_ == src.dim_); +// vsTanh(dim_, src.data_, data_); +//} +// template<> +// void VectorBase::Tanh(const VectorBase &src) { +// KALDI_ASSERT(dim_ == src.dim_); +// vdTanh(dim_, src.data_, data_); +//} +//#else +// template +// void VectorBase::Tanh(const VectorBase &src) { +// KALDI_ASSERT(dim_ == src.dim_); +// for (MatrixIndexT i = 0; i < dim_; i++) { +// Real x = src.data_[i]; +// if (x > 0.0) { +// Real inv_expx = Exp(-x); +// x = -1.0 + 2.0 / (1.0 + inv_expx * inv_expx); +//} else { +// Real expx = Exp(x); +// x = 1.0 - 2.0 / (1.0 + expx * expx); +//} +// data_[i] = x; +//} +//} +//#endif + +//#ifdef HAVE_MKL //// Implementing sigmoid based on tanh. // template<> // void VectorBase::Sigmoid(const VectorBase &src) { @@ -808,7 +808,7 @@ template void VectorBase::CopyColFromMat(const MatrixBase &mat, // this->Add(1.0); // this->Scale(0.5); //} -// #else +//#else // template // void VectorBase::Sigmoid(const VectorBase &src) { // KALDI_ASSERT(dim_ == src.dim_); @@ -824,7 +824,7 @@ template void VectorBase::CopyColFromMat(const MatrixBase &mat, // data_[i] = x; //} //} -// #endif +//#endif // template