From 0ccd196b50199893f87a3f9b0a9236cd9d5f1ae7 Mon Sep 17 00:00:00 2001
From: wqtshg <wangtao123@huawei.com>
Date: Tue, 11 May 2021 21:57:43 +0800
Subject: [PATCH] modify single op dynamic shape

---
 ge/graph/load/model_manager/model_manager.cc | 10 ++++------
 ge/model/ge_root_model.cc                    |  1 +
 metadef                                      |  2 +-
 parser                                       |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ge/graph/load/model_manager/model_manager.cc b/ge/graph/load/model_manager/model_manager.cc
index b731aefe..a52242a3 100755
--- a/ge/graph/load/model_manager/model_manager.cc
+++ b/ge/graph/load/model_manager/model_manager.cc
@@ -1140,13 +1140,11 @@ Status ModelManager::LoadModelOffline(uint32_t &model_id, const ModelData &model
     return ret;
   }
 
-  if (model_helper.GetModelType()) {
-    bool is_shape_unknown = false;
-    GE_CHK_STATUS_RET(model_helper.GetGeRootModel()->CheckIsUnknownShape(is_shape_unknown),
-                      "CheckIsUnknownShape failed, model id:%u", model_id);
-    if (is_shape_unknown || GetContext().GetHostExecFlag()) {
+  bool is_shape_unknown = false;
+  GE_CHK_STATUS_RET(model_helper.GetGeRootModel()->CheckIsUnknownShape(is_shape_unknown),
+                    "CheckIsUnknownShape failed, model id:%u", model_id);
+  if (is_shape_unknown || GetContext().GetHostExecFlag()) {
       return DoLoadHybridModelOnline(model_id, model.om_name, model_helper.GetGeRootModel(), listener);
-    }
   }
 
   do {
diff --git a/ge/model/ge_root_model.cc b/ge/model/ge_root_model.cc
index 68f868dd..8d2c6b06 100644
--- a/ge/model/ge_root_model.cc
+++ b/ge/model/ge_root_model.cc
@@ -27,6 +27,7 @@ Status GeRootModel::CheckIsUnknownShape(bool &is_dynamic_shape) {
   }
   is_dynamic_shape = false;
   (void)AttrUtils::GetBool(root_graph_, ATTR_NAME_DYNAMIC_SHAPE_PARTITIONED, is_dynamic_shape);
+  is_dynamic_shape = is_dynamic_shape || root_graph_->GetGraphUnknownFlag();
   return SUCCESS;
 }
 }  // namespace ge
\ No newline at end of file
diff --git a/metadef b/metadef
index 68474443..0facaa5a 160000
--- a/metadef
+++ b/metadef
@@ -1 +1 @@
-Subproject commit 68474443bd6966eade3e32d6dfa2cc62f5872d2c
+Subproject commit 0facaa5af36b64c9d39603ed419191d21832df8a
diff --git a/parser b/parser
index 7773435b..055cc4f2 160000
--- a/parser
+++ b/parser
@@ -1 +1 @@
-Subproject commit 7773435b776fb37231abcef2bbcf972814b01dd1
+Subproject commit 055cc4f21aac44b96ef2f951d9e7f89f7042d77a