From fcc83262e4b8a4d9c83ba9f43a57c5e66192e1e4 Mon Sep 17 00:00:00 2001
From: y00500818 <yangyongqiang7@hisilicon.com>
Date: Tue, 9 Feb 2021 11:30:50 +0800
Subject: [PATCH] skip matmulv2 update format in onnx parser

---
 parser/onnx/onnx_parser.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/parser/onnx/onnx_parser.cc b/parser/onnx/onnx_parser.cc
index 899626f..742b419 100644
--- a/parser/onnx/onnx_parser.cc
+++ b/parser/onnx/onnx_parser.cc
@@ -143,9 +143,11 @@ graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size,
 
 namespace ge {
 namespace {
-std::map<std::string, std::string> kOnnxOpMap = {
+const std::map<std::string, std::string> kOnnxOpMap = {
     {ge::kOpTypeInput, ge::parser::DATA}, {ge::kOpTypeConstant, ge::parser::CONSTANT},
 };
+const char* const MATMULV2 = "MatMulV2";
+const std::vector<std::string> kNoNeedUpdateFormat = {MATMULV2};
 }
 
 Status OnnxModelParser::ParseInput(ge::onnx::GraphProto &onnx_graph,
@@ -419,6 +421,11 @@ void OnnxModelParser::UpdateFormat(ge::Graph &graph) {
     ge::Operator op;
     graph.FindOpByName(name, op);
     auto op_dsc = ge::OpDescUtils::GetOpDescFromOperator(op);
+    if (std::find(kNoNeedUpdateFormat.begin(), kNoNeedUpdateFormat.end(), op_dsc->GetType())
+        != kNoNeedUpdateFormat.end()) {
+      GELOGW("Op %s:%s no need update format.", op_dsc->GetName().c_str(), op_dsc->GetType().c_str());
+      continue;
+    }
     auto input_size = op_dsc->GetAllInputsSize();
     for (size_t i = 0; i < input_size; i++) {
       auto input = op_dsc->MutableInputDesc(static_cast<uint32_t>(i));