From aedb3a04e3bdd1f8ba2eef9293d8afc21f4b98f5 Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期三, 23 八月 2023 19:54:48 +0800
Subject: [PATCH] update msg_vec
---
funasr/runtime/onnxruntime/src/paraformer.cpp | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/paraformer.cpp b/funasr/runtime/onnxruntime/src/paraformer.cpp
index cbaab2d..c042e0d 100644
--- a/funasr/runtime/onnxruntime/src/paraformer.cpp
+++ b/funasr/runtime/onnxruntime/src/paraformer.cpp
@@ -438,11 +438,11 @@
}
}
string stamp_str="";
- for (i=0; i<timestamp_list.size(); i++) {
- stamp_str += std::to_string(timestamp_list[i][0]);
+ for (i=0; i<timestamp_merge.size(); i++) {
+ stamp_str += std::to_string(timestamp_merge[i][0]);
stamp_str += ", ";
- stamp_str += std::to_string(timestamp_list[i][1]);
- if(i!=timestamp_list.size()-1){
+ stamp_str += std::to_string(timestamp_merge[i][1]);
+ if(i!=timestamp_merge.size()-1){
stamp_str += ",";
}
}
@@ -658,7 +658,7 @@
return "";
}
- string result;
+ string result="";
try {
auto outputTensor = m_session_->Run(Ort::RunOptions{nullptr}, m_szInputNames.data(), input_onnx.data(), input_onnx.size(), m_szOutputNames.data(), m_szOutputNames.size());
std::vector<int64_t> outputShape = outputTensor[0].GetTensorTypeAndShapeInfo().GetShape();
@@ -719,6 +719,7 @@
std::vector<int32_t> hotword_matrix;
std::vector<int32_t> lengths;
int hotword_size = 1;
+ int real_hw_size = 0;
if (!hotwords.empty()) {
std::vector<std::string> hotword_array = split(hotwords, ' ');
hotword_size = hotword_array.size() + 1;
@@ -735,6 +736,9 @@
chars.insert(chars.end(), tokens.begin(), tokens.end());
}
}
+ if(chars.size()==0){
+ continue;
+ }
std::vector<int32_t> hw_vector(max_hotword_len, 0);
int vector_len = std::min(max_hotword_len, (int)chars.size());
for (int i=0; i<chars.size(); i++) {
@@ -743,8 +747,10 @@
}
std::cout << std::endl;
lengths.push_back(vector_len);
+ real_hw_size += 1;
hotword_matrix.insert(hotword_matrix.end(), hw_vector.begin(), hw_vector.end());
}
+ hotword_size = real_hw_size + 1;
}
std::vector<int32_t> blank_vec(max_hotword_len, 0);
blank_vec[0] = 1;
--
Gitblit v1.9.1