diff --git a/parser/tensorflow/tensorflow_op_parser.h b/parser/tensorflow/tensorflow_op_parser.h index 2fc991d..a0c3828 100644 --- a/parser/tensorflow/tensorflow_op_parser.h +++ b/parser/tensorflow/tensorflow_op_parser.h @@ -42,7 +42,6 @@ #include "proto/tensorflow/graph.pb.h" #include "proto/tensorflow/node_def.pb.h" - using domi::tensorflow::NodeDef; using domi::tensorflow::TensorProto; using google::protobuf::int32; diff --git a/parser/tensorflow/tensorflow_parser.cc b/parser/tensorflow/tensorflow_parser.cc index 170b58d..2167dbf 100644 --- a/parser/tensorflow/tensorflow_parser.cc +++ b/parser/tensorflow/tensorflow_parser.cc @@ -923,7 +923,7 @@ Status TensorFlowModelParser::ParseNodeDef(TensorFlowModelParser *parser, ge::Co std::map::const_iterator iterator = parser->adaptedOpTypeMap_.find(node_name); GE_CHK_BOOL_TRUE_EXEC_WITH_LOG( - iterator == parser->adaptedOpTypeMap_.end(), + iterator == parser->adaptedOpTypeMap_.cend(), REPORT_INNER_ERROR("E19999", "get adapted op type failed, node name = %s", node_name.c_str()); return FAILED, "get adapted op type failed, node name = %s", node_name.c_str()); @@ -1267,7 +1267,7 @@ Status TensorFlowModelParser::ParseFromMemory(const char *data, uint32_t size, g return INTERNAL_ERROR; } const string &node_op = node_def->op(); - GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((tensorflow_op_map.find(node_op) == tensorflow_op_map.end()), DeleteFuisonNodeDef(); + GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((tensorflow_op_map.find(node_op) == tensorflow_op_map.cend()), DeleteFuisonNodeDef(); REPORT_INNER_ERROR("E19999", "Op type %s unsupport", node_op.c_str()); return INTERNAL_ERROR, "Unsupport op type %s", node_op.c_str()); @@ -1413,7 +1413,8 @@ Status TensorFlowModelParser::ParseAllGraph(const google::protobuf::Message *pro GE_CHECK_NOTNULL(proto); GE_CHECK_NOTNULL(graph); - const domi::tensorflow::GraphDef *ori_graph = reinterpret_cast(proto); + const domi::tensorflow::GraphDef *ori_graph = + ge::PtrToPtr(proto); // Make a copy for operation without modifying the original graph def. domi::tensorflow::GraphDef graph_def = *ori_graph; @@ -2071,10 +2072,10 @@ Status TensorFlowModelParser::NormalizeInputOrOutputMap( std::set compare_set; for (auto &pair : pairs) { - bool is_fusion_child = (fusion_op_children_.find(node_name) != fusion_op_children_.end()) || - (fusion_op_children_.find(iter->first) != fusion_op_children_.end()); - bool is_fusion_op = (fusion_op_type_map_.find(node_name) != fusion_op_type_map_.end()) || - (fusion_op_type_map_.find(iter->first) != fusion_op_type_map_.end()); + bool is_fusion_child = (fusion_op_children_.find(node_name) != fusion_op_children_.cend()) || + (fusion_op_children_.find(iter->first) != fusion_op_children_.cend()); + bool is_fusion_op = (fusion_op_type_map_.find(node_name) != fusion_op_type_map_.cend()) || + (fusion_op_type_map_.find(iter->first) != fusion_op_type_map_.cend()); if (((pair.first == ge::kFusionDisableIndex) || (pair.second == ge::kFusionDisableIndex)) && (is_fusion_child || is_fusion_op)) { // The edge will be cut off at the back, ignoring @@ -2191,7 +2192,8 @@ Status TensorFlowModelParser::ParseProto(const google::protobuf::Message *proto, GE_CHECK_NOTNULL(graph); ge::GetParserContext().train_flag = true; - const domi::tensorflow::GraphDef *graph_def_in = reinterpret_cast(proto); + const domi::tensorflow::GraphDef *graph_def_in = + ge::PtrToPtr(proto); // Make a copy for operation without modifying the original graph def. domi::tensorflow::GraphDef graph_def_operation = *graph_def_in; domi::tensorflow::GraphDef *graph_def = &graph_def_operation; @@ -2447,7 +2449,7 @@ Status TensorFlowModelParser::OptimizeIdentityByOutput(map &n const std::map::const_iterator node_def_iter = nodedef_map.find(curr_node_name); GE_CHK_BOOL_TRUE_EXEC_WITH_LOG( - (node_def_iter == nodedef_map.end()), + (node_def_iter == nodedef_map.cend()), REPORT_INNER_ERROR("E19999", "Node:%s can't find in nodedef_map, check invalid", curr_node_name.c_str()); return INTERNAL_ERROR, "Can't find nodedef"); domi::tensorflow::NodeDef *curr_node_def = node_def_iter->second; @@ -2455,7 +2457,7 @@ Status TensorFlowModelParser::OptimizeIdentityByOutput(map &n bool has_out_retval = false; // For the identity operator whose output is "_retval", optimize it std::map>> output_map = op_node_context.output_map; - for (auto output_iter = output_map.begin(); output_iter != output_map.end(); ++output_iter) { + for (auto output_iter = output_map.cbegin(); output_iter != output_map.cend(); ++output_iter) { const string &output_node_name = output_iter->first; domi::tensorflow::NodeDef *output_node_def = nodedef_map[output_node_name]; GE_CHECK_NOTNULL(output_node_def); @@ -3429,7 +3431,7 @@ Status TensorFlowModelParser::AddControlEdgeAfterRemoveInputs(domi::tensorflow:: */ Status TensorFlowModelParser::RemoveInputs(domi::tensorflow::GraphDef *graph_def, domi::tensorflow::NodeDef *node_def, const set &remove_index_set, - const map &all_node_map) { + const map &all_node_map) const { GE_CHECK_NOTNULL(node_def); if (remove_index_set.empty()) { GELOGI("The size of remove_index_set is zero."); @@ -3716,7 +3718,7 @@ void TensorFlowModelParser::UpdateInnerInputMap(const string &fusion_op_name, Op ++iter; } } - op_node_context.input_map.insert(tmp_input_map.begin(), tmp_input_map.end()); + op_node_context.input_map.insert(tmp_input_map.cbegin(), tmp_input_map.cend()); // update output map of pre node for (const auto &in_iter : op_node_context.input_map) { auto src_iter = op_node_context_map_.find(in_iter.first); @@ -3765,7 +3767,7 @@ void TensorFlowModelParser::UpdateInnerOutputMap(const string &fusion_op_name, O ++iter; } } - op_node_context.output_map.insert(tmp_output_map.begin(), tmp_output_map.end()); + op_node_context.output_map.insert(tmp_output_map.cbegin(), tmp_output_map.cend()); // update input map of pre node for (const auto &out_iter : op_node_context.output_map) { auto dst_iter = op_node_context_map_.find(out_iter.first); diff --git a/parser/tensorflow/tensorflow_parser.h b/parser/tensorflow/tensorflow_parser.h index a7a0ae6..2c9e1b0 100644 --- a/parser/tensorflow/tensorflow_parser.h +++ b/parser/tensorflow/tensorflow_parser.h @@ -556,7 +556,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowModelParser : public domi::ModelParser { Status RemoveInputs(domi::tensorflow::GraphDef *graph_def, domi::tensorflow::NodeDef *node_def, const set &remove_index_set, - const map &all_node_map); + const map &all_node_map) const; Status AddControlEdgeAfterRemoveInputs(domi::tensorflow::GraphDef *graph_def, domi::tensorflow::NodeDef *node_def, diff --git a/parser/tensorflow/tensorflow_util.h b/parser/tensorflow/tensorflow_util.h index 78131bd..49a41f8 100644 --- a/parser/tensorflow/tensorflow_util.h +++ b/parser/tensorflow/tensorflow_util.h @@ -18,14 +18,11 @@ #define OMG_PARSER_TENSORFLOW_TENSORFLOW_UTIL_H_ #include -#include #include #include -#include #include "parser/common/op_def/operator.h" #include "external/graph/attr_value.h" #include "external/graph/graph.h" -#include "external/graph/operator.h" #include "framework/omg/parser/parser_types.h" #include "framework/omg/omg_inner_types.h" #include "graph/compute_graph.h" diff --git a/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc b/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc index 919d4d3..b0fffe0 100644 --- a/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc +++ b/parser/tensorflow/tensorflow_var_is_initialized_op_parser.cc @@ -25,7 +25,7 @@ using namespace ge::parser; namespace ge { Status ParseParams(const Message *op_src, VarIsInitializedOpOperator *const op) { GE_CHECK_NOTNULL(op_src); - const NodeDef *node = reinterpret_cast(op_src); + const NodeDef *node = ge::PtrToPtr(op_src); GE_CHECK_NOTNULL(node); GELOGD("TF op node name = %s, op type= %s, parse params", node->name().c_str(), node->op().c_str()); op->Name(node->name()); diff --git a/parser/tensorflow/tensorflow_variable_v2_parser.cc b/parser/tensorflow/tensorflow_variable_v2_parser.cc index caf720f..a6375a7 100644 --- a/parser/tensorflow/tensorflow_variable_v2_parser.cc +++ b/parser/tensorflow/tensorflow_variable_v2_parser.cc @@ -19,7 +19,6 @@ #include "graph/ge_attr_value.h" #include "graph/ge_tensor.h" #include "graph/op_desc.h" -#include "graph/operator.h" #include "graph/utils/attr_utils.h" #include "graph/utils/tensor_utils.h" #include "parser/common/op_def/variable_op.h" @@ -253,7 +252,7 @@ static void ParseMemType(const domi::tensorflow::NodeDef *node, VariableOperator Status ParseParams(const Message *op_src, VariableOperator *op) { GE_CHECK_NOTNULL(op_src); - const NodeDef *node = reinterpret_cast(op_src); + const NodeDef *node = ge::PtrToPtr(op_src); GE_CHECK_NOTNULL(node); GELOGD("TF op node name = %s, op type= %s, parse params", node->name().c_str(), node->op().c_str()); string node_op = node->op();