From 2971522f1b2805a59a4cfa8597a657227442558c Mon Sep 17 00:00:00 2001 From: wxl Date: Mon, 8 Feb 2021 15:19:57 +0800 Subject: [PATCH 1/6] reformat need to delete --- ge/graph/passes/reshape_remove_pass.cc | 34 +++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/ge/graph/passes/reshape_remove_pass.cc b/ge/graph/passes/reshape_remove_pass.cc index ffa6a485..3268041b 100755 --- a/ge/graph/passes/reshape_remove_pass.cc +++ b/ge/graph/passes/reshape_remove_pass.cc @@ -15,29 +15,45 @@ */ #include "graph/passes/reshape_remove_pass.h" + +#include +#include + #include "framework/common/util.h" +#include "framework/common/types.h" #include "graph/passes/pass_utils.h" #include "graph/utils/node_utils.h" namespace ge { namespace { const int kReshapeDataIndex = 0; +const int kReshapeType = 0; +const int kReformatType = 1; +std::map kOpTypeHash = { + {RESHAPE, kReshapeType}, + {REFORMAT, kReformatType} +}; } Status ReshapeRemovePass::Run(NodePtr &node) { GE_CHECK_NOTNULL(node); GE_CHECK_NOTNULL(node->GetOpDesc()); - if (node->GetType() != RESHAPE && node->GetType() != REFORMAT) { - return SUCCESS; - } - bool is_shape_unknown = false; - if (NodeUtils::GetNodeUnknownShapeStatus(*node, is_shape_unknown) == GRAPH_SUCCESS) { - if (is_shape_unknown) { - GELOGI("op:%s is unknown shape, can not be deleted.", - node->GetName().c_str()); + switch(kOpTypeHash.find(node->GetType())) { + case kReshapeType: + bool is_shape_unknown = false; + if (NodeUtils::GetNodeUnknownShapeStatus(*node, is_shape_unknown) == GRAPH_SUCCESS) { + if (is_shape_unknown) { + GELOGI("op:%s is unknown shape, can not be deleted.", + node->GetName().c_str()); + return SUCCESS; + } + } + break; + case kReformatType: + break; + default: return SUCCESS; - } } GELOGI("Remove %s node %s", node->GetType().c_str(), node->GetName().c_str()); From 75af406d27bd76a0114abb65e78ca2f146841c1e Mon Sep 17 00:00:00 2001 From: wxl Date: Mon, 8 Feb 2021 18:25:46 +0800 Subject: [PATCH 2/6] reformat need to delete --- ge/graph/passes/reshape_remove_pass.cc | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/ge/graph/passes/reshape_remove_pass.cc b/ge/graph/passes/reshape_remove_pass.cc index 3268041b..8b5fcf56 100755 --- a/ge/graph/passes/reshape_remove_pass.cc +++ b/ge/graph/passes/reshape_remove_pass.cc @@ -27,20 +27,24 @@ namespace ge { namespace { const int kReshapeDataIndex = 0; -const int kReshapeType = 0; -const int kReformatType = 1; -std::map kOpTypeHash = { - {RESHAPE, kReshapeType}, - {REFORMAT, kReformatType} +enum kOpHashValue { + ReshapeType = 0; + ReformatType = 1; + OpNoDelete = -1; +} + +std::map kToDeleteOpType = { + {RESHAPE, ReshapeType}, + {REFORMAT, ReformatType} }; } Status ReshapeRemovePass::Run(NodePtr &node) { GE_CHECK_NOTNULL(node); GE_CHECK_NOTNULL(node->GetOpDesc()); - - switch(kOpTypeHash.find(node->GetType())) { - case kReshapeType: + int key = kOpTypeHash.find(node->GetType()) == kOpTypeHash.end() ? OpNoDelete : kToDeleteOpType[node->GetType()]; + switch(key) { + case ReshapeType: { bool is_shape_unknown = false; if (NodeUtils::GetNodeUnknownShapeStatus(*node, is_shape_unknown) == GRAPH_SUCCESS) { if (is_shape_unknown) { @@ -50,7 +54,8 @@ Status ReshapeRemovePass::Run(NodePtr &node) { } } break; - case kReformatType: + } + case ReformatType: break; default: return SUCCESS; From 5de61010affa5b3494a53d1f5f308a403886f479 Mon Sep 17 00:00:00 2001 From: wxl Date: Mon, 8 Feb 2021 18:31:00 +0800 Subject: [PATCH 3/6] reformat need to delete --- ge/graph/passes/reshape_remove_pass.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ge/graph/passes/reshape_remove_pass.cc b/ge/graph/passes/reshape_remove_pass.cc index 8b5fcf56..9aa3fff6 100755 --- a/ge/graph/passes/reshape_remove_pass.cc +++ b/ge/graph/passes/reshape_remove_pass.cc @@ -33,7 +33,7 @@ enum kOpHashValue { OpNoDelete = -1; } -std::map kToDeleteOpType = { +std::map kToBeDeleteOp = { {RESHAPE, ReshapeType}, {REFORMAT, ReformatType} }; @@ -42,7 +42,7 @@ std::map kToDeleteOpType = { Status ReshapeRemovePass::Run(NodePtr &node) { GE_CHECK_NOTNULL(node); GE_CHECK_NOTNULL(node->GetOpDesc()); - int key = kOpTypeHash.find(node->GetType()) == kOpTypeHash.end() ? OpNoDelete : kToDeleteOpType[node->GetType()]; + int key = kToBeDeleteOp.find(node->GetType()) == kToBeDeleteOp.end() ? OpNoDelete : kToBeDeleteOp[node->GetType()]; switch(key) { case ReshapeType: { bool is_shape_unknown = false; From 35915344ac00c6396830ea2230e017ec44a0ba8a Mon Sep 17 00:00:00 2001 From: wxl Date: Mon, 8 Feb 2021 18:39:03 +0800 Subject: [PATCH 4/6] reformat need to delete --- ge/graph/passes/reshape_remove_pass.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ge/graph/passes/reshape_remove_pass.cc b/ge/graph/passes/reshape_remove_pass.cc index 9aa3fff6..8be81459 100755 --- a/ge/graph/passes/reshape_remove_pass.cc +++ b/ge/graph/passes/reshape_remove_pass.cc @@ -31,7 +31,7 @@ enum kOpHashValue { ReshapeType = 0; ReformatType = 1; OpNoDelete = -1; -} +}; std::map kToBeDeleteOp = { {RESHAPE, ReshapeType}, From 0e81c9810cc1d8f146f808c881556cb86221d498 Mon Sep 17 00:00:00 2001 From: wxl Date: Mon, 8 Feb 2021 18:41:04 +0800 Subject: [PATCH 5/6] reformat need to delete --- ge/graph/passes/reshape_remove_pass.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ge/graph/passes/reshape_remove_pass.cc b/ge/graph/passes/reshape_remove_pass.cc index 8be81459..7d10ce5a 100755 --- a/ge/graph/passes/reshape_remove_pass.cc +++ b/ge/graph/passes/reshape_remove_pass.cc @@ -28,9 +28,9 @@ namespace ge { namespace { const int kReshapeDataIndex = 0; enum kOpHashValue { - ReshapeType = 0; - ReformatType = 1; - OpNoDelete = -1; + ReshapeType = 0, + ReformatType = 1, + OpNoDelete = -1 }; std::map kToBeDeleteOp = { From 31e6e985926da0d60b65cd1a1e71a711b94722c0 Mon Sep 17 00:00:00 2001 From: wxl Date: Mon, 8 Feb 2021 21:39:39 +0800 Subject: [PATCH 6/6] reformat need to delete --- ge/graph/passes/reshape_remove_pass.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ge/graph/passes/reshape_remove_pass.cc b/ge/graph/passes/reshape_remove_pass.cc index 7d10ce5a..80573e79 100755 --- a/ge/graph/passes/reshape_remove_pass.cc +++ b/ge/graph/passes/reshape_remove_pass.cc @@ -27,24 +27,24 @@ namespace ge { namespace { const int kReshapeDataIndex = 0; -enum kOpHashValue { - ReshapeType = 0, - ReformatType = 1, - OpNoDelete = -1 +enum OpHashValue { + kReshapeType = 0, + kReformatType = 1, + kOpNoDelete = -1 }; -std::map kToBeDeleteOp = { - {RESHAPE, ReshapeType}, - {REFORMAT, ReformatType} +std::map kToBeDeleteOp = { + {RESHAPE, kReshapeType}, + {REFORMAT, kReformatType} }; } Status ReshapeRemovePass::Run(NodePtr &node) { GE_CHECK_NOTNULL(node); GE_CHECK_NOTNULL(node->GetOpDesc()); - int key = kToBeDeleteOp.find(node->GetType()) == kToBeDeleteOp.end() ? OpNoDelete : kToBeDeleteOp[node->GetType()]; + int key = kToBeDeleteOp.find(node->GetType()) == kToBeDeleteOp.end() ? kOpNoDelete : kToBeDeleteOp[node->GetType()]; switch(key) { - case ReshapeType: { + case kReshapeType: { bool is_shape_unknown = false; if (NodeUtils::GetNodeUnknownShapeStatus(*node, is_shape_unknown) == GRAPH_SUCCESS) { if (is_shape_unknown) { @@ -55,7 +55,7 @@ Status ReshapeRemovePass::Run(NodePtr &node) { } break; } - case ReformatType: + case kReformatType: break; default: return SUCCESS;