From f262c4048fbbe78eb39cba0c57c905ccfd8f9cfa Mon Sep 17 00:00:00 2001 From: zhao-lupeng Date: Fri, 20 May 2022 11:06:47 +0800 Subject: [PATCH] fix misra --- parser/caffe/caffe_parser.cc | 2 +- parser/common/op_def/constant_op.cc | 4 ++-- parser/common/op_def/ir_pb_converter.cc | 4 ++-- parser/common/op_def/ref_switch_op.cc | 2 +- parser/common/op_def/shape_n_op.cc | 8 ++++---- parser/common/parser_fp16_t.cc | 11 ++++++----- parser/common/pre_checker.cc | 2 +- parser/common/register_tbe.cc | 5 +++-- parser/onnx/subgraph_adapter/if_subgraph_adapter.cc | 2 +- parser/tensorflow/graph_functiondef.cc | 4 ++-- parser/tensorflow/graph_optimizer.cc | 10 ++++++---- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/parser/caffe/caffe_parser.cc b/parser/caffe/caffe_parser.cc index 500247c..3627616 100644 --- a/parser/caffe/caffe_parser.cc +++ b/parser/caffe/caffe_parser.cc @@ -991,7 +991,7 @@ Status CaffeModelParser::AddTensorDescToOpDescByIr(ge::OpDescPtr &op_desc, const GELOGI("op [%s], type[%s], update output(%d) with name %s %s", op_desc->GetName().c_str(), op_desc->GetType().c_str(), i, op_desc->GetOutputNameByIndex(i).c_str(), - ret == ge::GRAPH_SUCCESS ? "success" : "failed"); + ret == ge::GRAPH_SUCCESS ? "success" : "not success"); } } return SUCCESS; diff --git a/parser/common/op_def/constant_op.cc b/parser/common/op_def/constant_op.cc index cca55c5..ce9d249 100644 --- a/parser/common/op_def/constant_op.cc +++ b/parser/common/op_def/constant_op.cc @@ -32,9 +32,9 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ConstantOperator &ConstantOpera } FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ConstantOperator &ConstantOperator::DType(ge::DataType t) { - Attr(VAR_ATTR_DTYPE, (int64_t)t); + Attr(VAR_ATTR_DTYPE, static_cast(t)); return *this; } -ge::DataType ConstantOperator::GetDType() const { return (ge::DataType)GetIntAttr(VAR_ATTR_DTYPE); } +ge::DataType ConstantOperator::GetDType() const { return static_cast(GetIntAttr(VAR_ATTR_DTYPE)); } } // namespace ge diff --git a/parser/common/op_def/ir_pb_converter.cc b/parser/common/op_def/ir_pb_converter.cc index d4849c8..9dd7f64 100644 --- a/parser/common/op_def/ir_pb_converter.cc +++ b/parser/common/op_def/ir_pb_converter.cc @@ -32,7 +32,7 @@ static void ConvertList(const std::pair &op_attr_pair, vector v_i; for (int32_t i = 0; i < a_list.i_size(); i++) { - v_i.push_back((int64_t)a_list.i(i)); + v_i.push_back(static_cast(a_list.i(i))); } if (v_i.size() > 0) { (void)ge::AttrUtils::SetListInt(op_def, op_attr_pair.first, v_i); @@ -56,7 +56,7 @@ static void ConvertList(const std::pair &op_attr_pair, } vector v_u; for (int32_t i = 0; i < a_list.u_size(); i++) { - v_u.push_back((int32_t)a_list.u(i)); + v_u.push_back(static_cast(a_list.u(i))); } if (v_u.size() > 0) { (void)ge::AttrUtils::SetListInt(op_def, op_attr_pair.first, v_u); diff --git a/parser/common/op_def/ref_switch_op.cc b/parser/common/op_def/ref_switch_op.cc index a584cc5..5331676 100644 --- a/parser/common/op_def/ref_switch_op.cc +++ b/parser/common/op_def/ref_switch_op.cc @@ -23,7 +23,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY RefSwitchOperator::RefSwitchOpe FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY RefSwitchOperator::~RefSwitchOperator() {} FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY RefSwitchOperator &RefSwitchOperator::T(ge::DataType t) { - Attr("T", (int64_t)t); + Attr("T", static_cast(t)); return *this; } } // namespace ge AUTO GEN PLEASE DO NOT MODIFY IT diff --git a/parser/common/op_def/shape_n_op.cc b/parser/common/op_def/shape_n_op.cc index 7369345..d5d64dc 100644 --- a/parser/common/op_def/shape_n_op.cc +++ b/parser/common/op_def/shape_n_op.cc @@ -32,20 +32,20 @@ FMK_FUNC_HOST_VISIBILITY ShapeNOperator &ShapeNOperator::N(int64_t n) { FMK_FUNC_HOST_VISIBILITY int64_t ShapeNOperator::GetN() const { return GetIntAttr(SHAPEN_ATTR_N); } FMK_FUNC_HOST_VISIBILITY ShapeNOperator &ShapeNOperator::InType(ge::DataType t) { - Attr(SHAPEN_ATTR_IN_TYPE, (int64_t)t); + Attr(SHAPEN_ATTR_IN_TYPE, static_cast(t)); return *this; } FMK_FUNC_HOST_VISIBILITY ge::DataType ShapeNOperator::GetInType() const { - return (ge::DataType)GetIntAttr(SHAPEN_ATTR_IN_TYPE); + return static_cast(GetIntAttr(SHAPEN_ATTR_IN_TYPE)); } FMK_FUNC_HOST_VISIBILITY ShapeNOperator &ShapeNOperator::OutType(ge::DataType t) { - Attr(SHAPEN_ATTR_OUT_TYPE, (int64_t)t); + Attr(SHAPEN_ATTR_OUT_TYPE, static_cast(t)); return *this; } FMK_FUNC_HOST_VISIBILITY ge::DataType ShapeNOperator::GetOutType() const { - return (ge::DataType)GetIntAttr(SHAPEN_ATTR_OUT_TYPE); + return static_cast(GetIntAttr(SHAPEN_ATTR_OUT_TYPE)); } } // namespace ge diff --git a/parser/common/parser_fp16_t.cc b/parser/common/parser_fp16_t.cc index 43306e6..b01b806 100644 --- a/parser/common/parser_fp16_t.cc +++ b/parser/common/parser_fp16_t.cc @@ -17,6 +17,7 @@ #include "parser/common/parser_fp16_t.h" #include "external/register/register_types.h" +#include "graph/def_types.h" namespace { constexpr uint16_t kManBitLength = 11; @@ -104,7 +105,7 @@ static float Fp16ToFloat(const uint16_t &fp_val) { m_ret = m_ret << (kFp32ManLen - kFp16ManLen); } uint32_t f_val = FP32_CONSTRUCTOR(s_ret, e_ret, m_ret); - auto p_ret_v = reinterpret_cast(&f_val); + auto p_ret_v = ge::PtrToPtr(&f_val); return *p_ret_v; } @@ -136,7 +137,7 @@ static double Fp16ToDouble(const uint16_t &fp_val) { m_ret = m_ret << (kFp64ManLen - kFp16ManLen); } uint64_t f_val = (s_ret << kFp64SignIndex) | (e_ret << kFp64ManLen) | (m_ret); - auto p_ret_v = reinterpret_cast(&f_val); + auto p_ret_v = ge::PtrToPtr(&f_val); return *p_ret_v; } @@ -178,7 +179,7 @@ static int8_t Fp16ToInt8(const uint16_t &fp_val) { if (FP16_IS_DENORM(fp_val)) { // Denormalized number ret_v = 0; - ret = *(reinterpret_cast(&ret_v)); + ret = *(ge::PtrToPtr(&ret_v)); return ret; } @@ -853,7 +854,7 @@ fp16_t &fp16_t::operator=(const float &f_val) { uint16_t s_ret, m_ret; int16_t e_ret; uint32_t e_f, m_f; - const uint32_t ui32_v = *(reinterpret_cast(&f_val)); // 1:8:23bit sign:exp:man + const uint32_t ui32_v = *(ge::PtrToPtr(&f_val)); // 1:8:23bit sign:exp:man uint32_t m_len_delta; s_ret = static_cast((ui32_v & kFp32SignMask) >> kFp32SignIndex); // 4Byte->2Byte @@ -1161,7 +1162,7 @@ fp16_t &fp16_t::operator=(const double &d_val) { int16_t e_ret; uint64_t e_d; uint64_t m_d; - uint64_t ui64_v = *(reinterpret_cast(&d_val)); // 1:11:52bit sign:exp:man + uint64_t ui64_v = *(ge::PtrToPtr(&d_val)); // 1:11:52bit sign:exp:man uint32_t m_len_delta; s_ret = static_cast((ui64_v & kFp64SignMask) >> kFp64SignIndex); // 4Byte diff --git a/parser/common/pre_checker.cc b/parser/common/pre_checker.cc index af3ac52..dea8651 100644 --- a/parser/common/pre_checker.cc +++ b/parser/common/pre_checker.cc @@ -250,7 +250,7 @@ Status PreChecker::CheckTypeSupported(OpId id, const string &type, const string Cause cause; cause.code = ErrorCode::TYPE_UNSUPPORTED; cause.message = "The type is not supported."; - GELOGI("Check op[%s]'s type[%s] failed, it is not supported.", name.c_str(), type.c_str()); + GELOGI("Check op[%s]'s type[%s], The type is not supported.", name.c_str(), type.c_str()); if (!is_tensorflow) { ErrorManager::GetInstance().ATCReportErrMessage("E19010", {"opname", "optype"}, {name, type}); } diff --git a/parser/common/register_tbe.cc b/parser/common/register_tbe.cc index c2d86c6..d21a61e 100644 --- a/parser/common/register_tbe.cc +++ b/parser/common/register_tbe.cc @@ -97,7 +97,8 @@ bool OpRegistrationTbe::RegisterParser(const OpRegistrationData ®_data) { return false; } OpParserRegisterar registerar __attribute__((unused)) = OpParserRegisterar( - domi::TENSORFLOW, GetOmOptype(reg_data), [=]() -> std::shared_ptr { return tf_parser_adapter; }); + domi::TENSORFLOW, GetOmOptype(reg_data), [tf_parser_adapter]() -> std::shared_ptr + { return tf_parser_adapter; }); } if (reg_data.GetFusionParseParamFn() != nullptr || reg_data.GetFusionParseParamByOpFn() != nullptr) { bool is_registed = factory->OpParserIsRegistered(GetOmOptype(reg_data), true); @@ -115,7 +116,7 @@ bool OpRegistrationTbe::RegisterParser(const OpRegistrationData ®_data) { } OpParserRegisterar registerar __attribute__((unused)) = OpParserRegisterar( domi::TENSORFLOW, GetOmOptype(reg_data), - [=]() -> std::shared_ptr { return tf_fusion_parser_adapter; }, true); + [tf_fusion_parser_adapter]() -> std::shared_ptr { return tf_fusion_parser_adapter; }, true); } } else { std::shared_ptr factory = OpParserFactory::Instance(reg_data.GetFrameworkType()); diff --git a/parser/onnx/subgraph_adapter/if_subgraph_adapter.cc b/parser/onnx/subgraph_adapter/if_subgraph_adapter.cc index 6248e0a..23b859c 100644 --- a/parser/onnx/subgraph_adapter/if_subgraph_adapter.cc +++ b/parser/onnx/subgraph_adapter/if_subgraph_adapter.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include #include "if_subgraph_adapter.h" +#include #include "subgraph_adapter_factory.h" #include "common/util.h" #include "framework/common/debug/ge_log.h" diff --git a/parser/tensorflow/graph_functiondef.cc b/parser/tensorflow/graph_functiondef.cc index 0758b97..983d8a6 100644 --- a/parser/tensorflow/graph_functiondef.cc +++ b/parser/tensorflow/graph_functiondef.cc @@ -320,8 +320,8 @@ domi::Status GraphToFunctionDef::RecordArg(ge::ComputeGraphPtr graph, const vect return FAILED; } - (void)ge::AttrUtils::SetInt(op, "T", (int32_t)dtype); - (void)ge::AttrUtils::SetInt(op, "arg_index", (int32_t)index); + (void)ge::AttrUtils::SetInt(op, "T", static_cast(dtype)); + (void)ge::AttrUtils::SetInt(op, "arg_index", static_cast(index)); ge::NodePtr arg_node = graph->AddNode(op); GE_CHECK_NOTNULL(arg_node); bool node_exists = false; diff --git a/parser/tensorflow/graph_optimizer.cc b/parser/tensorflow/graph_optimizer.cc index 4ba272d..e9c8799 100644 --- a/parser/tensorflow/graph_optimizer.cc +++ b/parser/tensorflow/graph_optimizer.cc @@ -388,7 +388,8 @@ Status ParserGraphOptimizer::RebuildOutputAnchors(vector & GE_CHK_BOOL_EXEC(fusion_op_desc->AddOutputDesc(src_out_desc) == ge::GRAPH_SUCCESS, return FAILED); ge::DataType data_type = src_out_desc.GetDataType(); - const std::map::const_iterator iter = GE_TENSORFLOW_DATA_TYPE_MAP.find((int32_t)data_type); + const std::map::const_iterator iter = + GE_TENSORFLOW_DATA_TYPE_MAP.find(static_cast(data_type)); GE_IF_BOOL_EXEC( iter == GE_TENSORFLOW_DATA_TYPE_MAP.end(), REPORT_INNER_ERROR("E19999", "datatype:%d of output:%d in node:%s:%s is not supported", @@ -397,7 +398,7 @@ Status ParserGraphOptimizer::RebuildOutputAnchors(vector & return PARAM_INVALID); int32_t dtype = iter->second; - output_list.push_back((int64_t)dtype); + output_list.push_back(static_cast(dtype)); GELOGI("FUNCDEF: output_list push_back %d.", dtype); } GE_IF_BOOL_EXEC(!output_list.empty(), (void)AttrUtils::SetListInt(fusion_op_desc, ge::T_OUT_DATATYPE, output_list)); @@ -424,7 +425,8 @@ Status ParserGraphOptimizer::RebuildInputAnchors(vector &in return FAILED; } ge::DataType data_type = tensorDescPtr->GetDataType(); - const std::map::const_iterator iter = GE_TENSORFLOW_DATA_TYPE_MAP.find((int32_t)data_type); + const std::map::const_iterator iter = + GE_TENSORFLOW_DATA_TYPE_MAP.find(static_cast(data_type)); GE_IF_BOOL_EXEC( iter == GE_TENSORFLOW_DATA_TYPE_MAP.end(), REPORT_INNER_ERROR("E19999", "datatype:%d of input:%d in node:%s:%s is not supported", @@ -433,7 +435,7 @@ Status ParserGraphOptimizer::RebuildInputAnchors(vector &in return PARAM_INVALID); int32_t dtype = iter->second; - input_list.push_back((int64_t)dtype); + input_list.push_back(static_cast(dtype)); GELOGI("FUNCDEF: input_list push_back %d.", dtype); } GE_IF_BOOL_EXEC(!input_list.empty(), (void)AttrUtils::SetListInt(fusion_op_desc, ge::T_IN_DATATYPE, input_list));