Browse Source

!530 sync ge_dev to master 20220424

Merge pull request !530 from 王涛/ge_dev
pull/532/head
计晨 Gitee 3 years ago
parent
commit
a42da3ff2e
No known key found for this signature in database GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      parser/caffe/caffe_parser.cc
  2. +1
    -1
      parser/tensorflow/tensorflow_parser.cc

+ 1
- 1
parser/caffe/caffe_parser.cc View File

@@ -1056,7 +1056,7 @@ Status CaffeModelParser::AddEdges(ge::ComputeGraphPtr &graph) {
{top_blob_layer_pair.first}); {top_blob_layer_pair.first});
GELOGE(INTERNAL_ERROR, "[Find][TopLayer] %s failed.", top_blob_layer_pair.first.c_str()); GELOGE(INTERNAL_ERROR, "[Find][TopLayer] %s failed.", top_blob_layer_pair.first.c_str());
return ge::FAILED;) return ge::FAILED;)
GE_IF_BOOL_EXEC(top_node_iter == node_map.end(),
GE_IF_BOOL_EXEC(bottom_node_iter == node_map.end(),
ErrorManager::GetInstance().ATCReportErrMessage("E11015", {"opname"}, ErrorManager::GetInstance().ATCReportErrMessage("E11015", {"opname"},
{bottom_blob_layer_pair.first}); {bottom_blob_layer_pair.first});
GELOGE(INTERNAL_ERROR, "[Find][BottomLayer] %s failed.", bottom_blob_layer_pair.first.c_str()); GELOGE(INTERNAL_ERROR, "[Find][BottomLayer] %s failed.", bottom_blob_layer_pair.first.c_str());


+ 1
- 1
parser/tensorflow/tensorflow_parser.cc View File

@@ -1361,7 +1361,7 @@ Status TensorFlowModelParser::Parse(const char *model_path, ge::ComputeGraphPtr
domi::tensorflow::GraphDef ori_def; domi::tensorflow::GraphDef ori_def;
bool read = ge::parser::ReadProtoFromBinaryFile(model_path, &ori_def); bool read = ge::parser::ReadProtoFromBinaryFile(model_path, &ori_def);
if (!read) { if (!read) {
GELOGE(FAILED, "read_proto_from_binary failed. --framework=3, file format should be tensorflow.");
GELOGE(FAILED, "read tensorflow file failed when the inupt param value of --framework is 3.");
return INTERNAL_ERROR; return INTERNAL_ERROR;
} }




Loading…
Cancel
Save