From 7511595b94c7497dd62778cadc07c6f703c3f41d Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期五, 11 十月 2024 14:39:34 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR merge
---
runtime/onnxruntime/src/paraformer.cpp | 62 +++++++++++-------------------
1 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/runtime/onnxruntime/src/paraformer.cpp b/runtime/onnxruntime/src/paraformer.cpp
index 1f1d48f..24f5152 100644
--- a/runtime/onnxruntime/src/paraformer.cpp
+++ b/runtime/onnxruntime/src/paraformer.cpp
@@ -45,26 +45,8 @@
exit(-1);
}
- string strName;
- GetInputName(m_session_.get(), strName);
- m_strInputNames.push_back(strName.c_str());
- GetInputName(m_session_.get(), strName,1);
- m_strInputNames.push_back(strName);
- if (use_hotword) {
- GetInputName(m_session_.get(), strName, 2);
- m_strInputNames.push_back(strName);
- }
-
- size_t numOutputNodes = m_session_->GetOutputCount();
- for(int index=0; index<numOutputNodes; index++){
- GetOutputName(m_session_.get(), strName, index);
- m_strOutputNames.push_back(strName);
- }
-
- for (auto& item : m_strInputNames)
- m_szInputNames.push_back(item.c_str());
- for (auto& item : m_strOutputNames)
- m_szOutputNames.push_back(item.c_str());
+ GetInputNames(m_session_.get(), m_strInputNames, m_szInputNames);
+ GetOutputNames(m_session_.get(), m_strOutputNames, m_szOutputNames);
vocab = new Vocab(token_file.c_str());
phone_set_ = new PhoneSet(token_file.c_str());
LoadCmvn(am_cmvn.c_str());
@@ -162,28 +144,30 @@
exit(-1);
}
- string strName;
- GetInputName(m_session_.get(), strName);
- m_strInputNames.push_back(strName.c_str());
- GetInputName(m_session_.get(), strName,1);
- m_strInputNames.push_back(strName);
+ // string strName;
+ // GetInputName(m_session_.get(), strName);
+ // m_strInputNames.push_back(strName.c_str());
+ // GetInputName(m_session_.get(), strName,1);
+ // m_strInputNames.push_back(strName);
- if (use_hotword) {
- GetInputName(m_session_.get(), strName, 2);
- m_strInputNames.push_back(strName);
- }
+ // if (use_hotword) {
+ // GetInputName(m_session_.get(), strName, 2);
+ // m_strInputNames.push_back(strName);
+ // }
- // support time stamp
- size_t numOutputNodes = m_session_->GetOutputCount();
- for(int index=0; index<numOutputNodes; index++){
- GetOutputName(m_session_.get(), strName, index);
- m_strOutputNames.push_back(strName);
- }
+ // // support time stamp
+ // size_t numOutputNodes = m_session_->GetOutputCount();
+ // for(int index=0; index<numOutputNodes; index++){
+ // GetOutputName(m_session_.get(), strName, index);
+ // m_strOutputNames.push_back(strName);
+ // }
- for (auto& item : m_strInputNames)
- m_szInputNames.push_back(item.c_str());
- for (auto& item : m_strOutputNames)
- m_szOutputNames.push_back(item.c_str());
+ // for (auto& item : m_strInputNames)
+ // m_szInputNames.push_back(item.c_str());
+ // for (auto& item : m_strOutputNames)
+ // m_szOutputNames.push_back(item.c_str());
+ GetInputNames(m_session_.get(), m_strInputNames, m_szInputNames);
+ GetOutputNames(m_session_.get(), m_strOutputNames, m_szOutputNames);
}
void Paraformer::InitLm(const std::string &lm_file,
--
Gitblit v1.9.1