IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GNA] Fix import model with header version 2.1 (#3363)

Browse Source
This commit is contained in:
Andrey Dmitriev
2020-11-27 17:01:59 +03:00
committed by GitHub
parent 8f507a07f5
commit ff878ffe92
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inference-engine/src/gna_plugin/gna_model_serial.cpp
View File

@@ -102,14 +102,18 @@ GNAPluginNS::HeaderLatest::ModelHeader GNAModelSerial::ReadHeader(std::istream &
is.seekg(0, is.beg);
Header2dot1::ModelHeader tempHeader2dot1;
Header2dot2::ModelHeader tempHeader2dot2;
switch (header.version.major) {
case 2:
switch (header.version.minor) {
case 1:
readBits(tempHeader2dot1, is);
header = Header2dot3::ModelHeader(tempHeader2dot1);
header = HeaderLatest::ModelHeader(tempHeader2dot1);
break;
case 2:
readBits(tempHeader2dot2, is);
header = HeaderLatest::ModelHeader(tempHeader2dot2);
break;
case 3:
readBits(header, is);
break;
@@ -755,7 +759,7 @@ void GNAModelSerial::ImportOutputs(std::istream &is,
for (auto outputIndex = 0; outputIndex < modelHeader.nOutputs; outputIndex++) {
const std::string& name = (modelHeader.version.major == 2 && modelHeader.version.minor >= 3)
? outputNames.at(outputIndex) : std::string("input" + std::to_string(outputIndex));
? outputNames.at(outputIndex) : std::string("output" + std::to_string(outputIndex));
HeaderLatest::RuntimeEndPoint output;
is.read(reinterpret_cast<char *>(&output), sizeof(output));
OutputDesc description;

14
inference-engine/src/gna_plugin/serial/headers/2dot3/gna_model_header.hpp
View File

@@ -5,8 +5,9 @@
#pragma once
#include <cstdint>
#include "backend/dnn_types.h"
#include <serial/headers/2dot2/gna_model_header.hpp>
#include "serial/headers/2dot1/gna_model_header.hpp"
#include "backend/dnn_types.h"
#pragma pack(push, 1)
@@ -75,6 +76,17 @@ struct ModelHeader {
nRotateColumns = old.nRotateColumns;
nInputs = old.nInputs;
nOutputs = old.nOutputs;
version.minor = old.version.minor;
}
ModelHeader(GNAPluginNS::Header2dot2::ModelHeader const&old) {
gnaMemSize = old.gnaMemSize;
layersCount = old.layersCount;
nGroup = old.nGroup;
nRotateRows = old.nRotateRows;
nRotateColumns = old.nRotateColumns;
nInputs = old.nInputs;
nOutputs = old.nOutputs;
version.minor = old.version.minor;
}
};
#pragma pack(pop)