update submodule

metadef

@@ -1 +1 @@
-Subproject commit 35de9facd31448995922246c5d2ffaa5a726bbb1
+Subproject commit 3c1c28b3f0f31404933cfc1bd3cad28618b09317

parser/onnx/onnx_parser.cc

@@ -616,19 +616,11 @@ Status OnnxModelParser::ParseAllNodeProto(ge::onnx::GraphProto &onnx_graph, ge::
     if (status != SUCCESS) {
       GELOGE(status, "[Adapt][OpType] Adapter op type for ori type %s failed.", ori_type.c_str());
       REPORT_CALL_ERROR("E19999", "Adapter op type for ori type %s failed.", ori_type.c_str());
+<<<<<<< HEAD
       has_error = true;
-      continue;
-    }
-    node_proto->set_op_type(ori_type);
-
-    GELOGI("Trans original type:%s to op type:%s", ori_type.c_str(), op_type.c_str());
-
-    ge::Operator op;
-    status = TransNodeToOperator(node_proto, op, op_type);
+=======
+      status_flag_save = status;
     if (status != SUCCESS) {
-      GELOGE(status, "[Trans][Node] Trans node to operator for %s:%s failed.", node_name.c_str(), op_type.c_str());
-      REPORT_CALL_ERROR("E19999", "Trans node to operator for %s:%s failed.", node_name.c_str(), op_type.c_str());
-      has_error = true;
       continue;
     }
 
@@ -652,22 +644,33 @@ Status OnnxModelParser::ParseAllNodeProto(ge::onnx::GraphProto &onnx_graph, ge::
     if (graph_status != ge::GRAPH_SUCCESS) {
       GELOGE(FAILED, "[Add][Op] Add op:%s to graph failed.", ParserUtils::GetOperatorName(op).c_str());
       REPORT_CALL_ERROR("E19999", "Add op:%s to graph failed.", ParserUtils::GetOperatorName(op).c_str());
+<<<<<<< HEAD
       has_error = true;
+=======
+      status_flag_save = status;
+>>>>>>> 4bc5a32187efbdc87960a8ca4cd444ac130002bb
       continue;
     }
     name_operator_[ParserUtils::GetOperatorName(op)] = op;
-
     // 8. Construct input output relation of every node
-    status = ConstructInputOutputContext(node_proto);
-    if (status != SUCCESS) {
-      REPORT_INNER_ERROR("E19999", "ConstructInputOutputContext failed.");
       GELOGE(status, "[Construct][RelationMap] to input and output failed.");
+<<<<<<< HEAD
       has_error = true;
       continue;
     }
   }
   GELOGI("Parse all node proto end.");
   return has_error ? FAILED : SUCCESS;
+=======
+      status_flag_save = status;
+      continue;
+    }
+  }
+  if (status_flag_save == SUCCESS) {
+    GELOGI("Parse all node proto success.");
+  }
+  return status_flag_save;
+>>>>>>> 4bc5a32187efbdc87960a8ca4cd444ac130002bb
 }
 
 Status OnnxModelParser::GetGraphInputs(ge::onnx::GraphProto &onnx_graph, std::vector<ge::Operator> &input_ops) {