From 6b0b94bdcdb40ca42e2b65dc7ff85b88876feada Mon Sep 17 00:00:00 2001
From: Xian Shi <40013335+R1ckShi@users.noreply.github.com>
Date: 星期二, 17 十月 2023 16:44:48 +0800
Subject: [PATCH] Update README.md
---
funasr/runtime/onnxruntime/src/ct-transformer.cpp | 88 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/ct-transformer.cpp b/funasr/runtime/onnxruntime/src/ct-transformer.cpp
index 3d66dcd..8f8d953 100644
--- a/funasr/runtime/onnxruntime/src/ct-transformer.cpp
+++ b/funasr/runtime/onnxruntime/src/ct-transformer.cpp
@@ -1,28 +1,30 @@
+/**
+ * Copyright FunASR (https://github.com/alibaba-damo-academy/FunASR). All Rights Reserved.
+ * MIT License (https://opensource.org/licenses/MIT)
+*/
+
#include "precomp.h"
-CTTransformer::CTTransformer(const char* sz_model_dir, int thread_num)
+namespace funasr {
+CTTransformer::CTTransformer()
:env_(ORT_LOGGING_LEVEL_ERROR, ""),session_options{}
{
+}
+
+void CTTransformer::InitPunc(const std::string &punc_model, const std::string &punc_config, int thread_num){
session_options.SetIntraOpNumThreads(thread_num);
session_options.SetGraphOptimizationLevel(ORT_ENABLE_ALL);
session_options.DisableCpuMemArena();
- string strModelPath = PathAppend(sz_model_dir, PUNC_MODEL_FILE);
- string strYamlPath = PathAppend(sz_model_dir, PUNC_YAML_FILE);
-
try{
-#ifdef _WIN32
- std::wstring detPath = strToWstr(strModelPath);
- m_session = std::make_unique<Ort::Session>(env_, detPath.c_str(), session_options);
-#else
- m_session = std::make_unique<Ort::Session>(env_, strModelPath.c_str(), session_options);
-#endif
+ m_session = std::make_unique<Ort::Session>(env_, ORTSTRING(punc_model).c_str(), session_options);
+ LOG(INFO) << "Successfully load model from " << punc_model;
}
- catch(exception e)
- {
- printf(e.what());
+ catch (std::exception const &e) {
+ LOG(ERROR) << "Error when load punc onnx model: " << e.what();
+ exit(-1);
}
- // read inputnames outputnamess
+ // read inputnames outputnames
string strName;
GetInputName(m_session.get(), strName);
m_strInputNames.push_back(strName.c_str());
@@ -37,14 +39,15 @@
for (auto& item : m_strOutputNames)
m_szOutputNames.push_back(item.c_str());
- m_tokenizer.OpenYaml(strYamlPath.c_str());
+ m_tokenizer.OpenYaml(punc_config.c_str());
+ m_tokenizer.JiebaInit(punc_config);
}
CTTransformer::~CTTransformer()
{
}
-string CTTransformer::AddPunc(const char* sz_input)
+string CTTransformer::AddPunc(const char* sz_input, std::string language)
{
string strResult;
vector<string> strOut;
@@ -54,7 +57,7 @@
int nTotalBatch = ceil((float)InputData.size() / TOKEN_LEN);
int nCurBatch = -1;
int nSentEnd = -1, nLastCommaIndex = -1;
- vector<int64_t> RemainIDs; //
+ vector<int32_t> RemainIDs; //
vector<string> RemainStr; //
vector<int> NewPunctuation; //
vector<string> NewString; //
@@ -64,8 +67,8 @@
for (size_t i = 0; i < InputData.size(); i += TOKEN_LEN)
{
nDiff = (i + TOKEN_LEN) < InputData.size() ? (0) : (i + TOKEN_LEN - InputData.size());
- vector<int64_t> InputIDs(InputData.begin() + i, InputData.begin() + i + TOKEN_LEN - nDiff);
- vector<string> InputStr(strOut.begin() + i, strOut.begin() + i + TOKEN_LEN - nDiff);
+ vector<int32_t> InputIDs(InputData.begin() + i, InputData.begin() + i + (TOKEN_LEN - nDiff));
+ vector<string> InputStr(strOut.begin() + i, strOut.begin() + i + (TOKEN_LEN - nDiff));
InputIDs.insert(InputIDs.begin(), RemainIDs.begin(), RemainIDs.end()); // RemainIDs+InputIDs;
InputStr.insert(InputStr.begin(), RemainStr.begin(), RemainStr.end()); // RemainStr+InputStr;
@@ -92,19 +95,20 @@
nSentEnd = nLastCommaIndex;
Punction[nSentEnd] = PERIOD_INDEX;
}
- RemainStr.assign(InputStr.begin() + nSentEnd + 1, InputStr.end());
- RemainIDs.assign(InputIDs.begin() + nSentEnd + 1, InputIDs.end());
- InputStr.assign(InputStr.begin(), InputStr.begin() + nSentEnd + 1); // minit_sentence
- Punction.assign(Punction.begin(), Punction.begin() + nSentEnd + 1);
+ RemainStr.assign(InputStr.begin() + (nSentEnd + 1), InputStr.end());
+ RemainIDs.assign(InputIDs.begin() + (nSentEnd + 1), InputIDs.end());
+ InputStr.assign(InputStr.begin(), InputStr.begin() + (nSentEnd + 1)); // minit_sentence
+ Punction.assign(Punction.begin(), Punction.begin() + (nSentEnd + 1));
}
NewPunctuation.insert(NewPunctuation.end(), Punction.begin(), Punction.end());
vector<string> WordWithPunc;
for (int i = 0; i < InputStr.size(); i++)
{
- if (i > 0 && !(InputStr[i][0] & 0x80) && (i + 1) <InputStr.size() && !(InputStr[i+1][0] & 0x80))// 锟叫硷拷锟接拷模锟�
+ // if (i > 0 && !(InputStr[i][0] & 0x80) && (i + 1) <InputStr.size() && !(InputStr[i+1][0] & 0x80))// 锟叫硷拷锟接拷模锟�
+ if (i > 0 && !(InputStr[i-1][0] & 0x80) && !(InputStr[i][0] & 0x80))
{
- InputStr[i] = InputStr[i]+ " ";
+ InputStr[i] = " " + InputStr[i];
}
WordWithPunc.push_back(InputStr[i]);
@@ -127,7 +131,7 @@
NewPuncOut.assign(NewPunctuation.begin(), NewPunctuation.end() - 1);
NewPuncOut.push_back(PERIOD_INDEX);
}
- else if (NewString[NewString.size() - 1] == m_tokenizer.Id2Punc(PERIOD_INDEX) && NewString[NewString.size() - 1] == m_tokenizer.Id2Punc(QUESTION_INDEX))
+ else if (NewString[NewString.size() - 1] != m_tokenizer.Id2Punc(PERIOD_INDEX) && NewString[NewString.size() - 1] != m_tokenizer.Id2Punc(QUESTION_INDEX))
{
NewSentenceOut = NewString;
NewSentenceOut.push_back(m_tokenizer.Id2Punc(PERIOD_INDEX));
@@ -136,17 +140,38 @@
}
}
}
- for (auto& item : NewSentenceOut)
+
+ for (auto& item : NewSentenceOut){
strResult += item;
+ }
+
+ if(language == "en-bpe"){
+ std::vector<std::string> chineseSymbols;
+ chineseSymbols.push_back("锛�");
+ chineseSymbols.push_back("銆�");
+ chineseSymbols.push_back("銆�");
+ chineseSymbols.push_back("锛�");
+
+ std::string englishSymbols = ",.,?";
+ for (size_t i = 0; i < chineseSymbols.size(); i++) {
+ size_t pos = 0;
+ while ((pos = strResult.find(chineseSymbols[i], pos)) != std::string::npos) {
+ strResult.replace(pos, 3, 1, englishSymbols[i]);
+ pos++;
+ }
+ }
+ }
+
return strResult;
}
-vector<int> CTTransformer::Infer(vector<int64_t> input_data)
+vector<int> CTTransformer::Infer(vector<int32_t> input_data)
{
Ort::MemoryInfo m_memoryInfo = Ort::MemoryInfo::CreateCpu(OrtArenaAllocator, OrtMemTypeDefault);
vector<int> punction;
std::array<int64_t, 2> input_shape_{ 1, (int64_t)input_data.size()};
- Ort::Value onnx_input = Ort::Value::CreateTensor<int64_t>(m_memoryInfo,
+ Ort::Value onnx_input = Ort::Value::CreateTensor<int32_t>(
+ m_memoryInfo,
input_data.data(),
input_data.size(),
input_shape_.data(),
@@ -179,10 +204,9 @@
}
catch (std::exception const &e)
{
- printf(e.what());
+ LOG(ERROR) << "Error when run punc onnx forword: " << (e.what());
}
return punction;
}
-
-
+} // namespace funasr
--
Gitblit v1.9.1