Browse Source

!463 misra告警修改

* test
pull/462/MERGE
赵鲁鹏 计晨 4 years ago
parent
commit
a3a2dfc3dd
4 changed files with 12 additions and 7 deletions
  1. +2
    -1
      parser/caffe/caffe_parser.cc
  2. +2
    -2
      parser/onnx/onnx_parser.cc
  3. +2
    -1
      parser/tensorflow/tensorflow_fusion_op_parser.cc
  4. +6
    -3
      parser/tensorflow/tensorflow_parser.cc

+ 2
- 1
parser/caffe/caffe_parser.cc View File

@@ -1591,7 +1591,8 @@ Status CaffeModelParser::Parse(const char *model_path, ge::ComputeGraphPtr &grap
return SUCCESS;
}

Status CaffeModelParser::FindShareParamLayers(const std::map<std::string, std::vector<std::string>> &layer_params_map) const {
Status CaffeModelParser::FindShareParamLayers(
const std::map<std::string, std::vector<std::string>> &layer_params_map) const {
for (auto p_iter = layer_params_map.begin(); p_iter != layer_params_map.end(); ++p_iter) {
for (auto p2_iter = p_iter; p2_iter != layer_params_map.end(); ++p2_iter) {
if (p_iter->first != p2_iter->first && p_iter->second == p2_iter->second) {


+ 2
- 2
parser/onnx/onnx_parser.cc View File

@@ -740,8 +740,8 @@ void OnnxModelParser::ClearMembers() {
outputs_map_.clear();
}

Status OnnxModelParser::AdaptAndFindAllOnnxGraph(ge::onnx::GraphProto &root_onnx_graph,
std::map<std::string, ge::onnx::GraphProto *> &name_to_onnx_graph) const {
Status OnnxModelParser::AdaptAndFindAllOnnxGraph(
ge::onnx::GraphProto &root_onnx_graph, std::map<std::string, ge::onnx::GraphProto *> &name_to_onnx_graph) const {
std::queue<ge::onnx::GraphProto *> onnx_graph_tasks;
int index = 0;
onnx_graph_tasks.push(&root_onnx_graph);


+ 2
- 1
parser/tensorflow/tensorflow_fusion_op_parser.cc View File

@@ -75,7 +75,8 @@ Status TensorFlowFusionOpParser::GetTensorFromNode(const NodeDef *node_def, Tens
return SUCCESS;
}

Status TensorFlowFusionOpParser::ParseParams(const std::vector<const NodeDef *> &v_input_const, NodePtr &op_dest) const {
Status TensorFlowFusionOpParser::ParseParams(const std::vector<const NodeDef *> &v_input_const,
NodePtr &op_dest) const {
(void)v_input_const;
(void)op_dest;
return SUCCESS;


+ 6
- 3
parser/tensorflow/tensorflow_parser.cc View File

@@ -756,7 +756,8 @@ Status TensorFlowModelParser::AddEdges(ge::ComputeGraphPtr &graph) {
}
// Find that the output of the source node is equal to the destination node
std::map<std::string, std::vector<std::pair<int32_t, int32_t>>> &dest_input_map = dest_iter->second.input_map;
std::map<std::string, std::vector<std::pair<int32_t, int32_t>>>::const_iterator input_iter = dest_input_map.find(src_op_name);
std::map<std::string, std::vector<std::pair<int32_t, int32_t>>>::const_iterator
input_iter = dest_input_map.find(src_op_name);
// Find output and input
if (input_iter == dest_input_map.end()) {
continue;
@@ -1374,7 +1375,8 @@ Status TensorFlowModelParser::Parse(const char *model_path, ge::ComputeGraphPtr
}
}

std::map<std::string, domi::tensorflow::GraphDef>::const_iterator iter = function_name_to_graphdef.find(arg.function_name);
std::map<std::string, domi::tensorflow::GraphDef>::const_iterator
iter = function_name_to_graphdef.find(arg.function_name);
if (iter == function_name_to_graphdef.end()) {
ErrorManager::GetInstance().ATCReportErrMessage("E12013", {"functionname"}, {arg.function_name});
GELOGE(FAILED, "Failed to get subgraph by function name %s", arg.function_name.c_str());
@@ -1866,7 +1868,8 @@ Status TensorFlowModelParser::UpdateAllNodeOpContext(shared_ptr<ge::ScopeGraph>
ge::ScopeFusionOpInfo info;
if (IsFusionOpChild(op_node_name, &info) && nodedef_map_[op_node_name]->op() != TENSORFLOWF_NODE_OP_CONST) {
// This node is a fusion operator
std::map<std::string, OpNodeContext>::const_iterator fusion_iter = tmp_fusion_op_node_context_map.find(info.fusion_node_name);
std::map<std::string, OpNodeContext>::const_iterator
fusion_iter = tmp_fusion_op_node_context_map.find(info.fusion_node_name);
if (fusion_iter == tmp_fusion_op_node_context_map.end()) {
OpNodeContext op_node_context;
tmp_fusion_op_node_context_map[info.fusion_node_name] = op_node_context;


Loading…
Cancel
Save