Pre Merge pull request !1634 from 王涛/master

ge/graph/load/model_manager/model_manager.cc

@@ -1204,13 +1204,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 {

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

metadef

@@ -1 +1 @@
-Subproject commit 68474443bd6966eade3e32d6dfa2cc62f5872d2c
+Subproject commit c2677e5fc9e9df9315ecb52986fe9161ce25cade