Browse Source

!223 Fix GELOG format

Merge pull request !223 from 张晓昆/development
pull/223/MERGE
i-robot Gitee 5 years ago
parent
commit
fd086aaeab
7 changed files with 8 additions and 8 deletions
  1. +2
    -2
      parser/caffe/caffe_parser.cc
  2. +1
    -1
      parser/common/acl_graph_parser_util.cc
  3. +1
    -1
      parser/common/acl_graph_parser_util.h
  4. +1
    -1
      parser/common/parser_utils.cc
  5. +1
    -1
      parser/tensorflow/tensorflow_parser.cc
  6. +1
    -1
      parser/tensorflow/tensorflow_reshape_parser.cc
  7. +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());
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);
}
return SUCCESS;
@@ -1333,7 +1333,7 @@ Status CaffeModelParser::AddUserOutNodesTop() {
std::to_string((layer_iter->second).size()), std::to_string(index),
std::to_string(net_output_num)});
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.",
out_pair.first.c_str(), out_pair.second, (layer_iter->second).size(), index,
net_output_num);


+ 1
- 1
parser/common/acl_graph_parser_util.cc View File

@@ -295,7 +295,7 @@ domi::Status AclGrphParseUtil::ParseAclOutputNodes(const string &out_nodes) {

auto iter = ge::GetParserContext().out_nodes_map.find(key_value_v[0]);
int32_t index = stoi(StringUtils::Trim(key_value_v[1]));
GELOGD("Get output info: node[%s] and index[%ld]", key_value_v[0].c_str(), index);
GELOGD("Get output info: node[%s] and index[%d]", key_value_v[0].c_str(), index);
if (iter != ge::GetParserContext().out_nodes_map.end()) {
iter->second.emplace_back(index);
} else {


+ 1
- 1
parser/common/acl_graph_parser_util.h View File

@@ -223,7 +223,7 @@ inline domi::Status CheckInt64Uint32MulOverflow(int64_t a, uint32_t b) {

#define PARSER_INT64_UINT32_MULCHECK(a, b) \
if (ge::parser::CheckInt64Uint32MulOverflow((a), (b)) != SUCCESS) { \
GELOGW("Int64 %ld and UINT32 %u multiplication can result in overflow!", static_cast<uint32_t>(a), \
GELOGW("Int64 %ld and Uint32 %u multiplication can result in overflow!", static_cast<uint64_t>(a), \
static_cast<uint32_t>(b)); \
return INTERNAL_ERROR; \
}


+ 1
- 1
parser/common/parser_utils.cc View File

@@ -201,7 +201,7 @@ Status ParserUtils::HandleOutputContext(const NodePtr &node,

NodePtr out_node = out_node_index[index].first;
int32_t out_index = out_node_index[index].second;
GELOGD("Begin to handle output node:%s[%zu] with index:%zu", out_node->GetName().c_str(), out_index, index);
GELOGD("Begin to handle output node:%s[%d] with index:%zu", out_node->GetName().c_str(), out_index, index);
auto src_out_anchor = out_node->GetOutDataAnchor(out_index); // get out node's out anchor.
GE_CHECK_NOTNULL(src_out_anchor);
for (const auto &dest_in_anchor : node_out_anchor->GetPeerInDataAnchors()) {


+ 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"},
{src_op_name, std::to_string(input_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());
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);
ge::TensorUtils::SetSize(ge_desc, real_size * size_type);
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::FormatToSerialString(ge_desc.GetFormat()).c_str(), real_size * size_type, size_type);
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);
ge::TensorUtils::SetSize(ge_desc, real_size * size_type);
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::FormatToSerialString(ge_desc.GetFormat()).c_str(), real_size * size_type, size_type);
return SUCCESS;


Loading…
Cancel
Save