Browse Source

Fix format error

pull/223/head
zhangxiaokun 5 years ago
parent
commit
98c6de8507
4 changed files with 5 additions and 5 deletions
  1. +2
    -2
      parser/caffe/caffe_parser.cc
  2. +1
    -1
      parser/tensorflow/tensorflow_parser.cc
  3. +1
    -1
      parser/tensorflow/tensorflow_reshape_parser.cc
  4. +1
    -1
      parser/tensorflow/tensorflow_squeeze_parser.cc

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

@@ -875,7 +875,7 @@ Status CaffeModelParser::ParseOutputNodeTopInfo(const domi::caffe::NetParameter
GELOGE(PARAM_INVALID, "Cannot find top_name[%s], which is invalid", top_name.c_str()); GELOGE(PARAM_INVALID, "Cannot find top_name[%s], which is invalid", top_name.c_str());
return PARAM_INVALID; return PARAM_INVALID;
} }
GELOGD("Node[%s] find top_name[%s], top_index[%ld]", layer_name.c_str(), top_name.c_str(), top_index);
GELOGD("Node[%s] find top_name[%s], top_index[%d]", layer_name.c_str(), top_name.c_str(), top_index);
AddOutputInfoToContext(layer_name, top_index); AddOutputInfoToContext(layer_name, top_index);
} }
return SUCCESS; return SUCCESS;
@@ -1333,7 +1333,7 @@ Status CaffeModelParser::AddUserOutNodesTop() {
std::to_string((layer_iter->second).size()), std::to_string(index), std::to_string((layer_iter->second).size()), std::to_string(index),
std::to_string(net_output_num)}); std::to_string(net_output_num)});
GELOGE(INTERNAL_ERROR, GELOGE(INTERNAL_ERROR,
"Add op %s to NetOutput faild, current node output index:%d should < %u. NetOutput"
"Add op %s to NetOutput faild, current node output index:%d should < %zu. NetOutput"
"input_index:%d should < %u.", "input_index:%d should < %u.",
out_pair.first.c_str(), out_pair.second, (layer_iter->second).size(), index, out_pair.first.c_str(), out_pair.second, (layer_iter->second).size(), index,
net_output_num); net_output_num);


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

@@ -700,7 +700,7 @@ Status TensorFlowModelParser::AddEdges(ge::ComputeGraphPtr &graph) {
ErrorManager::GetInstance().ATCReportErrMessage("E12021", {"opname1", "index1", "opname2", "index2"}, ErrorManager::GetInstance().ATCReportErrMessage("E12021", {"opname1", "index1", "opname2", "index2"},
{src_op_name, std::to_string(input_iter->second.size()), {src_op_name, std::to_string(input_iter->second.size()),
dest_op_name, std::to_string(src_output_iter.second.size())}); dest_op_name, std::to_string(src_output_iter.second.size())});
GELOGE(INTERNAL_ERROR, "Input size of op[%s]:%d is not equal to Output size of op[%s]:%d.", src_op_name.c_str(),
GELOGE(INTERNAL_ERROR, "Input size of op[%s]:%zu is not equal to Output size of op[%s]:%zu.", src_op_name.c_str(),
input_iter->second.size(), dest_op_name.c_str(), src_output_iter.second.size()); input_iter->second.size(), dest_op_name.c_str(), src_output_iter.second.size());
return INTERNAL_ERROR; return INTERNAL_ERROR;
} }


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

@@ -51,7 +51,7 @@ Status TensorFlowReshapeParser::ParseDesc(const domi::tensorflow::AttrValue &att
PARSER_INT64_MULCHECK(real_size, size_type); PARSER_INT64_MULCHECK(real_size, size_type);
ge::TensorUtils::SetSize(ge_desc, real_size * size_type); ge::TensorUtils::SetSize(ge_desc, real_size * size_type);
ge::TensorUtils::SetRealDimCnt(ge_desc, ge_desc.GetShape().GetDimNum()); ge::TensorUtils::SetRealDimCnt(ge_desc, ge_desc.GetShape().GetDimNum());
GELOGI("after translate tf_desc, datatype: %s, format: %s, real size: %u, size_type: %u",
GELOGI("after translate tf_desc, datatype: %s, format: %s, real size: %ld, size_type: %u",
ge::TypeUtils::DataTypeToSerialString(ge_desc.GetDataType()).c_str(), ge::TypeUtils::DataTypeToSerialString(ge_desc.GetDataType()).c_str(),
ge::TypeUtils::FormatToSerialString(ge_desc.GetFormat()).c_str(), real_size * size_type, size_type); ge::TypeUtils::FormatToSerialString(ge_desc.GetFormat()).c_str(), real_size * size_type, size_type);
return SUCCESS; return SUCCESS;


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

@@ -58,7 +58,7 @@ Status TensorFlowSqueezeParser::ParseDesc(const domi::tensorflow::AttrValue &att
PARSER_INT64_MULCHECK(real_size, size_type); PARSER_INT64_MULCHECK(real_size, size_type);
ge::TensorUtils::SetSize(ge_desc, real_size * size_type); ge::TensorUtils::SetSize(ge_desc, real_size * size_type);
ge::TensorUtils::SetRealDimCnt(ge_desc, ge_desc.GetShape().GetDimNum()); ge::TensorUtils::SetRealDimCnt(ge_desc, ge_desc.GetShape().GetDimNum());
GELOGD("after translate tf_desc, datatype: %s, format: %s, real size: %u, size_type: %u",
GELOGD("after translate tf_desc, datatype: %s, format: %s, real size: %ld, size_type: %u",
ge::TypeUtils::DataTypeToSerialString(ge_desc.GetDataType()).c_str(), ge::TypeUtils::DataTypeToSerialString(ge_desc.GetDataType()).c_str(),
ge::TypeUtils::FormatToSerialString(ge_desc.GetFormat()).c_str(), real_size * size_type, size_type); ge::TypeUtils::FormatToSerialString(ge_desc.GetFormat()).c_str(), real_size * size_type, size_type);
return SUCCESS; return SUCCESS;


Loading…
Cancel
Save