@@ -50,16 +50,16 @@ Status CheckArgsForFracZToHwcn(const TransArgs &args) { | |||||
return ACL_ERROR_GE_DATATYPE_INVALID; | return ACL_ERROR_GE_DATATYPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(src_shape, kFracZDimsNum)) { | if (!CheckShapeValid(src_shape, kFracZDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, src shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, src shape %s", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Src shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Src shape %s check invalid", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(dst_shape, kHwcnDimsNum)) { | if (!CheckShapeValid(dst_shape, kHwcnDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check invalid", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -50,16 +50,16 @@ Status CheckArgsForFracZToNchw(const TransArgs &args) { | |||||
return ACL_ERROR_GE_DATATYPE_INVALID; | return ACL_ERROR_GE_DATATYPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(src_shape, kFracZDimsNum)) { | if (!CheckShapeValid(src_shape, kFracZDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, src shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, src shape %s", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Src shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Src shape %s check invalid", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(dst_shape, kNchwDimsNum)) { | if (!CheckShapeValid(dst_shape, kNchwDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check invalid", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -50,16 +50,16 @@ Status CheckArgsForFracZToNhwc(const TransArgs &args) { | |||||
return ACL_ERROR_GE_DATATYPE_INVALID; | return ACL_ERROR_GE_DATATYPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(src_shape, kFracZDimsNum)) { | if (!CheckShapeValid(src_shape, kFracZDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, src shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, src shape %s", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Src shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Src shape %s check invalid", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(dst_shape, kNhwcDimsNum)) { | if (!CheckShapeValid(dst_shape, kNhwcDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check invalid", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -49,16 +49,16 @@ Status CheckArgsForNc1hwc0ToNchw(const TransArgs &args) { | |||||
return ACL_ERROR_GE_DATATYPE_INVALID; | return ACL_ERROR_GE_DATATYPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(args.src_shape, kNc1hwc0DimsNum)) { | if (!CheckShapeValid(args.src_shape, kNc1hwc0DimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, src shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, src shape %s", | |||||
ShapeToString(args.src_shape).c_str()); | ShapeToString(args.src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Src shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Src shape %s check invalid", | |||||
ShapeToString(args.src_shape).c_str()); | ShapeToString(args.src_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(args.dst_shape, kNchwDimsNum)) { | if (!CheckShapeValid(args.dst_shape, kNchwDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(args.dst_shape).c_str()); | ShapeToString(args.dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check invalid", | |||||
ShapeToString(args.dst_shape).c_str()); | ShapeToString(args.dst_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -49,16 +49,16 @@ Status CheckArgsForNc1hwc0ToNhwc(const TransArgs &args) { | |||||
return ACL_ERROR_GE_DATATYPE_INVALID; | return ACL_ERROR_GE_DATATYPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(args.src_shape, kNc1hwc0DimsNum)) { | if (!CheckShapeValid(args.src_shape, kNc1hwc0DimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, src shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, src shape %s", | |||||
ShapeToString(args.src_shape).c_str()); | ShapeToString(args.src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Src shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Src shape %s check invalid", | |||||
ShapeToString(args.src_shape).c_str()); | ShapeToString(args.src_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(args.dst_shape, kNhwcDimsNum)) { | if (!CheckShapeValid(args.dst_shape, kNhwcDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(args.dst_shape).c_str()); | ShapeToString(args.dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check invalid", | |||||
ShapeToString(args.dst_shape).c_str()); | ShapeToString(args.dst_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -59,9 +59,9 @@ Status TransShape(int64_t n, int64_t c, int64_t h, int64_t w, DataType data_type | |||||
dst_shape.push_back(c0); | dst_shape.push_back(c0); | ||||
if (!IsShapeValid(dst_shape)) { | if (!IsShapeValid(dst_shape)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check failed", ShapeToString(dst_shape).c_str()); | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check invalid", ShapeToString(dst_shape).c_str()); | |||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
return SUCCESS; | return SUCCESS; | ||||
@@ -39,9 +39,9 @@ Status TransShapeNchwToNc1hwc0(const std::vector<int64_t> &src_shape, DataType d | |||||
return ACL_ERROR_GE_DATATYPE_INVALID; | return ACL_ERROR_GE_DATATYPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(src_shape, kNchwDimsNum)) { | if (!CheckShapeValid(src_shape, kNchwDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, src shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, src shape %s", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Failed to check src shape %s", | |||||
REPORT_CALL_ERROR("E19999", "Src shape %s check invalid", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -52,9 +52,9 @@ Status TransShapeNchwToNc1hwc0(const std::vector<int64_t> &src_shape, DataType d | |||||
dst_shape.push_back(src_shape.at(kNchwW)); | dst_shape.push_back(src_shape.at(kNchwW)); | ||||
dst_shape.push_back(c0); | dst_shape.push_back(c0); | ||||
if (!CheckShapeValid(dst_shape, kNc1hwc0DimsNum)) { | if (!CheckShapeValid(dst_shape, kNc1hwc0DimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Failed to check dst shape %s", | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check invalid", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -47,9 +47,9 @@ Status TransShapeNhwcToNc1hwc0(const std::vector<int64_t> &src_shape, DataType d | |||||
dst_shape.push_back(src_shape.at(kNhwcW)); | dst_shape.push_back(src_shape.at(kNhwcW)); | ||||
dst_shape.push_back(c0); | dst_shape.push_back(c0); | ||||
if (!CheckShapeValid(dst_shape, kNc1hwc0DimsNum)) { | if (!CheckShapeValid(dst_shape, kNc1hwc0DimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Failed to check dst shape %s", | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check invalid", | |||||
ShapeToString(dst_shape).c_str()); | ShapeToString(dst_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -73,16 +73,16 @@ Status CheckArgsForNhwcToNc1hwc0(const TransArgs &args) { | |||||
return ACL_ERROR_GE_DATATYPE_INVALID; | return ACL_ERROR_GE_DATATYPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(args.src_shape, kNhwcDimsNum)) { | if (!CheckShapeValid(args.src_shape, kNhwcDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, src shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, src shape %s", | |||||
ShapeToString(args.src_shape).c_str()); | ShapeToString(args.src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Src shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Src shape %s check invalid", | |||||
ShapeToString(args.src_shape).c_str()); | ShapeToString(args.src_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
if (!CheckShapeValid(args.dst_shape, kNc1hwc0DimsNum)) { | if (!CheckShapeValid(args.dst_shape, kNc1hwc0DimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, dst shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, dst shape %s", | |||||
ShapeToString(args.dst_shape).c_str()); | ShapeToString(args.dst_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check failed", | |||||
REPORT_CALL_ERROR("E19999", "Dst shape %s check valid", | |||||
ShapeToString(args.dst_shape).c_str()); | ShapeToString(args.dst_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -239,9 +239,9 @@ Status FormatTransferNhwcNc1hwc0::TransShape(Format src_format, const std::vecto | |||||
DataType data_type, Format dst_format, std::vector<int64_t> &dst_shape) { | DataType data_type, Format dst_format, std::vector<int64_t> &dst_shape) { | ||||
if (src_format == FORMAT_NHWC && CheckDataTypeSupported(data_type)) { | if (src_format == FORMAT_NHWC && CheckDataTypeSupported(data_type)) { | ||||
if (!CheckShapeValid(src_shape, kNhwcDimsNum)) { | if (!CheckShapeValid(src_shape, kNhwcDimsNum)) { | ||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Failed, src shape %s", | |||||
GELOGE(ACL_ERROR_GE_SHAPE_INVALID, "[Check][Shape]Value is invalid, src shape %s", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999", "Failed to check src shape %s", | |||||
REPORT_CALL_ERROR("E19999", "Src shape %s check invalid", | |||||
ShapeToString(src_shape).c_str()); | ShapeToString(src_shape).c_str()); | ||||
return ACL_ERROR_GE_SHAPE_INVALID; | return ACL_ERROR_GE_SHAPE_INVALID; | ||||
} | } | ||||
@@ -44,9 +44,11 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status TransFormat(const TransArg | |||||
auto src_shape_size = GetItemNumByShape(args.src_shape); | auto src_shape_size = GetItemNumByShape(args.src_shape); | ||||
if (args.data == nullptr && src_shape_size != 0) { | if (args.data == nullptr && src_shape_size != 0) { | ||||
GELOGE(ACL_ERROR_GE_PARAM_INVALID, "[Check][Shape]Failed, input data is null, src_shape %s", | |||||
GELOGE(ACL_ERROR_GE_PARAM_INVALID, "[Check][Shape]Failed, input data is null " | |||||
"or shape size not euqal to 0, src_shape %s", | |||||
ShapeToString(args.src_shape).c_str()); | ShapeToString(args.src_shape).c_str()); | ||||
REPORT_CALL_ERROR("E19999","Failed to chech shape, input data is null, src_shape %s", | |||||
REPORT_CALL_ERROR("E19999","Failed to check shape, input data is null " | |||||
"or shape size not equal to 0, src_shape %s", | |||||
ShapeToString(args.src_shape).c_str()); | ShapeToString(args.src_shape).c_str()); | ||||
return ACL_ERROR_GE_PARAM_INVALID; | return ACL_ERROR_GE_PARAM_INVALID; | ||||
} | } | ||||
@@ -85,8 +87,8 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status TransDataType(const CastAr | |||||
} | } | ||||
if (args.data == nullptr && args.src_data_size != 0) { | if (args.data == nullptr && args.src_data_size != 0) { | ||||
GELOGE(ACL_ERROR_GE_PARAM_INVALID, "[Check][Param]Failed, input data is null, " | |||||
"src_data_size %ld", args.src_data_size); | |||||
GELOGE(ACL_ERROR_GE_PARAM_INVALID, "[Check][Param]Failed, input data is null " | |||||
"or data size not equal to 0, src_data_size %ld", args.src_data_size); | |||||
return ACL_ERROR_GE_PARAM_INVALID; | return ACL_ERROR_GE_PARAM_INVALID; | ||||
} | } | ||||