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/fsmn-vad.cpp | 48 ++----------------------------------------------
1 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/runtime/onnxruntime/src/fsmn-vad.cpp b/runtime/onnxruntime/src/fsmn-vad.cpp
index 42ce83b..bcef5d4 100644
--- a/runtime/onnxruntime/src/fsmn-vad.cpp
+++ b/runtime/onnxruntime/src/fsmn-vad.cpp
@@ -60,53 +60,9 @@
LOG(ERROR) << "Error when load vad onnx model: " << e.what();
exit(-1);
}
- GetInputOutputInfo(vad_session_, &vad_in_names_, &vad_out_names_);
+ GetInputNames(vad_session_.get(), m_strInputNames, vad_in_names_);
+ GetOutputNames(vad_session_.get(), m_strOutputNames, vad_out_names_);
}
-
-void FsmnVad::GetInputOutputInfo(
- const std::shared_ptr<Ort::Session> &session,
- std::vector<const char *> *in_names, std::vector<const char *> *out_names) {
- Ort::AllocatorWithDefaultOptions allocator;
- // Input info
- int num_nodes = session->GetInputCount();
- in_names->resize(num_nodes);
- for (int i = 0; i < num_nodes; ++i) {
- std::unique_ptr<char, Ort::detail::AllocatedFree> name = session->GetInputNameAllocated(i, allocator);
- Ort::TypeInfo type_info = session->GetInputTypeInfo(i);
- auto tensor_info = type_info.GetTensorTypeAndShapeInfo();
- ONNXTensorElementDataType type = tensor_info.GetElementType();
- std::vector<int64_t> node_dims = tensor_info.GetShape();
- std::stringstream shape;
- for (auto j: node_dims) {
- shape << j;
- shape << " ";
- }
- // LOG(INFO) << "\tInput " << i << " : name=" << name.get() << " type=" << type
- // << " dims=" << shape.str();
- (*in_names)[i] = name.get();
- name.release();
- }
- // Output info
- num_nodes = session->GetOutputCount();
- out_names->resize(num_nodes);
- for (int i = 0; i < num_nodes; ++i) {
- std::unique_ptr<char, Ort::detail::AllocatedFree> name = session->GetOutputNameAllocated(i, allocator);
- Ort::TypeInfo type_info = session->GetOutputTypeInfo(i);
- auto tensor_info = type_info.GetTensorTypeAndShapeInfo();
- ONNXTensorElementDataType type = tensor_info.GetElementType();
- std::vector<int64_t> node_dims = tensor_info.GetShape();
- std::stringstream shape;
- for (auto j: node_dims) {
- shape << j;
- shape << " ";
- }
- // LOG(INFO) << "\tOutput " << i << " : name=" << name.get() << " type=" << type
- // << " dims=" << shape.str();
- (*out_names)[i] = name.get();
- name.release();
- }
-}
-
void FsmnVad::Forward(
const std::vector<std::vector<float>> &chunk_feats,
--
Gitblit v1.9.1