Browse Source

!980 mod format_trans log level error to warning

From: @wangxiaotian22
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen
tags/v1.2.0
mindspore-ci-bot Gitee 3 years ago
parent
commit
715bd8eedc
2 changed files with 12 additions and 6 deletions
  1. +6
    -6
      ge/common/formats/utils/formats_trans_utils.cc
  2. +6
    -0
      inc/framework/common/debug/log.h

+ 6
- 6
ge/common/formats/utils/formats_trans_utils.cc View File

@@ -32,7 +32,7 @@ int64_t GetCubeSizeByDataType(DataType data_type) {
if (size <= 0) { if (size <= 0) {
std::string error = "Failed to get cube size, the data type " + std::string error = "Failed to get cube size, the data type " +
FmtToStr(TypeUtils::DataTypeToSerialString(data_type)) + " is invalid"; FmtToStr(TypeUtils::DataTypeToSerialString(data_type)) + " is invalid";
GE_ERRORLOG_AND_ERRORMSG(PARAM_INVALID, error.c_str());
GE_WARNINGLOG_AND_ERRORMSG(error.c_str());
return -1; return -1;
} else if (size == 1) { } else if (size == 1) {
return kCubeSize * 2; // 32 bytes cube size return kCubeSize * 2; // 32 bytes cube size
@@ -61,7 +61,7 @@ bool CheckShapeValid(const std::vector<int64_t> &shape, const int64_t expect_dim
if (expect_dims <= 0 || shape.size() != static_cast<size_t>(expect_dims)) { if (expect_dims <= 0 || shape.size() != static_cast<size_t>(expect_dims)) {
std::string error = "Invalid shape, dims num " + FmtToStr(shape.size()) + std::string error = "Invalid shape, dims num " + FmtToStr(shape.size()) +
", expect " + FmtToStr(expect_dims); ", expect " + FmtToStr(expect_dims);
GE_ERRORLOG_AND_ERRORMSG(PARAM_INVALID, error.c_str());
GE_WARNINGLOG_AND_ERRORMSG(error.c_str());
return false; return false;
} }
return IsShapeValid(shape); return IsShapeValid(shape);
@@ -75,12 +75,12 @@ bool IsShapeValid(const std::vector<int64_t> &shape) {
for (auto dim : shape) { for (auto dim : shape) {
if (dim < 0) { if (dim < 0) {
std::string error = "Invalid negative dims in the shape " + FmtToStr(ShapeToString(shape)); std::string error = "Invalid negative dims in the shape " + FmtToStr(ShapeToString(shape));
GE_ERRORLOG_AND_ERRORMSG(PARAM_INVALID, error.c_str());
GE_WARNINGLOG_AND_ERRORMSG(error.c_str());
return false; return false;
} }
if (dim != 0 && kShapeItemNumMAX / dim < num) { if (dim != 0 && kShapeItemNumMAX / dim < num) {
std::string error = "Shape overflow, the total count should be less than " + FmtToStr(kShapeItemNumMAX); std::string error = "Shape overflow, the total count should be less than " + FmtToStr(kShapeItemNumMAX);
GE_ERRORLOG_AND_ERRORMSG(PARAM_INVALID, error.c_str());
GE_WARNINGLOG_AND_ERRORMSG(error.c_str());
return false; return false;
} }
num *= dim; num *= dim;
@@ -108,7 +108,7 @@ bool IsTransShapeSrcCorrect(const TransArgs &args, std::vector<int64_t> &expect_
FmtToStr(TypeUtils::FormatToSerialString(args.dst_format)) + ", invalid relationship between src shape " + FmtToStr(TypeUtils::FormatToSerialString(args.dst_format)) + ", invalid relationship between src shape " +
FmtToStr(ShapeToString(args.src_shape)) + " and dst " + FmtToStr(ShapeToString(args.src_shape)) + " and dst " +
FmtToStr(ShapeToString(args.dst_shape)); FmtToStr(ShapeToString(args.dst_shape));
GE_ERRORLOG_AND_ERRORMSG(PARAM_INVALID, error.c_str());
GE_WARNINGLOG_AND_ERRORMSG(error.c_str());
return false; return false;
} }
return true; return true;
@@ -121,7 +121,7 @@ bool IsTransShapeDstCorrect(const TransArgs &args, std::vector<int64_t> &expect_
FmtToStr(TypeUtils::FormatToSerialString(args.dst_format)) + ", the dst shape" + FmtToStr(TypeUtils::FormatToSerialString(args.dst_format)) + ", the dst shape" +
FmtToStr(ShapeToString(args.dst_shape)) + " is invalid, expect" + FmtToStr(ShapeToString(args.dst_shape)) + " is invalid, expect" +
FmtToStr(ShapeToString(expect_shape)); FmtToStr(ShapeToString(expect_shape));
GE_ERRORLOG_AND_ERRORMSG(PARAM_INVALID, error.c_str());
GE_WARNINGLOG_AND_ERRORMSG(error.c_str());
return false; return false;
} }
return true; return true;


+ 6
- 0
inc/framework/common/debug/log.h View File

@@ -261,6 +261,12 @@
ErrorManager::GetInstance().ATCReportErrMessage("E19021", {"reason"}, {errormsg}); \ ErrorManager::GetInstance().ATCReportErrMessage("E19021", {"reason"}, {errormsg}); \
} }


#define GE_WARNINGLOG_AND_ERRORMSG(errormsg) \
{ \
GELOGW("%s", errormsg); \
ErrorManager::GetInstance().ATCReportErrMessage("E19021", {"reason"}, {errormsg}); \
}

#define GE_CHK_LOG_AND_ERRORMSG(expr, _status, errormsg) \ #define GE_CHK_LOG_AND_ERRORMSG(expr, _status, errormsg) \
do { \ do { \
bool b = (expr); \ bool b = (expr); \


Loading…
Cancel
Save