From ed143cf998e6fd4c77bd7e68e5896a89f689a43c Mon Sep 17 00:00:00 2001
From: lichun <lichun30@hisilicon.com>
Date: Sat, 26 Jun 2021 16:57:40 +0800
Subject: [PATCH] ReshapeRemovePass_not_remove_reshape_in_dynamic_subgraph

---
 ge/graph/passes/reshape_remove_pass.cc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ge/graph/passes/reshape_remove_pass.cc b/ge/graph/passes/reshape_remove_pass.cc
index 10937cf1..856fda71 100755
--- a/ge/graph/passes/reshape_remove_pass.cc
+++ b/ge/graph/passes/reshape_remove_pass.cc
@@ -45,6 +45,25 @@ Status ReshapeRemovePass::Run(NodePtr &node) {
   int key = kToBeDeleteOp.find(node->GetType()) == kToBeDeleteOp.end() ? kOpNoDelete : kToBeDeleteOp[node->GetType()];
   switch (key) {
     case kReshapeType: {
+      bool is_in_unknown_shape_graph = false;
+      bool forced_unknown = false;
+      for (const auto &node : graph->GetDirectNode()) {
+        GE_CHK_GRAPH_STATUS_RET(ge::NodeUtils::GetNodeUnknownShapeStatus(*node, is_in_unknown_shape_graph),
+                                "[Get][ShapeStatus] of node[%s] failed!", node->GetName().c_str());
+        if (is_in_unknown_shape_graph) {
+          break;
+        }
+        if (AttrUtils::GetBool(node->GetOpDesc(), ATTR_NAME_FORCE_UNKNOWN_SHAPE, forced_unknown) && forced_unknown) {
+          GELOGD("node %s was marked as unknown shape.", node->GetName().c_str());
+          is_in_unknown_shape_graph = true;
+          break;
+        }
+      }
+      if (is_in_unknown_shape_graph) {
+        GELOGI("op:%s is in unknown shape graph, can not be deleted.", node->GetName().c_str());
+        return SUCCESS;
+      }
+
       bool is_shape_unknown = false;
       if (NodeUtils::GetNodeUnknownShapeStatus(*node, is_shape_unknown) == GRAPH_SUCCESS) {
         if (is_shape_unknown) {