diff --git a/ge/common/formats/format_transfers/format_transfer_fractal_zz.cc b/ge/common/formats/format_transfers/format_transfer_fractal_zz.cc index 14315084..03e3e67c 100755 --- a/ge/common/formats/format_transfers/format_transfer_fractal_zz.cc +++ b/ge/common/formats/format_transfers/format_transfer_fractal_zz.cc @@ -49,19 +49,24 @@ const size_t kFZzDimCountBackwardsW0H0W1H1 = 4; bool IsDataTypeSupport(DataType d_type) { return GetSizeByDataType(d_type) > 0; } using ShapeVector = std::vector; +bool ret1 = false; bool CheckShape(Format format, const ShapeVector &shape) { switch (format) { case FORMAT_ND: - return IsShapeValid(shape); + ret1 = IsShapeValid(shape); + break; case FORMAT_NCHW: case FORMAT_NHWC: - return CheckShapeValid(shape, kDimSize4D); + ret1 = CheckShapeValid(shape, kDimSize4D); + break; default: std::string error = "Trans format between " + FmtToStr(TypeUtils::FormatToSerialString(format)) + " and FORMAT_FRACTAL_ZZ is not supported."; GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str()); - return false; + ret1 = false; + break; } + return ret1; } /** @@ -76,6 +81,7 @@ Status TransShapeToFracZz(const ShapeVector &src_shape, DataType data_type, Shap hw_shape.clear(); auto w0 = GetCubeSizeByDataType(data_type); auto h0 = GetCubeSizeByDataType(data_type); + auto ret2 = SUCCESS; switch (src_shape.size()) { case kSingleDim: dst_shape.push_back(DIM_DEFAULT_VALUE); @@ -90,9 +96,10 @@ Status TransShapeToFracZz(const ShapeVector &src_shape, DataType data_type, Shap ShapeToString(dst_shape).c_str()); REPORT_CALL_ERROR("E19999", "Failed to check dst shape %s", ShapeToString(dst_shape).c_str()); - return ACL_ERROR_GE_SHAPE_INVALID; + ret2 = ACL_ERROR_GE_SHAPE_INVALID; } - return SUCCESS; + ret2 = SUCCESS; + break; default: auto size = src_shape.size(); int64_t times = 1; @@ -112,10 +119,12 @@ Status TransShapeToFracZz(const ShapeVector &src_shape, DataType data_type, Shap ShapeToString(dst_shape).c_str()); REPORT_CALL_ERROR("E19999", "Failed to check dst shape %s", ShapeToString(dst_shape).c_str()); - return ACL_ERROR_GE_SHAPE_INVALID; + ret2 = ACL_ERROR_GE_SHAPE_INVALID; } - return SUCCESS; + ret2 = SUCCESS; + break; } + return ret2; } Status CheckShapeRelation(const TransArgs &args, ShapeVector &hw_shape) { diff --git a/ge/common/op/ge_op_utils.cc b/ge/common/op/ge_op_utils.cc index 4c2043f2..9de36573 100644 --- a/ge/common/op/ge_op_utils.cc +++ b/ge/common/op/ge_op_utils.cc @@ -345,7 +345,7 @@ Status OpUtils::SetOutputSliceData(void *data, int64_t data_size, int32_t data_t break; default: GELOGW("Unsupported data type: %s", TypeUtils::DataTypeToSerialString(static_cast(data_type)).c_str()); - return PARAM_INVALID; + ret = PARAM_INVALID; break; } return ret; diff --git a/ge/hybrid/executor/worker/execution_engine.cc b/ge/hybrid/executor/worker/execution_engine.cc index 4bd02193..c914d3d4 100755 --- a/ge/hybrid/executor/worker/execution_engine.cc +++ b/ge/hybrid/executor/worker/execution_engine.cc @@ -18,7 +18,7 @@ #include "graph/runtime_inference_context.h" #include "graph/load/model_manager/model_manager.h" #include "hybrid/node_executor/node_executor.h" -#include "hybrid/executor//worker//shape_inference_engine.h" +#include "hybrid/executor/worker/shape_inference_engine.h" #include "common/profiling/profiling_manager.h" namespace ge { diff --git a/inc/framework/memory/memory_api.h b/inc/framework/memory/memory_api.h index a316fd59..79a4e2df 100644 --- a/inc/framework/memory/memory_api.h +++ b/inc/framework/memory/memory_api.h @@ -21,7 +21,7 @@ #include #include "ge/ge_api_error_codes.h" -#include "graph//types.h" +#include "graph/types.h" #include "runtime/mem.h" namespace ge {