From 0380cf64eebf6416a91c38bc8403494f853898a8 Mon Sep 17 00:00:00 2001 From: zhao-lupeng Date: Fri, 13 May 2022 10:40:58 +0800 Subject: [PATCH] fix misra --- 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/tensorflow/graph_functiondef.cc | 4 ++-- parser/tensorflow/graph_optimizer.cc | 10 ++++++---- 6 files changed, 17 insertions(+), 15 deletions(-) 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/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));