msb-public
/
PaddleSpeech
mirror of https://github.com/PaddlePaddle/PaddleSpeech
1
0
Code Issues Projects Releases Wiki Activity

Revert "code style CI"

Browse Source 
This reverts commit 076134a4f6.
pull/4005/head
rich04lin 6 months ago
parent a7133fd89b
commit 7fd60efe09
5 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File

32
demos/TTSCppFrontend/src/front/front_interface.cpp
Unescape View File

@ -226,7 +226,7 @@ int FrontEngineInterface::GetSentenceIds(const std::string &sentence,
std::vector<int> *phoneids, std::vector<int> *phoneids,
std::vector<int> *toneids) { std::vector<int> *toneids) {
std::vector<std::pair<std::string, std::string>> std::vector<std::pair<std::string, std::string>>
cut_result; // 分词结果包含词和词性 cut_result; //分词结果包含词和词性
if (0 != Cut(sentence, &cut_result)) { if (0 != Cut(sentence, &cut_result)) {
LOG(ERROR) << "Cut sentence: \"" << sentence << "\" failed"; LOG(ERROR) << "Cut sentence: \"" << sentence << "\" failed";
return -1; return -1;
@ -375,7 +375,7 @@ bool FrontEngineInterface::AllToneThree(
const std::vector<std::string> &finals) { const std::vector<std::string> &finals) {
bool flags = true; bool flags = true;
for (int i = 0; i < finals.size(); i++) { for (int i = 0; i < finals.size(); i++) {
if (static_cast<int>(finals[i].back()) != 51) { // 如果读音不为第三声 if (static_cast<int>(finals[i].back()) != 51) { //如果读音不为第三声
flags = false; flags = false;
} }
} }
@ -400,9 +400,9 @@ int FrontEngineInterface::GetInitialsFinals(
std::vector<std::string> *word_initials, std::vector<std::string> *word_initials,
std::vector<std::string> *word_finals) { std::vector<std::string> *word_finals) {
std::string phone; std::string phone;
GetPhone(word, &phone); // 获取字词对应的音素 GetPhone(word, &phone); //获取字词对应的音素
std::vector<std::string> phone_vec = absl::StrSplit(phone, " "); std::vector<std::string> phone_vec = absl::StrSplit(phone, " ");
// 获取韵母，每个字的音素有1或者2个，start为单个字音素的起始位置。 //获取韵母，每个字的音素有1或者2个，start为单个字音素的起始位置。
int start = 0; int start = 0;
while (start < phone_vec.size()) { while (start < phone_vec.size()) {
if (phone_vec[start] == "sp" || phone_vec[start] == "sp0") { if (phone_vec[start] == "sp" || phone_vec[start] == "sp0") {
@ -573,7 +573,7 @@ FrontEngineInterface::MergeThreeTones(
std::vector<std::pair<std::string, std::string>> result; std::vector<std::pair<std::string, std::string>> result;
std::string word; std::string word;
std::string pos; std::string pos;
std::vector<std::vector<std::string>> finals; // 韵母数组 std::vector<std::vector<std::string>> finals; //韵母数组
std::vector<std::string> word_final; std::vector<std::string> word_final;
std::vector<bool> merge_last(seg_result->size(), false); std::vector<bool> merge_last(seg_result->size(), false);
@ -629,7 +629,7 @@ FrontEngineInterface::MergeThreeTones(
} }
} }
// 把标点的分词结果补上 //把标点的分词结果补上
if (word_num < seg_result->size()) { if (word_num < seg_result->size()) {
result.push_back( result.push_back(
// seg_result[word_num].first seg_result[word_num].second // seg_result[word_num].first seg_result[word_num].second
@ -648,7 +648,7 @@ FrontEngineInterface::MergeThreeTones2(
std::vector<std::pair<std::string, std::string>> result; std::vector<std::pair<std::string, std::string>> result;
std::string word; std::string word;
std::string pos; std::string pos;
std::vector<std::vector<std::string>> finals; // 韵母数组 std::vector<std::vector<std::string>> finals; //韵母数组
std::vector<std::string> word_final; std::vector<std::string> word_final;
std::vector<bool> merge_last(seg_result->size(), false); std::vector<bool> merge_last(seg_result->size(), false);
@ -706,7 +706,7 @@ FrontEngineInterface::MergeThreeTones2(
} }
} }
// 把标点的分词结果补上 //把标点的分词结果补上
if (word_num < seg_result->size()) { if (word_num < seg_result->size()) {
result.push_back(make_pair(std::get<0>((*seg_result)[word_num]), result.push_back(make_pair(std::get<0>((*seg_result)[word_num]),
std::get<1>((*seg_result)[word_num]))); std::get<1>((*seg_result)[word_num])));
@ -804,7 +804,7 @@ int FrontEngineInterface::YiSandhi(const std::string &word,
return -1; return -1;
} }
// 情况1："一" in number sequences, e.g. 一零零, 二一零 //情况1："一" in number sequences, e.g. 一零零, 二一零
std::wstring num_wstr = L"零一二三四六七八九"; std::wstring num_wstr = L"零一二三四六七八九";
std::wstring word_wstr = ppspeech::utf8string2wstring(word); std::wstring word_wstr = ppspeech::utf8string2wstring(word);
if (word_wstr.find(yi) != word_wstr.npos && wordvec.back() != yi) { 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]) { wordvec[0] == wordvec[2]) {
// "一" between reduplication words shold be yi5, e.g. 看一看 // "一" between reduplication words shold be yi5, e.g. 看一看
(*finals)[1] = (*finals)[1].replace((*finals)[1].length() - 1, 1, "5"); (*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"); (*finals)[1] = (*finals)[1].replace((*finals)[1].length() - 1, 1, "1");
} else { } else {
for (int i = 0; i < wordvec.size(); i++) { 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(), if (find(must_neural_tone_words.begin(),
must_neural_tone_words.end(), must_neural_tone_words.end(),
word) != must_neural_tone_words.end() || word) != must_neural_tone_words.end() ||
(word_num >= 2 && find(must_neural_tone_words.begin(), (word_num >= 2 &&
must_neural_tone_words.end(), find(must_neural_tone_words.begin(),
ppspeech::wstring2utf8string( must_neural_tone_words.end(),
word_wstr.substr(word_num - 2))) != ppspeech::wstring2utf8string(word_wstr.substr(
must_neural_tone_words.end())) { word_num - 2))) != must_neural_tone_words.end())) {
(*finals).back() = (*finals).back() =
(*finals).back().replace((*finals).back().length() - 1, 1, "5"); (*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()); (*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_temp = {};
finals_list = {}; finals_list = {};

2
runtime/engine/asr/decoder/ctc_prefix_beam_search_decoder.cc
Unescape View File

@ -239,7 +239,7 @@ void CTCPrefixBeamSearch::AdvanceDecoding(
} }
} }
} // end for (const auto& it : cur_hyps_) } // 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 // 3. second beam prune, only keep top n best paths
std::vector<std::pair<std::vector<int>, PrefixScore>> arr( std::vector<std::pair<std::vector<int>, PrefixScore>> arr(

2
runtime/engine/common/matrix/kaldi-matrix.cc
Unescape View File

@ -1863,7 +1863,7 @@ prevent crash.";
// if (!ans) { // if (!ans) {
// KALDI_ERR << "Error doing Svd"; // This one will be caught. // KALDI_ERR << "Error doing Svd"; // This one will be caught.
//} //}
// #endif //#endif
// if (prescale != 1.0) s->Scale(1.0/prescale); // if (prescale != 1.0) s->Scale(1.0/prescale);
//} //}
/* /*

64
runtime/engine/common/matrix/kaldi-vector.cc
Unescape View File

@ -759,36 +759,36 @@ template void VectorBase<double>::CopyColFromMat(const MatrixBase<double> &mat,
// return max + sum; // return max + sum;
//} //}
// #ifdef HAVE_MKL //#ifdef HAVE_MKL
// template<> // template<>
// void VectorBase<float>::Tanh(const VectorBase<float> &src) { // void VectorBase<float>::Tanh(const VectorBase<float> &src) {
// KALDI_ASSERT(dim_ == src.dim_); // KALDI_ASSERT(dim_ == src.dim_);
// vsTanh(dim_, src.data_, data_); // vsTanh(dim_, src.data_, data_);
// } //}
// template<> // template<>
// void VectorBase<double>::Tanh(const VectorBase<double> &src) { // void VectorBase<double>::Tanh(const VectorBase<double> &src) {
// KALDI_ASSERT(dim_ == src.dim_); // KALDI_ASSERT(dim_ == src.dim_);
// vdTanh(dim_, src.data_, data_); // vdTanh(dim_, src.data_, data_);
// } //}
// #else //#else
// template<typename Real> // template<typename Real>
// void VectorBase<Real>::Tanh(const VectorBase<Real> &src) { // void VectorBase<Real>::Tanh(const VectorBase<Real> &src) {
// KALDI_ASSERT(dim_ == src.dim_); // KALDI_ASSERT(dim_ == src.dim_);
// for (MatrixIndexT i = 0; i < dim_; i++) { // for (MatrixIndexT i = 0; i < dim_; i++) {
// Real x = src.data_[i]; // Real x = src.data_[i];
// if (x > 0.0) { // if (x > 0.0) {
// Real inv_expx = Exp(-x); // Real inv_expx = Exp(-x);
// x = -1.0 + 2.0 / (1.0 + inv_expx * inv_expx); // x = -1.0 + 2.0 / (1.0 + inv_expx * inv_expx);
// } else { //} else {
// Real expx = Exp(x); // Real expx = Exp(x);
// x = 1.0 - 2.0 / (1.0 + expx * expx); // x = 1.0 - 2.0 / (1.0 + expx * expx);
// } //}
// data_[i] = x; // data_[i] = x;
// } //}
// } //}
// #endif //#endif
// #ifdef HAVE_MKL //#ifdef HAVE_MKL
//// Implementing sigmoid based on tanh. //// Implementing sigmoid based on tanh.
// template<> // template<>
// void VectorBase<float>::Sigmoid(const VectorBase<float> &src) { // void VectorBase<float>::Sigmoid(const VectorBase<float> &src) {
@ -808,7 +808,7 @@ template void VectorBase<double>::CopyColFromMat(const MatrixBase<double> &mat,
// this->Add(1.0); // this->Add(1.0);
// this->Scale(0.5); // this->Scale(0.5);
//} //}
// #else //#else
// template<typename Real> // template<typename Real>
// void VectorBase<Real>::Sigmoid(const VectorBase<Real> &src) { // void VectorBase<Real>::Sigmoid(const VectorBase<Real> &src) {
// KALDI_ASSERT(dim_ == src.dim_); // KALDI_ASSERT(dim_ == src.dim_);
@ -824,7 +824,7 @@ template void VectorBase<double>::CopyColFromMat(const MatrixBase<double> &mat,
// data_[i] = x; // data_[i] = x;
//} //}
//} //}
// #endif //#endif
// template<typename Real> // template<typename Real>

Write Preview
Loading…
Cancel
Save