From 9fcb3cc06b4e324f0913d2f61b89becc2baeef1b Mon Sep 17 00:00:00 2001
From: hnluo <haoneng.lhn@alibaba-inc.com>
Date: 星期一, 11 九月 2023 17:40:03 +0800
Subject: [PATCH] Merge pull request #932 from alibaba-damo-academy/dev_lhn
---
funasr/runtime/onnxruntime/src/commonfunc.h | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/commonfunc.h b/funasr/runtime/onnxruntime/src/commonfunc.h
index 11c234e..d7e5f13 100644
--- a/funasr/runtime/onnxruntime/src/commonfunc.h
+++ b/funasr/runtime/onnxruntime/src/commonfunc.h
@@ -1,56 +1,70 @@
#pragma once
+#include <algorithm>
+namespace funasr {
+typedef struct
+{
+ std::string msg="";
+ std::string stamp="";
+ std::string tpass_msg="";
+ float snippet_time=0;
+}FUNASR_RECOG_RESULT;
typedef struct
{
- std::string msg;
- float snippet_time;
-}RPASR_RECOG_RESULT;
+ std::vector<std::vector<int>>* segments;
+ float snippet_time=0;
+}FUNASR_VAD_RESULT;
+typedef struct
+{
+ string msg="";
+ vector<string> arr_cache;
+}FUNASR_PUNC_RESULT;
#ifdef _WIN32
#include <codecvt>
-
-
-inline std::wstring string2wstring(const std::string& str, const std::string& locale)
+inline std::wstring String2wstring(const std::string& str, const std::string& locale)
{
typedef std::codecvt_byname<wchar_t, char, std::mbstate_t> F;
std::wstring_convert<F> strCnv(new F(locale));
return strCnv.from_bytes(str);
}
-inline std::wstring strToWstr(std::string str) {
+inline std::wstring StrToWstr(std::string str) {
if (str.length() == 0)
return L"";
- return string2wstring(str, "zh-CN");
+ return String2wstring(str, "zh-CN");
}
#endif
-
-
-inline void getInputName(Ort::Session* session, string& inputName,int nIndex=0) {
+inline void GetInputName(Ort::Session* session, string& inputName,int nIndex=0) {
size_t numInputNodes = session->GetInputCount();
if (numInputNodes > 0) {
Ort::AllocatorWithDefaultOptions allocator;
{
auto t = session->GetInputNameAllocated(nIndex, allocator);
inputName = t.get();
-
}
}
}
-inline void getOutputName(Ort::Session* session, string& outputName, int nIndex = 0) {
+inline void GetOutputName(Ort::Session* session, string& outputName, int nIndex = 0) {
size_t numOutputNodes = session->GetOutputCount();
if (numOutputNodes > 0) {
Ort::AllocatorWithDefaultOptions allocator;
{
auto t = session->GetOutputNameAllocated(nIndex, allocator);
outputName = t.get();
-
}
}
-}
\ No newline at end of file
+}
+
+template <class ForwardIterator>
+inline static size_t Argmax(ForwardIterator first, ForwardIterator last) {
+ return std::distance(first, std::max_element(first, last));
+}
+} // namespace funasr
--
Gitblit v1.9.1