fix bug of unknown shape

pull/1213/head
wxl 4 years ago
parent 260810227e
commit 494407a20a

@ -29,13 +29,13 @@ const int kRemoveInputIndex = 1;
Status DimensionAdjustPass::Run(ge::NodePtr &node) { Status DimensionAdjustPass::Run(ge::NodePtr &node) {
if (node == nullptr) { if (node == nullptr) {
GELOGE(PARAM_INVALID, "node is nullptr"); GELOGE(PARAM_INVALID, "node is nullptr.");
return PARAM_INVALID; return PARAM_INVALID;
} }
OpDescPtr op_desc_ptr = node->GetOpDesc(); OpDescPtr op_desc_ptr = node->GetOpDesc();
if (op_desc_ptr == nullptr) { if (op_desc_ptr == nullptr) {
GELOGE(PARAM_INVALID, "GetOpDesc return nullptr"); GELOGE(PARAM_INVALID, "GetOpDesc return nullptr.");
return PARAM_INVALID; return PARAM_INVALID;
} }

@ -86,7 +86,7 @@ Status FlowCtrlPass::Run(ComputeGraphPtr compute_graph) {
auto ret = GraphUtils::AddEdge(active_node->GetOutControlAnchor(), auto ret = GraphUtils::AddEdge(active_node->GetOutControlAnchor(),
assign_add_node_in_fpbp_loop_->GetInControlAnchor()); assign_add_node_in_fpbp_loop_->GetInControlAnchor());
if (ret != GRAPH_SUCCESS) { if (ret != GRAPH_SUCCESS) {
GELOGW("add control edge between iter_loop_node:%s and fpbp_loop_node:%s fail, may cause block.", GELOGW("add control edge between iter_loop_node:%s and fpbp_loop_node:%s fail, may cause block",
active_node->GetName().c_str(), assign_add_node_in_fpbp_loop_->GetName().c_str()); active_node->GetName().c_str(), assign_add_node_in_fpbp_loop_->GetName().c_str());
} }
} }
@ -387,7 +387,7 @@ Status FlowCtrlPass::CreateIterCtrlFalseBranch(ComputeGraphPtr &compute_graph, c
GELOGE(FAILED, "Insert model_exit node:%s for IterCtrlTrueStream failed.", model_exit_name.c_str()); GELOGE(FAILED, "Insert model_exit node:%s for IterCtrlTrueStream failed.", model_exit_name.c_str());
return FAILED; return FAILED;
} }
GE_CHK_STATUS_RET(SetStreamLabel(model_exit_node, model_exit_name), "set stream label failed."); GE_CHK_STATUS_RET(SetStreamLabel(model_exit_node, model_exit_name), "set stream label failed");
add_ret = GraphUtils::AddEdge(active_node->GetOutControlAnchor(), model_exit_node->GetInControlAnchor()); add_ret = GraphUtils::AddEdge(active_node->GetOutControlAnchor(), model_exit_node->GetInControlAnchor());
if (add_ret != GRAPH_SUCCESS) { if (add_ret != GRAPH_SUCCESS) {

Loading…
Cancel
Save