From f449bba3b61e2fe91dcc846be7dd521f698c60ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AE=81?= <lining.li@huawei.com>
Date: Mon, 5 Sep 2022 14:03:55 +0000
Subject: [PATCH] =?UTF-8?q?!657=20sync=20metadef=20Merge=20pull=20request?=
 =?UTF-8?q?=20!657=20from=20=E6=9D=8E=E5=AE=81/sync=5Fmetadef?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadef                                   | 2 +-
 tests/depends/graph/src/attr_util_stub.cc | 7 ++-----
 tests/st/CMakeLists.txt                   | 2 ++
 tests/ut/parser/CMakeLists.txt            | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/metadef b/metadef
index f5c1b6d..599fbd9 160000
--- a/metadef
+++ b/metadef
@@ -1 +1 @@
-Subproject commit f5c1b6d1b6b6e97d0cfcf2efd52ec8da12d32c86
+Subproject commit 599fbd9d7f9509b7673af90e186817b5a75ad547
diff --git a/tests/depends/graph/src/attr_util_stub.cc b/tests/depends/graph/src/attr_util_stub.cc
index a16c11b..7d822d0 100644
--- a/tests/depends/graph/src/attr_util_stub.cc
+++ b/tests/depends/graph/src/attr_util_stub.cc
@@ -135,10 +135,8 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY OpDescPtr AttrUtils::CloneOpDesc(
   if (!op_desc->impl_->output_name_idx_.empty()) {
     op_desc->impl_->output_name_idx_.clear();
   }
-  if (!op_desc->impl_->optional_input_names_.empty()) {
-    op_desc->impl_->optional_input_names_.clear();
-  }
 
+  op_desc->impl_->MutableIRMeta() = IRMetaData(op_desc->GetName());
   return op_desc;
 }
 
@@ -173,8 +171,7 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY OpDescPtr AttrUtils::CopyOpDesc(c
   }
   op_desc->impl_->input_name_idx_.insert(org_op_desc->impl_->input_name_idx_.begin(),
                                          org_op_desc->impl_->input_name_idx_.end());
-  op_desc->impl_->optional_input_names_.insert(org_op_desc->impl_->optional_input_names_.begin(),
-                                               org_op_desc->impl_->optional_input_names_.end());
+  op_desc->impl_->MutableIRMeta() = org_op_desc->impl_->GetIRMeta();
   op_desc->impl_->output_name_idx_.insert(org_op_desc->impl_->output_name_idx_.begin(),
                                           org_op_desc->impl_->output_name_idx_.end());
 
diff --git a/tests/st/CMakeLists.txt b/tests/st/CMakeLists.txt
index 580669b..1acc4ed 100644
--- a/tests/st/CMakeLists.txt
+++ b/tests/st/CMakeLists.txt
@@ -103,6 +103,8 @@ set(MATEDEF_SRC_FILES
     "${PARSER_DIR}/metadef/graph/model_serialize.cc"
     "${PARSER_DIR}/metadef/graph/node.cc"
     "${PARSER_DIR}/metadef/graph/op_desc.cc"
+    "${PARSER_DIR}/metadef/graph/ir_meta.cc"
+    "${PARSER_DIR}/metadef/graph/ir_data_type_symbol_store.cc"
     "${PARSER_DIR}/metadef/graph/operator.cc"
     "${PARSER_DIR}/metadef/graph/operator_impl.cc"
     "${PARSER_DIR}/metadef/graph/operator_factory.cc"
diff --git a/tests/ut/parser/CMakeLists.txt b/tests/ut/parser/CMakeLists.txt
index 28453d9..8b44a0a 100644
--- a/tests/ut/parser/CMakeLists.txt
+++ b/tests/ut/parser/CMakeLists.txt
@@ -106,6 +106,8 @@ set(MATEDEF_SRC_FILES
     "${PARSER_DIR}/metadef/graph/model_serialize.cc"
     "${PARSER_DIR}/metadef/graph/node.cc"
     "${PARSER_DIR}/metadef/graph/op_desc.cc"
+    "${PARSER_DIR}/metadef/graph/ir_meta.cc"
+    "${PARSER_DIR}/metadef/graph/ir_data_type_symbol_store.cc"
     "${PARSER_DIR}/metadef/graph/operator.cc"
     "${PARSER_DIR}/metadef/graph/operator_impl.cc"
     "${PARSER_DIR}/metadef/graph/operator_factory.cc"