Fix style issues reported by clang-tidy (#1167)

csukuangfj · web-flow · commit 299f1a852bfa · 2024-07-23T09:26:36.000+08:00
diff --git a/sherpa-onnx/csrc/jieba-lexicon.cc b/sherpa-onnx/csrc/jieba-lexicon.cc
@@ -102,13 +102,13 @@ class JiebaLexicon::Impl {
       this_sentence.push_back(blank);
 
       if (w == "。" || w == "！" || w == "？" || w == "，") {
-        ans.push_back(std::move(this_sentence));
+        ans.emplace_back(std::move(this_sentence));
         this_sentence = {};
       }
     }  // for (const auto &w : words)
 
     if (!this_sentence.empty()) {
-      ans.push_back(std::move(this_sentence));
+      ans.emplace_back(std::move(this_sentence));
     }
 
     return ans;
diff --git a/sherpa-onnx/csrc/lexicon.cc b/sherpa-onnx/csrc/lexicon.cc
@@ -253,7 +253,7 @@ std::vector<TokenIDs> Lexicon::ConvertTextToTokenIdsChinese(
         if (eos != -1) {
           this_sentence.push_back(eos);
         }
-        ans.push_back(std::move(this_sentence));
+        ans.emplace_back(std::move(this_sentence));
         this_sentence = {};
 
         if (sil != -1) {
@@ -283,7 +283,7 @@ std::vector<TokenIDs> Lexicon::ConvertTextToTokenIdsChinese(
   if (eos != -1) {
     this_sentence.push_back(eos);
   }
-  ans.push_back(std::move(this_sentence));
+  ans.emplace_back(std::move(this_sentence));
 
   return ans;
 }
@@ -324,7 +324,7 @@ std::vector<TokenIDs> Lexicon::ConvertTextToTokenIdsNotChinese(
 
       if (w != ",") {
         this_sentence.push_back(blank);
-        ans.push_back(std::move(this_sentence));
+        ans.emplace_back(std::move(this_sentence));
         this_sentence = {};
       }
 
@@ -348,7 +348,7 @@ std::vector<TokenIDs> Lexicon::ConvertTextToTokenIdsNotChinese(
   }
 
   if (!this_sentence.empty()) {
-    ans.push_back(std::move(this_sentence));
+    ans.emplace_back(std::move(this_sentence));
   }
 
   return ans;
diff --git a/sherpa-onnx/csrc/melo-tts-lexicon.cc b/sherpa-onnx/csrc/melo-tts-lexicon.cc
@@ -91,7 +91,6 @@ class MeloTtsLexicon::Impl {
     std::vector<TokenIDs> ans;
     TokenIDs this_sentence;
 
-    int32_t blank = token2id_.at("_");
     for (const auto &w : words) {
       auto ids = ConvertWordToIds(w);
       if (ids.tokens.empty()) {
diff --git a/sherpa-onnx/csrc/offline-tts-character-frontend.cc b/sherpa-onnx/csrc/offline-tts-character-frontend.cc
@@ -136,7 +136,7 @@ std::vector<TokenIDs> OfflineTtsCharacterFrontend::ConvertTextToTokenIds(
           this_sentence.push_back(eos_id);
         }
 
-        ans.push_back(std::move(this_sentence));
+        ans.emplace_back(std::move(this_sentence));
         this_sentence = {};
 
         // re-initialize this_sentence
@@ -152,7 +152,7 @@ std::vector<TokenIDs> OfflineTtsCharacterFrontend::ConvertTextToTokenIds(
     }
 
     if (static_cast<int32_t>(this_sentence.size()) > 1 + use_eos_bos) {
-      ans.push_back(std::move(this_sentence));
+      ans.emplace_back(std::move(this_sentence));
     }
   } else {
     // not adding blank
@@ -171,7 +171,7 @@ std::vector<TokenIDs> OfflineTtsCharacterFrontend::ConvertTextToTokenIds(
           this_sentence.push_back(eos_id);
         }
 
-        ans.push_back(std::move(this_sentence));
+        ans.emplace_back(std::move(this_sentence));
         this_sentence = {};
 
         // re-initialize this_sentence
@@ -182,7 +182,7 @@ std::vector<TokenIDs> OfflineTtsCharacterFrontend::ConvertTextToTokenIds(
     }
 
     if (this_sentence.size() > 1) {
-      ans.push_back(std::move(this_sentence));
+      ans.emplace_back(std::move(this_sentence));
     }
   }
 
diff --git a/sherpa-onnx/csrc/offline-tts-frontend.h b/sherpa-onnx/csrc/offline-tts-frontend.h
@@ -15,12 +15,12 @@ namespace sherpa_onnx {
 struct TokenIDs {
   TokenIDs() = default;
 
-  /*implicit*/ TokenIDs(const std::vector<int64_t> &tokens)  // NOLINT
-      : tokens{tokens} {}
+  /*implicit*/ TokenIDs(std::vector<int64_t> tokens)  // NOLINT
+      : tokens{std::move(tokens)} {}
 
-  TokenIDs(const std::vector<int64_t> &tokens,
-           const std::vector<int64_t> &tones)
-      : tokens{tokens}, tones{tones} {}
+  TokenIDs(std::vector<int64_t> tokens,  // NOLINT
+           std::vector<int64_t> tones)   // NOLINT
+      : tokens{std::move(tokens)}, tones{std::move(tones)} {}
 
   std::string ToString() const;
 
diff --git a/sherpa-onnx/csrc/onnx-utils.cc b/sherpa-onnx/csrc/onnx-utils.cc
@@ -157,8 +157,8 @@ Ort::Value View(Ort::Value *v) {
 
 float ComputeSum(const Ort::Value *v, int32_t n /*= -1*/) {
   std::vector<int64_t> shape = v->GetTensorTypeAndShapeInfo().GetShape();
-  auto size = static_cast<int32_t>(std::accumulate(
-      shape.begin(), shape.end(), 1, std::multiplies<int64_t>()));
+  auto size = static_cast<int32_t>(
+      std::accumulate(shape.begin(), shape.end(), 1, std::multiplies<>()));
   if (n != -1 && n < size && n > 0) {
     size = n;
   }
@@ -170,8 +170,8 @@ float ComputeSum(const Ort::Value *v, int32_t n /*= -1*/) {
 
 float ComputeMean(const Ort::Value *v, int32_t n /*= -1*/) {
   std::vector<int64_t> shape = v->GetTensorTypeAndShapeInfo().GetShape();
-  auto size = static_cast<int32_t>(std::accumulate(
-      shape.begin(), shape.end(), 1, std::multiplies<int64_t>()));
+  auto size = static_cast<int32_t>(
+      std::accumulate(shape.begin(), shape.end(), 1, std::multiplies<>()));
 
   if (n != -1 && n < size && n > 0) {
     size = n;
diff --git a/sherpa-onnx/csrc/piper-phonemize-lexicon.cc b/sherpa-onnx/csrc/piper-phonemize-lexicon.cc
@@ -239,12 +239,12 @@ std::vector<TokenIDs> PiperPhonemizeLexicon::ConvertTextToTokenIds(
   if (meta_data_.is_piper || meta_data_.is_icefall) {
     for (const auto &p : phonemes) {
       phoneme_ids = PiperPhonemesToIds(token2id_, p);
-      ans.push_back(std::move(phoneme_ids));
+      ans.emplace_back(std::move(phoneme_ids));
     }
   } else if (meta_data_.is_coqui) {
     for (const auto &p : phonemes) {
       phoneme_ids = CoquiPhonemesToIds(token2id_, p, meta_data_);
-      ans.push_back(std::move(phoneme_ids));
+      ans.emplace_back(std::move(phoneme_ids));
     }
 
   } else {

Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,13 @@ class JiebaLexicon::Impl {`
`102`	`102`	`this_sentence.push_back(blank);`
`103`	`103`
`104`	`104`	`if (w == "。" \|\| w == "！" \|\| w == "？" \|\| w == "，") {`
`105`		`- ans.push_back(std::move(this_sentence));`
	`105`	`+ ans.emplace_back(std::move(this_sentence));`
`106`	`106`	`this_sentence = {};`
`107`	`107`	`}`
`108`	`108`	`} // for (const auto &w : words)`
`109`	`109`
`110`	`110`	`if (!this_sentence.empty()) {`
`111`		`- ans.push_back(std::move(this_sentence));`
	`111`	`+ ans.emplace_back(std::move(this_sentence));`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`return ans;`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ std::vector<TokenIDs> Lexicon::ConvertTextToTokenIdsChinese(`
`253`	`253`	`if (eos != -1) {`
`254`	`254`	`this_sentence.push_back(eos);`
`255`	`255`	`}`
`256`		`- ans.push_back(std::move(this_sentence));`
	`256`	`+ ans.emplace_back(std::move(this_sentence));`
`257`	`257`	`this_sentence = {};`
`258`	`258`
`259`	`259`	`if (sil != -1) {`
`@@ -283,7 +283,7 @@ std::vector<TokenIDs> Lexicon::ConvertTextToTokenIdsChinese(`
`283`	`283`	`if (eos != -1) {`
`284`	`284`	`this_sentence.push_back(eos);`
`285`	`285`	`}`
`286`		`- ans.push_back(std::move(this_sentence));`
	`286`	`+ ans.emplace_back(std::move(this_sentence));`
`287`	`287`
`288`	`288`	`return ans;`
`289`	`289`	`}`
`@@ -324,7 +324,7 @@ std::vector<TokenIDs> Lexicon::ConvertTextToTokenIdsNotChinese(`
`324`	`324`
`325`	`325`	`if (w != ",") {`
`326`	`326`	`this_sentence.push_back(blank);`
`327`		`- ans.push_back(std::move(this_sentence));`
	`327`	`+ ans.emplace_back(std::move(this_sentence));`
`328`	`328`	`this_sentence = {};`
`329`	`329`	`}`
`330`	`330`
`@@ -348,7 +348,7 @@ std::vector<TokenIDs> Lexicon::ConvertTextToTokenIdsNotChinese(`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`if (!this_sentence.empty()) {`
`351`		`- ans.push_back(std::move(this_sentence));`
	`351`	`+ ans.emplace_back(std::move(this_sentence));`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`return ans;`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ std::vector<TokenIDs> OfflineTtsCharacterFrontend::ConvertTextToTokenIds(`
`136`	`136`	`this_sentence.push_back(eos_id);`
`137`	`137`	`}`
`138`	`138`
`139`		`- ans.push_back(std::move(this_sentence));`
	`139`	`+ ans.emplace_back(std::move(this_sentence));`
`140`	`140`	`this_sentence = {};`
`141`	`141`
`142`	`142`	`// re-initialize this_sentence`
`@@ -152,7 +152,7 @@ std::vector<TokenIDs> OfflineTtsCharacterFrontend::ConvertTextToTokenIds(`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`if (static_cast<int32_t>(this_sentence.size()) > 1 + use_eos_bos) {`
`155`		`- ans.push_back(std::move(this_sentence));`
	`155`	`+ ans.emplace_back(std::move(this_sentence));`
`156`	`156`	`}`
`157`	`157`	`} else {`
`158`	`158`	`// not adding blank`
`@@ -171,7 +171,7 @@ std::vector<TokenIDs> OfflineTtsCharacterFrontend::ConvertTextToTokenIds(`
`171`	`171`	`this_sentence.push_back(eos_id);`
`172`	`172`	`}`
`173`	`173`
`174`		`- ans.push_back(std::move(this_sentence));`
	`174`	`+ ans.emplace_back(std::move(this_sentence));`
`175`	`175`	`this_sentence = {};`
`176`	`176`
`177`	`177`	`// re-initialize this_sentence`
`@@ -182,7 +182,7 @@ std::vector<TokenIDs> OfflineTtsCharacterFrontend::ConvertTextToTokenIds(`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if (this_sentence.size() > 1) {`
`185`		`- ans.push_back(std::move(this_sentence));`
	`185`	`+ ans.emplace_back(std::move(this_sentence));`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
Original file line number	Diff line number	Diff line change
`@@ -239,12 +239,12 @@ std::vector<TokenIDs> PiperPhonemizeLexicon::ConvertTextToTokenIds(`
`239`	`239`	`if (meta_data_.is_piper \|\| meta_data_.is_icefall) {`
`240`	`240`	`for (const auto &p : phonemes) {`
`241`	`241`	`phoneme_ids = PiperPhonemesToIds(token2id_, p);`
`242`		`- ans.push_back(std::move(phoneme_ids));`
	`242`	`+ ans.emplace_back(std::move(phoneme_ids));`
`243`	`243`	`}`
`244`	`244`	`} else if (meta_data_.is_coqui) {`
`245`	`245`	`for (const auto &p : phonemes) {`
`246`	`246`	`phoneme_ids = CoquiPhonemesToIds(token2id_, p, meta_data_);`
`247`		`- ans.push_back(std::move(phoneme_ids));`
	`247`	`+ ans.emplace_back(std::move(phoneme_ids));`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`} else {`