diff --git a/ge/graph/passes/reshape_remove_pass.cc b/ge/graph/passes/reshape_remove_pass.cc index ffa6a485..80573e79 100755 --- a/ge/graph/passes/reshape_remove_pass.cc +++ b/ge/graph/passes/reshape_remove_pass.cc @@ -15,29 +15,50 @@ */ #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; +enum OpHashValue { + kReshapeType = 0, + kReformatType = 1, + kOpNoDelete = -1 +}; + +std::map kToBeDeleteOp = { + {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()); - return SUCCESS; + int key = kToBeDeleteOp.find(node->GetType()) == kToBeDeleteOp.end() ? kOpNoDelete : kToBeDeleteOp[node->GetType()]; + switch(key) { + 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());