apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-06 09:07:10 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add 'GetOutputInfos' and 'GetInputInfos' interface (#232)

Browse Source 
add GetOutputInfos GetInputInfos
This commit is contained in:
heliqi
2022-09-15 00:09:31 -05:00
committed by GitHub
parent 6963296a89
commit 0805ead0ed
13 changed files with 125 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
fastdeploy/backends/openvino/ov_backend.cc
View File

@@ -107,19 +107,25 @@ bool OpenVINOBackend::InitFromPaddle(const std::string& model_file,
// So here will reorder it's inputs and outputs
std::string model_content;
ReadBinaryFromFile(model_file, &model_content);
auto reader = paddle2onnx::PaddleReader(model_content.c_str(), model_content.size());
auto reader =
paddle2onnx::PaddleReader(model_content.c_str(), model_content.size());
if (reader.num_inputs != input_infos.size()) {
FDERROR << "The number of inputs from PaddleReader:" << reader.num_inputs << " not equal to the number of inputs from OpenVINO:" << input_infos.size() << "." << std::endl;
FDERROR << "The number of inputs from PaddleReader:" << reader.num_inputs
<< " not equal to the number of inputs from OpenVINO:"
<< input_infos.size() << "." << std::endl;
return false;
}
if (reader.num_outputs != output_infos.size()) {
FDERROR << "The number of outputs from PaddleReader:" << reader.num_outputs << " not equal to the number of outputs from OpenVINO:" << output_infos.size() << "." << std::endl;
FDERROR << "The number of outputs from PaddleReader:" << reader.num_outputs
<< " not equal to the number of outputs from OpenVINO:"
<< output_infos.size() << "." << std::endl;
return false;
}
for (int i = 0; i < reader.num_inputs; ++i) {
auto iter = input_infos.find(std::string(reader.inputs[i].name));
if (iter == input_infos.end()) {
FDERROR << "Cannot find input name:" << reader.inputs[i].name << " from OpenVINO model." << std::endl;
FDERROR << "Cannot find input name:" << reader.inputs[i].name
<< " from OpenVINO model." << std::endl;
return false;
}
input_infos_.push_back(iter->second);
@@ -127,7 +133,8 @@ bool OpenVINOBackend::InitFromPaddle(const std::string& model_file,
for (int i = 0; i < reader.num_outputs; ++i) {
auto iter = output_infos.find(std::string(reader.outputs[i].name));
if (iter == output_infos.end()) {
FDERROR << "Cannot find output name:" << reader.outputs[i].name << " from OpenVINO model." << std::endl;
FDERROR << "Cannot find output name:" << reader.outputs[i].name
<< " from OpenVINO model." << std::endl;
return false;
}
output_infos_.push_back(iter->second);
@@ -146,6 +153,14 @@ TensorInfo OpenVINOBackend::GetInputInfo(int index) {
return input_infos_[index];
}
std::vector<TensorInfo> OpenVINOBackend::GetInputInfos() {
return input_infos_;
}
std::vector<TensorInfo> OpenVINOBackend::GetOutputInfos() {
return output_infos_;
}
TensorInfo OpenVINOBackend::GetOutputInfo(int index) {
FDASSERT(index < NumOutputs(),
"The index: %d should less than the number of outputs: %d.", index,
@@ -181,19 +196,25 @@ bool OpenVINOBackend::InitFromOnnx(const std::string& model_file,
// So here will reorder it's inputs and outputs
std::string model_content;
ReadBinaryFromFile(model_file, &model_content);
auto reader = paddle2onnx::OnnxReader(model_content.c_str(), model_content.size());
auto reader =
paddle2onnx::OnnxReader(model_content.c_str(), model_content.size());
if (reader.num_inputs != input_infos.size()) {
FDERROR << "The number of inputs from OnnxReader:" << reader.num_inputs << " not equal to the number of inputs from OpenVINO:" << input_infos.size() << "." << std::endl;
FDERROR << "The number of inputs from OnnxReader:" << reader.num_inputs
<< " not equal to the number of inputs from OpenVINO:"
<< input_infos.size() << "." << std::endl;
return false;
}
if (reader.num_outputs != output_infos.size()) {
FDERROR << "The number of outputs from OnnxReader:" << reader.num_outputs << " not equal to the number of outputs from OpenVINO:" << output_infos.size() << "." << std::endl;
FDERROR << "The number of outputs from OnnxReader:" << reader.num_outputs
<< " not equal to the number of outputs from OpenVINO:"
<< output_infos.size() << "." << std::endl;
return false;
}
for (int i = 0; i < reader.num_inputs; ++i) {
auto iter = input_infos.find(std::string(reader.inputs[i].name));
if (iter == input_infos.end()) {
FDERROR << "Cannot find input name:" << reader.inputs[i].name << " from OpenVINO model." << std::endl;
FDERROR << "Cannot find input name:" << reader.inputs[i].name
<< " from OpenVINO model." << std::endl;
return false;
}
input_infos_.push_back(iter->second);
@@ -201,7 +222,8 @@ bool OpenVINOBackend::InitFromOnnx(const std::string& model_file,
for (int i = 0; i < reader.num_outputs; ++i) {
auto iter = output_infos.find(std::string(reader.outputs[i].name));
if (iter == output_infos.end()) {
FDERROR << "Cannot find output name:" << reader.outputs[i].name << " from OpenVINO model." << std::endl;
FDERROR << "Cannot find output name:" << reader.outputs[i].name
<< " from OpenVINO model." << std::endl;
return false;
}
output_infos_.push_back(iter->second);