!1105 Bugfix: add remove reformat for unknonwn shape

From: @wan_xuelei
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen
pull/1105/MERGE
mindspore-ci-bot 4 years ago committed by Gitee
commit 1d354d1e29

@ -15,22 +15,36 @@
*/ */
#include "graph/passes/reshape_remove_pass.h" #include "graph/passes/reshape_remove_pass.h"
#include <map>
#include <string>
#include "framework/common/util.h" #include "framework/common/util.h"
#include "framework/common/types.h"
#include "graph/passes/pass_utils.h" #include "graph/passes/pass_utils.h"
#include "graph/utils/node_utils.h" #include "graph/utils/node_utils.h"
namespace ge { namespace ge {
namespace { namespace {
const int kReshapeDataIndex = 0; const int kReshapeDataIndex = 0;
enum OpHashValue {
kReshapeType = 0,
kReformatType = 1,
kOpNoDelete = -1
};
std::map<std::string, OpHashValue> kToBeDeleteOp = {
{RESHAPE, kReshapeType},
{REFORMAT, kReformatType}
};
} }
Status ReshapeRemovePass::Run(NodePtr &node) { Status ReshapeRemovePass::Run(NodePtr &node) {
GE_CHECK_NOTNULL(node); GE_CHECK_NOTNULL(node);
GE_CHECK_NOTNULL(node->GetOpDesc()); GE_CHECK_NOTNULL(node->GetOpDesc());
if (node->GetType() != RESHAPE && node->GetType() != REFORMAT) { int key = kToBeDeleteOp.find(node->GetType()) == kToBeDeleteOp.end() ? kOpNoDelete : kToBeDeleteOp[node->GetType()];
return SUCCESS; switch(key) {
} case kReshapeType: {
bool is_shape_unknown = false; bool is_shape_unknown = false;
if (NodeUtils::GetNodeUnknownShapeStatus(*node, is_shape_unknown) == GRAPH_SUCCESS) { if (NodeUtils::GetNodeUnknownShapeStatus(*node, is_shape_unknown) == GRAPH_SUCCESS) {
if (is_shape_unknown) { if (is_shape_unknown) {
@ -39,6 +53,13 @@ Status ReshapeRemovePass::Run(NodePtr &node) {
return SUCCESS; return SUCCESS;
} }
} }
break;
}
case kReformatType:
break;
default:
return SUCCESS;
}
GELOGI("Remove %s node %s", node->GetType().c_str(), node->GetName().c_str()); GELOGI("Remove %s node %s", node->GetType().c_str(), node->GetName().c_str());
return IsolateAndDeleteNode(node, {kReshapeDataIndex}); return IsolateAndDeleteNode(node, {kReshapeDataIndex});

Loading…
Cancel
Save