From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001
From: liugz18 <57401541+liugz18@users.noreply.github.com>
Date: 星期四, 18 七月 2024 21:34:55 +0800
Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365
---
runtime/onnxruntime/src/bias-lm.h | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/runtime/onnxruntime/src/bias-lm.h b/runtime/onnxruntime/src/bias-lm.h
index 7254d49..ddaf3e4 100644
--- a/runtime/onnxruntime/src/bias-lm.h
+++ b/runtime/onnxruntime/src/bias-lm.h
@@ -7,6 +7,9 @@
#include "vocab.h"
#include "util/text-utils.h"
#include <yaml-cpp/yaml.h>
+#ifdef _WIN32
+#include "win_func.h"
+#endif
// node type
#define ROOT_NODE 0
#define VALUE_ZERO 0.0f
@@ -45,7 +48,7 @@
std::vector<std::vector<int>> split_id_vec;
struct timeval start, end;
- gettimeofday(&start, NULL);
+ gettimeofday(&start, nullptr);
LoadCfgFromYaml(cfg_file.c_str(), opt_);
while (getline(ifs_hws, line)) {
@@ -62,12 +65,17 @@
if (text.size() > 1) {
score = std::stof(text[1]);
}
- Utf8ToCharset(text[0], split_str);
+ SplitChiEngCharacters(text[0], split_str);
for (auto &str : split_str) {
- split_id.push_back(phn_set_.String2Id(str));
- if (!phn_set_.Find(str)) {
- is_oov = true;
- break;
+ std::vector<string> lex_vec;
+ std::string lex_str = vocab_.Word2Lex(str);
+ SplitStringToVector(lex_str, " ", true, &lex_vec);
+ for (auto &token : lex_vec) {
+ split_id.push_back(phn_set_.String2Id(token));
+ if (!phn_set_.Find(token)) {
+ is_oov = true;
+ break;
+ }
}
}
if (!is_oov) {
@@ -78,7 +86,7 @@
BuildGraph(split_id_vec, custom_weight);
ifs_hws.close();
- gettimeofday(&end, NULL);
+ gettimeofday(&end, nullptr);
long seconds = (end.tv_sec - start.tv_sec);
long modle_init_micros = ((seconds * 1000000) + end.tv_usec) - (start.tv_usec);
LOG(INFO) << "Build bias lm takes " << (double)modle_init_micros / 1000000 << " s";
@@ -91,7 +99,7 @@
std::vector<std::vector<int>> split_id_vec;
struct timeval start, end;
- gettimeofday(&start, NULL);
+ gettimeofday(&start, nullptr);
opt_.incre_bias_ = inc_bias;
for (const pair<string, int>& kv : hws_map) {
float score = 1.0f;
@@ -100,12 +108,17 @@
std::vector<std::string> split_str;
std::vector<int> split_id;
score = kv.second;
- Utf8ToCharset(kv.first, split_str);
+ SplitChiEngCharacters(kv.first, split_str);
for (auto &str : split_str) {
- split_id.push_back(phn_set_.String2Id(str));
- if (!phn_set_.Find(str)) {
- is_oov = true;
- break;
+ std::vector<string> lex_vec;
+ std::string lex_str = vocab_.Word2Lex(str);
+ SplitStringToVector(lex_str, " ", true, &lex_vec);
+ for (auto &token : lex_vec) {
+ split_id.push_back(phn_set_.String2Id(token));
+ if (!phn_set_.Find(token)) {
+ is_oov = true;
+ break;
+ }
}
}
if (!is_oov) {
@@ -115,7 +128,7 @@
}
BuildGraph(split_id_vec, custom_weight);
- gettimeofday(&end, NULL);
+ gettimeofday(&end, nullptr);
long seconds = (end.tv_sec - start.tv_sec);
long modle_init_micros = ((seconds * 1000000) + end.tv_usec) - (start.tv_usec);
LOG(INFO) << "Build bias lm takes " << (double)modle_init_micros / 1000000 << " s";
--
Gitblit v1.9.1