From e96c5f8984f50764f5a87092aea4c4fdbe858a4d Mon Sep 17 00:00:00 2001 From: lzl Date: Fri, 18 Feb 2022 14:45:17 +0800 Subject: [PATCH] misra --- parser/caffe/caffe_op_parser.cc | 11 ++++++----- parser/caffe/caffe_parser.cc | 13 +++++++------ parser/caffe/caffe_reshape_parser.cc | 2 +- parser/common/acl_graph_parser_util.cc | 6 +++--- parser/common/data_op_parser.h | 4 ++-- parser/common/op_def/ir_pb_converter.cc | 2 +- parser/common/pass_manager.h | 2 +- parser/onnx/onnx_constant_parser.cc | 2 +- parser/onnx/onnx_constant_parser.h | 2 +- parser/onnx/onnx_parser.h | 6 +++--- parser/onnx/subgraph_adapter/if_subgraph_adapter.h | 2 +- parser/tensorflow/graph_functiondef.h | 2 +- parser/tensorflow/graph_optimizer.cc | 6 +++--- .../tensorflow_auto_mapping_parser_adapter.cc | 2 +- parser/tensorflow/tensorflow_fusion_op_parser.h | 2 +- parser/tensorflow/tensorflow_parser.cc | 5 +++-- parser/tensorflow/tensorflow_parser.h | 2 +- parser/tensorflow/tensorflow_reshape_parser.h | 2 +- parser/tensorflow/tensorflow_squeeze_parser.h | 2 +- 19 files changed, 39 insertions(+), 36 deletions(-) diff --git a/parser/caffe/caffe_op_parser.cc b/parser/caffe/caffe_op_parser.cc index 820a122..f2e6612 100644 --- a/parser/caffe/caffe_op_parser.cc +++ b/parser/caffe/caffe_op_parser.cc @@ -19,6 +19,7 @@ #include "parser/common/op_parser_factory.h" #include "common/util/error_manager/error_manager.h" #include "framework/omg/parser/parser_types.h" +#include "graph/def_types.h" using namespace ge::parser; using domi::caffe::BlobProto; @@ -107,7 +108,7 @@ Status CaffeOpParser::ParseWeightType(const BlobProto &proto, const ge::GeShape for (int i = 0; i < size; ++i) { buf[i] = proto.double_data(i); } - GE_IF_BOOL_EXEC(weight->SetData(reinterpret_cast(buf.get()), size * sizeof(float)) != ge::GRAPH_SUCCESS, + GE_IF_BOOL_EXEC(weight->SetData(PtrToPtr(buf.get()), size * sizeof(float)) != ge::GRAPH_SUCCESS, GELOGW("SetData failed for GeTensor.");); // no need to return } else if (proto.int8_data().length() > 0) { if (size != static_cast(proto.int8_data().length())) { @@ -121,7 +122,7 @@ Status CaffeOpParser::ParseWeightType(const BlobProto &proto, const ge::GeShape const char *data_ptr = proto.int8_data().data(); GE_CHECK_NOTNULL(data_ptr); GE_IF_BOOL_EXEC( - weight->SetData(reinterpret_cast(data_ptr), size * sizeof(int8_t)) != ge::GRAPH_SUCCESS, + weight->SetData(PtrToPtr(data_ptr), size * sizeof(int8_t)) != ge::GRAPH_SUCCESS, GELOGW("SetData failed for GeTensor.");); // no need to return dtype = ge::DT_INT8; } else if (proto.int32_data_size() > 0) { @@ -139,7 +140,7 @@ Status CaffeOpParser::ParseWeightType(const BlobProto &proto, const ge::GeShape int32_weight_buf[i] = proto.int32_data(i); } GE_IF_BOOL_EXEC( - weight->SetData(reinterpret_cast(int32_weight_buf.get()), size * sizeof(int32_t)) != ge::GRAPH_SUCCESS, + weight->SetData(PtrToPtr(int32_weight_buf.get()), size * sizeof(int32_t)) != ge::GRAPH_SUCCESS, GELOGW("SetData failed for GeTensor.");); // no need to return dtype = ge::DT_INT32; } else if (proto.uint64_data_size() > 0) { @@ -156,7 +157,7 @@ Status CaffeOpParser::ParseWeightType(const BlobProto &proto, const ge::GeShape for (int i = 0; i < size; ++i) { uint64_weight_buf[i] = proto.uint64_data(i); } - GE_IF_BOOL_EXEC(weight->SetData(reinterpret_cast(uint64_weight_buf.get()), size * sizeof(uint64_t)) != + GE_IF_BOOL_EXEC(weight->SetData(PtrToPtr(uint64_weight_buf.get()), size * sizeof(uint64_t)) != ge::GRAPH_SUCCESS, GELOGW("SetData failed for GeTensor.");); // no need to return dtype = ge::DT_UINT64; @@ -173,7 +174,7 @@ Status CaffeOpParser::ParseWeightType(const BlobProto &proto, const ge::GeShape const float *data_ptr = proto.data().data(); GE_CHECK_NOTNULL(data_ptr); GE_IF_BOOL_EXEC( - weight->SetData(reinterpret_cast(data_ptr), size * sizeof(float)) != ge::GRAPH_SUCCESS, + weight->SetData(PtrToPtr(data_ptr), size * sizeof(float)) != ge::GRAPH_SUCCESS, GELOGW("SetData failed for GeTensor.");); // no need to return } ge::GeTensorDesc weight_desc = ge::GeTensorDesc(); diff --git a/parser/caffe/caffe_parser.cc b/parser/caffe/caffe_parser.cc index f29ef45..df2c791 100644 --- a/parser/caffe/caffe_parser.cc +++ b/parser/caffe/caffe_parser.cc @@ -1920,7 +1920,7 @@ Status CaffeWeightsParser::ParseLayerField(const google::protobuf::Reflection *r const google::protobuf::FieldDescriptor *field, google::protobuf::Message *layer) { GELOGD("Start to parse field: %s.", field->name().c_str()); - domi::caffe::LayerParameter *layer_proto = reinterpret_cast(layer); + domi::caffe::LayerParameter *layer_proto = PtrToPtr(layer); string filed_name = field->name(); #define CASE_FIELD_NAME(kName, method) \ if (filed_name == kField##kName) { \ @@ -1976,7 +1976,7 @@ Status CaffeWeightsParser::ConvertBlobsProto(const google::protobuf::Message *me vector field_desc; blobs_reflection->ListFields(*message, &field_desc); - domi::caffe::BlobProto *blobs_proto = reinterpret_cast(blobs); + domi::caffe::BlobProto *blobs_proto = PtrToPtr(blobs); for (auto &field : field_desc) { GE_CHECK_NOTNULL(field); @@ -2025,7 +2025,7 @@ Status CaffeWeightsParser::ConvertBlobShapeProto(const google::protobuf::Message vector field_desc; reflection->ListFields(*message, &field_desc); - domi::caffe::BlobShape *shape_proto = reinterpret_cast(dest_message); + domi::caffe::BlobShape *shape_proto = PtrToPtr(dest_message); for (auto &field : field_desc) { if (field->name() != kFieldDim) { @@ -2048,7 +2048,7 @@ Status CaffeWeightsParser::ConvertConvParamProto(const google::protobuf::Message reflection->ListFields(*message, &field_desc); domi::caffe::ConvolutionParameter *conv_param_proto = - reinterpret_cast(dest_message); + PtrToPtr(dest_message); for (auto &field : field_desc) { if (field->name() != kFieldBiasTerm) { @@ -2068,7 +2068,7 @@ Status CaffeWeightsParser::ConvertInnerProdcutProto(const google::protobuf::Mess reflection->ListFields(*message, &field_desc); domi::caffe::InnerProductParameter *inner_product_proto = - reinterpret_cast(dest_message); + PtrToPtr(dest_message); for (auto &field : field_desc) { if (field->name() != kFieldBiasTerm) { @@ -2125,7 +2125,8 @@ Status CaffeWeightsParser::CheckLayersSize(const google::protobuf::Message *mess Status CaffeWeightsParser::ConvertLayerParameter(const google::protobuf::Message *layer_message, ge::ComputeGraphPtr &graph) { vector need_share_layers; - const domi::caffe::LayerParameter *layer = reinterpret_cast(layer_message); + const domi::caffe::LayerParameter *layer = + PtrToPtr(layer_message); const string &shared_layer_name = layer->name(); const string &layer_type = layer->type(); for (auto p_iter = params_share_map.begin(); p_iter != params_share_map.end(); ++p_iter) { diff --git a/parser/caffe/caffe_reshape_parser.cc b/parser/caffe/caffe_reshape_parser.cc index 15b5be0..7175b09 100644 --- a/parser/caffe/caffe_reshape_parser.cc +++ b/parser/caffe/caffe_reshape_parser.cc @@ -128,7 +128,7 @@ Status CaffeReshapeParser::AddConstInput(ge::NodePtr &node) { data[i] = attr_shape[i]; } GE_IF_BOOL_EXEC( - constTensor->SetData(reinterpret_cast(data.get()), dims_size * sizeof(int64_t)) != ge::GRAPH_SUCCESS, + constTensor->SetData(PtrToPtr(data.get()), dims_size * sizeof(int64_t)) != ge::GRAPH_SUCCESS, GELOGW("SetData failed for GeTensor.");); // no need to return // construct const node and add edge diff --git a/parser/common/acl_graph_parser_util.cc b/parser/common/acl_graph_parser_util.cc index e1ca2ae..2595cc0 100644 --- a/parser/common/acl_graph_parser_util.cc +++ b/parser/common/acl_graph_parser_util.cc @@ -820,7 +820,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadProtoFromArray(const v "or size is 0, check invalid"); return false, "[Check][Param]incorrect parameter. proto is nullptr || data is nullptr || size is 0"); - google::protobuf::io::CodedInputStream coded_stream(reinterpret_cast(const_cast(data)), size); + google::protobuf::io::CodedInputStream coded_stream(PtrToPtr(const_cast(data)), size); return ReadProtoFromCodedInputStream(coded_stream, proto); } @@ -901,7 +901,7 @@ Status GetOriginalType(const ge::NodePtr &node, string &type) { return SUCCESS; } -FMK_FUNC_HOST_VISIBILITY bool ValidateStr(const std::string &str, const std::string &mode) { +FMK_FUNC_HOST_VISIBILITY bool ValidateStr(const std::string &filePath, const std::string &mode) { char ebuff[kMaxBuffSize]; regex_t reg; int cflags = REG_EXTENDED | REG_NOSUB; @@ -913,7 +913,7 @@ FMK_FUNC_HOST_VISIBILITY bool ValidateStr(const std::string &str, const std::str return true; } - ret = regexec(®, str.c_str(), 0, nullptr, 0); + ret = regexec(®, filePath.c_str(), 0, nullptr, 0); if (ret) { regerror(ret, ®, ebuff, kMaxBuffSize); GELOGE(ge::PARAM_INVALID, "[Invoke][RegExec] failed, reason: %s", ebuff); diff --git a/parser/common/data_op_parser.h b/parser/common/data_op_parser.h index 0f2f2fe..da2f15a 100644 --- a/parser/common/data_op_parser.h +++ b/parser/common/data_op_parser.h @@ -60,7 +60,7 @@ class DataOpParser { * @param [in] 4D shape information (dimensions) * @param [out] Save converted shap information */ - static Status Init5DInputTensor(const std::vector &shape, ge::GeTensorDesc &tensorDesc); + static Status Init5DInputTensor(const std::vector &shape, ge::GeTensorDesc &tensor_desc); /** * @ingroup domi_omg @@ -98,7 +98,7 @@ class DataOpParser { * @return SUCCESS Convert success * @return FAILED Convert failed */ - static Status InitNDTensor(const std::vector &shape, ge::DataType data_type, ge::GeTensorDesc &desc); + static Status InitNDTensor(const std::vector &shape, ge::DataType data_type, ge::GeTensorDesc &tensor_desc); }; } // namespace ge diff --git a/parser/common/op_def/ir_pb_converter.cc b/parser/common/op_def/ir_pb_converter.cc index 9c39d26..d4849c8 100644 --- a/parser/common/op_def/ir_pb_converter.cc +++ b/parser/common/op_def/ir_pb_converter.cc @@ -114,7 +114,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY domi::Status ConvertToOpDesc(co if (op_attr_pair.second.value_.value_case() == domi::AttrDef::kBt) { auto &buffer = op_attr_pair.second.value_.bt(); (void)ge::AttrUtils::SetZeroCopyBytes(op_def, op_attr_pair.first, - ge::Buffer::CopyFrom(reinterpret_cast(const_cast(buffer.data())), buffer.size())); + ge::Buffer::CopyFrom(PtrToPtr(const_cast(buffer.data())), buffer.size())); } if (op_attr_pair.second.value_.value_case() == domi::AttrDef::kS) { diff --git a/parser/common/pass_manager.h b/parser/common/pass_manager.h index 5befe03..46ecb5a 100644 --- a/parser/common/pass_manager.h +++ b/parser/common/pass_manager.h @@ -62,7 +62,7 @@ public: /// @return others optimized failed /// @author /// - static Status Run(const ge::ComputeGraphPtr &graph, std::vector> &passes); + static Status Run(const ge::ComputeGraphPtr &graph, std::vector> &names_to_passes); ~PassManager(); diff --git a/parser/onnx/onnx_constant_parser.cc b/parser/onnx/onnx_constant_parser.cc index 56e43a7..8666822 100644 --- a/parser/onnx/onnx_constant_parser.cc +++ b/parser/onnx/onnx_constant_parser.cc @@ -91,7 +91,7 @@ Status OnnxConstantParser::ParseConvertData(const ge::onnx::TensorProto &tensor_ if (data_type == OnnxDataType::STRING) { tensor.SetData(tensor_proto.raw_data().c_str()); } else { - tensor.SetData(reinterpret_cast(tensor_proto.raw_data().c_str()), + tensor.SetData(PtrToPtr(tensor_proto.raw_data().c_str()), tensor_proto.raw_data().size()); } GELOGD("Raw data size is : %zu", tensor_proto.raw_data().size()); diff --git a/parser/onnx/onnx_constant_parser.h b/parser/onnx/onnx_constant_parser.h index 6ad4468..0178787 100644 --- a/parser/onnx/onnx_constant_parser.h +++ b/parser/onnx/onnx_constant_parser.h @@ -65,7 +65,7 @@ class PARSER_FUNC_VISIBILITY OnnxConstantParser : public OnnxOpParser { *(addr_trans.get() + i) = static_cast( std::fabs(*((addr).get() + i)) > std::numeric_limits::epsilon()); } - (tensor).SetData(reinterpret_cast(addr_trans.get()), (count) * sizeof(bool)); + (tensor).SetData(PtrToPtr(addr_trans.get()), (count) * sizeof(bool)); break; } #define CASE_SET_DATA(dt_type, value_type, addr, count, tensor) \ diff --git a/parser/onnx/onnx_parser.h b/parser/onnx/onnx_parser.h index acec764..899a8d0 100644 --- a/parser/onnx/onnx_parser.h +++ b/parser/onnx/onnx_parser.h @@ -96,7 +96,7 @@ class PARSER_FUNC_VISIBILITY OnnxModelParser : public domi::ModelParser { Status ConstructOriType(const ge::onnx::NodeProto *node_proto, std::string &ori_type); - Status AdapterOpType(const ge::onnx::NodeProto *node_proto, std::string &ori_type, std::string &om_type); + Status AdapterOpType(const ge::onnx::NodeProto *node_proto, std::string &ori_type, std::string &op_type); Status TransNodeToOperator(const ge::onnx::NodeProto *node_proto, ge::Operator &op, const string &op_type) const; @@ -106,7 +106,7 @@ class PARSER_FUNC_VISIBILITY OnnxModelParser : public domi::ModelParser { Status GetGraphInputs(ge::onnx::GraphProto &onnx_graph, std::vector &input_ops); - Status GetGraphOutputs(std::vector>> &outputs, + Status GetGraphOutputs(std::vector>> &output_ops, ParserUtils::OutputMapping &out_tensor_to_nodes); Status Prechecker(ge::onnx::GraphProto &onnx_graph); @@ -115,7 +115,7 @@ class PARSER_FUNC_VISIBILITY OnnxModelParser : public domi::ModelParser { Status GetModelFromMemory(const char *data, uint32_t size, ge::onnx::ModelProto &onnx_model) const; - Status ModelParseToGraph(const ge::onnx::ModelProto &onnx_model, ge::Graph &graph); + Status ModelParseToGraph(const ge::onnx::ModelProto &onnx_model, ge::Graph &root_graph); Status ModelParseToGraphImpl(bool is_subgraph, ge::onnx::GraphProto &onnx_graph, ge::Graph &graph); diff --git a/parser/onnx/subgraph_adapter/if_subgraph_adapter.h b/parser/onnx/subgraph_adapter/if_subgraph_adapter.h index 2723a86..9b6f1e5 100644 --- a/parser/onnx/subgraph_adapter/if_subgraph_adapter.h +++ b/parser/onnx/subgraph_adapter/if_subgraph_adapter.h @@ -24,7 +24,7 @@ namespace ge { class PARSER_FUNC_VISIBILITY IfSubgraphAdapter : public SubgraphAdapter { public: - domi::Status AdaptAndFindAllSubgraphs(ge::onnx::NodeProto *parent_op, + domi::Status AdaptAndFindAllSubgraphs(ge::onnx::NodeProto *parent_node, std::vector &onnx_graphs, std::map &name_to_onnx_graph) override; diff --git a/parser/tensorflow/graph_functiondef.h b/parser/tensorflow/graph_functiondef.h index 4f3a505..ae27885 100644 --- a/parser/tensorflow/graph_functiondef.h +++ b/parser/tensorflow/graph_functiondef.h @@ -52,7 +52,7 @@ class GraphToFunctionDef { const string &name, FunctionDef *fdef); static domi::Status BuildFunctionDef(ge::ComputeGraphPtr &graph, - const string &nme_in, + const string &name_in, FunctionDefLibrary *library, NodeDef *call_node_def, vector &in_anchor, diff --git a/parser/tensorflow/graph_optimizer.cc b/parser/tensorflow/graph_optimizer.cc index 95d9189..e68190f 100644 --- a/parser/tensorflow/graph_optimizer.cc +++ b/parser/tensorflow/graph_optimizer.cc @@ -178,7 +178,7 @@ Status CollectNodeFuncs(vector &nodes, FunctionDefLibrary *library) GE_IF_BOOL_EXEC( AttrUtils::GetBytes(opDef, ge::ATTR_NAME_FRAMEWORK_FUNC_DEF, funcDefBytes), FunctionDefLibrary funcLib; GE_CHECK_NOTNULL(funcDefBytes.GetData()); - string str(reinterpret_cast(funcDefBytes.GetData()), funcDefBytes.GetSize()); + string str(PtrToPtr(funcDefBytes.GetData()), funcDefBytes.GetSize()); GELOGI("FUNCDEF: Get function -> %s.", str.c_str()); GE_IF_BOOL_EXEC( funcLib.ParseFromArray(funcDefBytes.GetData(), funcDefBytes.GetSize()), library->MergeFrom(funcLib))); } @@ -250,10 +250,10 @@ Status ParserGraphOptimizer::UpdateGraph(vector &nodes) { (void)AttrUtils::SetZeroCopyBytes( fusion_node_opdef, ge::ATTR_NAME_FRAMEWORK_FUNC_DEF, - Buffer::CopyFrom(reinterpret_cast(funcdefStr.data()), funcdefStr.length())); + Buffer::CopyFrom(PtrToPtr(funcdefStr.data()), funcdefStr.length())); (void)AttrUtils::SetZeroCopyBytes( fusion_node_opdef, ge::ATTR_NAME_FRAMEWORK_NODE_DEF, - Buffer::CopyFrom(reinterpret_cast(nodefStr.data()), nodefStr.length())); + Buffer::CopyFrom(PtrToPtr(nodefStr.data()), nodefStr.length())); (void)AttrUtils::SetInt(fusion_node_opdef, ge::ATTR_NAME_FRAMEWORK_FWK_TYPE, ge::GetParserContext().type); diff --git a/parser/tensorflow/tensorflow_auto_mapping_parser_adapter.cc b/parser/tensorflow/tensorflow_auto_mapping_parser_adapter.cc index cd11bf4..bc50850 100644 --- a/parser/tensorflow/tensorflow_auto_mapping_parser_adapter.cc +++ b/parser/tensorflow/tensorflow_auto_mapping_parser_adapter.cc @@ -130,7 +130,7 @@ Status TensorFlowAutoMappingParserAdapter::ParseParams(const Message *op_src, ge (void)AttrUtils::SetZeroCopyBytes( op_dest, ge::ATTR_NAME_FRAMEWORK_NODE_DEF, - Buffer::CopyFrom(reinterpret_cast(serialized_node.data()), serialized_node.length())); + Buffer::CopyFrom(PtrToPtr(serialized_node.data()), serialized_node.length())); GELOGI("node_def of %s is %s.", op_dest->GetName().c_str(), serialized_node.c_str()); } diff --git a/parser/tensorflow/tensorflow_fusion_op_parser.h b/parser/tensorflow/tensorflow_fusion_op_parser.h index 3aed4b2..68d1425 100644 --- a/parser/tensorflow/tensorflow_fusion_op_parser.h +++ b/parser/tensorflow/tensorflow_fusion_op_parser.h @@ -44,7 +44,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowFusionOpParser : public TensorFlowOpParse * @return SUCCESS Parsing success * @return FAILED Parsing failed */ - virtual Status ParseParams(const std::vector &v_input_const, ge::NodePtr &node) const; + virtual Status ParseParams(const std::vector &v_input_const, ge::NodePtr &op_dest) const; /** * @ingroup domi_omg diff --git a/parser/tensorflow/tensorflow_parser.cc b/parser/tensorflow/tensorflow_parser.cc index 81dc181..e42b841 100644 --- a/parser/tensorflow/tensorflow_parser.cc +++ b/parser/tensorflow/tensorflow_parser.cc @@ -54,6 +54,7 @@ #include "register/register_utils.h" #include "register/scope/scope_pass_registry_impl.h" #include "parser/common/auto_mapping_subgraph_io_index_func.h" +#include "graph/def_types.h" using ge::OpParserFactory; using ge::Pb2Json; @@ -2415,7 +2416,7 @@ Status TensorFlowModelParser::ParseProto(const std::string &serialized_proto, ge GELOGE(FAILED, "Proto object GraphDef parse serialized proto failed"); return FAILED; } - return ParseProto(reinterpret_cast(&graph_def), graph); + return ParseProto(ge::PtrToPtr(&graph_def), graph); } Status TensorFlowModelParser::ParseProtoWithSubgraph(const std::string &root_proto, domi::GetGraphCallbackV2 callback, @@ -4059,7 +4060,7 @@ Status TensorFlowModelParser::AddExternalGraph(const ComputeGraphPtr &root_graph std::string model_data; if (AttrUtils::GetStr(node->GetOpDesc(), kExternalModel, model_data) && !model_data.empty()) { ge::Model model; - auto load_ret = ge::Model::Load(reinterpret_cast(model_data.data()), model_data.size(), model); + auto load_ret = ge::Model::Load(ge::PtrToPtr(model_data.data()), model_data.size(), model); if (load_ret != GRAPH_SUCCESS) { GELOGE(INTERNAL_ERROR, "[Parse][ExternalModel]Node:%s.", node->GetName().c_str()); REPORT_CALL_ERROR("E19999", "Failed to parse external model, node:%s.", node->GetName().c_str()); diff --git a/parser/tensorflow/tensorflow_parser.h b/parser/tensorflow/tensorflow_parser.h index 7f7124e..6b196cd 100644 --- a/parser/tensorflow/tensorflow_parser.h +++ b/parser/tensorflow/tensorflow_parser.h @@ -130,7 +130,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowModelParser : public domi::ModelParser { Status ParseProtoWithSubgraph(const google::protobuf::Message *root_proto, domi::GetGraphCallback callback, - ge::ComputeGraphPtr &graph) override; + ge::ComputeGraphPtr &root_graph) override; /* * @ingroup domi_omg diff --git a/parser/tensorflow/tensorflow_reshape_parser.h b/parser/tensorflow/tensorflow_reshape_parser.h index d0d2c3f..2d2a9bd 100644 --- a/parser/tensorflow/tensorflow_reshape_parser.h +++ b/parser/tensorflow/tensorflow_reshape_parser.h @@ -34,7 +34,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowReshapeParser : public TensorFlowOpParser * @return FAILED parse failed * @author */ - Status ParseParams(const Message *op_src, ge::OpDescPtr &op_dest) override; + Status ParseParams(const Message *op_src, ge::OpDescPtr &op) override; }; } // namespace ge diff --git a/parser/tensorflow/tensorflow_squeeze_parser.h b/parser/tensorflow/tensorflow_squeeze_parser.h index b7675b3..c2bba6f 100644 --- a/parser/tensorflow/tensorflow_squeeze_parser.h +++ b/parser/tensorflow/tensorflow_squeeze_parser.h @@ -22,7 +22,7 @@ namespace ge { class PARSER_FUNC_VISIBILITY TensorFlowSqueezeParser : public TensorFlowOpParser { public: - Status ParseParams(const Message *op_src, ge::OpDescPtr &op_dest) override; + Status ParseParams(const Message *op_src, ge::OpDescPtr &op) override; private: static Status ParseDesc(const domi::tensorflow::AttrValue &attr_value, ge::GeTensorDesc &ge_desc);