From 2e235dd276ccce7bd413c1749855bd3ab3afa54a Mon Sep 17 00:00:00 2001 From: liangzelang Date: Sat, 24 Jul 2021 16:42:07 +0800 Subject: [PATCH] Clean code in master --- .../backend/session/ascend_auto_monad.cc | 20 +++++++++---------- .../ccsrc/backend/session/ascend_session.cc | 13 ++++++------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/mindspore/ccsrc/backend/session/ascend_auto_monad.cc b/mindspore/ccsrc/backend/session/ascend_auto_monad.cc index 848b730a490..d723b21abbc 100644 --- a/mindspore/ccsrc/backend/session/ascend_auto_monad.cc +++ b/mindspore/ccsrc/backend/session/ascend_auto_monad.cc @@ -751,7 +751,7 @@ class AscendAutoMonadConverter { const auto &end_node = call_info.call_sites.back().cnode; end_iter = std::find(nodes.rbegin(), nodes.rend(), end_node); } - for (auto iter = nodes.rbegin(); iter != end_iter; iter++) { + for (auto iter = nodes.rbegin(); iter != end_iter; ++iter) { if (!AnfAlgo::IsRealCNodeKernel(*iter)) { continue; } @@ -780,7 +780,7 @@ class AscendAutoMonadConverter { const auto &end_node = context->call_info_map[kg].call_sites.back().cnode; end_iter = std::find(nodes.rbegin(), nodes.rend(), end_node); } - for (auto iter = nodes.rbegin(); iter != end_iter; iter++) { + for (auto iter = nodes.rbegin(); iter != end_iter; ++iter) { if (!AnfAlgo::IsRealCNodeKernel(*iter)) { continue; } @@ -888,7 +888,7 @@ class AscendAutoMonadConverter { MS_LOG(DEBUG) << "check node input[" << i << "]: " << node_input->DebugString(); if (node_input->isa()) { MS_LOG(DEBUG) << "node_input:" << node_input->DebugString() << " is a param"; - CNodePtr stack_pop = InsertStackPop(kernel_graph_, node_input, stack_pushs); + CNodePtr stack_pop = InsertStackPop(node_input, stack_pushs); node->set_input(i, stack_pop); KeepOrderForStackPop(kernel_graph_, stack_pop, node); continue; @@ -896,7 +896,7 @@ class AscendAutoMonadConverter { auto iter = std::find_if(before_nodes.begin(), before_nodes.end(), [node_input](auto before_node) { return before_node == node_input; }); if (iter != before_nodes.end()) { - CNodePtr stack_pop = InsertStackPop(kernel_graph_, *iter, stack_pushs); + CNodePtr stack_pop = InsertStackPop(*iter, stack_pushs); node->set_input(i, stack_pop); KeepOrderForStackPop(kernel_graph_, stack_pop, node); } @@ -904,7 +904,7 @@ class AscendAutoMonadConverter { } // Create StackOps for node_input. - CNodePtr InsertStackPop(const KernelGraphPtr &kg, const AnfNodePtr &node_input, std::vector *stack_pushs) { + CNodePtr InsertStackPop(const AnfNodePtr &node_input, std::vector *stack_pushs) { auto stack_push = StackPush(node_input); stack_pushs->emplace_back(stack_push); auto stack_pop = StackPop(); @@ -1608,7 +1608,7 @@ class ExecuteOrderGenerator { graph_->set_execution_order(std::move(execution_order)); } - std::set GetAllNodes(std::map *search_list) { + std::set GetAllNodes(std::map *search_list) { const auto &all_graphs = context_.visited_graphs(); std::set all_nodes; for (auto &graph : all_graphs) { @@ -1651,7 +1651,7 @@ class ExecuteOrderGenerator { void EraseParameter() { // Copy out execution order list. auto exec_order = graph_->execution_order(); - std::map search_list; + std::map search_list; for (size_t i = 0; i < exec_order.size(); i++) { search_list.emplace(exec_order[i], i); } @@ -1681,7 +1681,7 @@ class ExecuteOrderGenerator { MS_EXCEPTION_IF_NULL(source); if (source->isa()) { auto it = param_write_times.find(source); - auto index = search_list[node]; + const auto index = search_list[node]; if (it != param_write_times.end() && it->second.first > 0 && it->second.second > index) { // Skip if Assign source is a parameter and be written in other place. ++iter; @@ -1724,8 +1724,8 @@ class ExecuteOrderGenerator { } // Count parameter write times by check all assign nodes. - std::map> CountParameterAssigns(const std::map &search_list, - const std::vector &exec_order) { + std::map> CountParameterAssigns( + const std::map &search_list, const std::vector &exec_order) { auto ref_map = graph_->GetRefMap(); std::multimap> ref_multimap; std::set root_inputs(graph_->inputs().begin(), graph_->inputs().end()); diff --git a/mindspore/ccsrc/backend/session/ascend_session.cc b/mindspore/ccsrc/backend/session/ascend_session.cc index cea61240c2d..f48cf3f7e3a 100644 --- a/mindspore/ccsrc/backend/session/ascend_session.cc +++ b/mindspore/ccsrc/backend/session/ascend_session.cc @@ -942,7 +942,7 @@ void AscendSession::BuildDynamicKernel(const std::shared_ptr &kerne } static CNodePtr GetNextLabelSet(const std::vector &kernel_nodes, uint32_t index) { - uint32_t node_sizes = kernel_nodes.size(); + size_t node_sizes = kernel_nodes.size(); if (index >= node_sizes - 1) { MS_LOG(EXCEPTION) << "there is no node after this node:" << kernel_nodes[index]->DebugString(); } @@ -961,7 +961,8 @@ static std::vector HandleRecursiveCall(const std::vector &ke std::vector front; std::vector back_temp; bool back_flag = false; - for (uint32_t i = *index; i < kernel_cnodes.size(); i++) { + uint32_t i = *index; + while (i < kernel_cnodes.size()) { if (!back_flag) { front.emplace_back(kernel_cnodes[i]); } else { @@ -974,14 +975,12 @@ static std::vector HandleRecursiveCall(const std::vector &ke } if (AnfAlgo::HasNodeAttr(kAttrRecursive, kernel_cnodes[i])) { back_flag = true; - if (AnfAlgo::IsLabelIndexInNode(kernel_cnodes[i], back_label)) { - continue; - } else { + if (!AnfAlgo::IsLabelIndexInNode(kernel_cnodes[i], back_label)) { auto temp = HandleRecursiveCall(kernel_cnodes, back_label, &(++i), &back_temp); front.insert(front.end(), temp.begin(), temp.end()); - continue; } } + i++; } return front; } @@ -1030,7 +1029,7 @@ void InitMemReuseExecOrder(KernelGraph *kernel_graph) { std::unordered_map label_id_index_map; auto kernel_cnodes = kernel_graph->execution_order(); std::vector mem_reuse_order; - for (size_t i = 0; i < kernel_cnodes.size(); i++) { + for (uint32_t i = 0; i < kernel_cnodes.size(); i++) { mem_reuse_order.emplace_back(kernel_cnodes[i]); if (AnfAlgo::CheckPrimitiveType(kernel_cnodes[i], prim::kPrimLabelSwitch) && !AnfAlgo::HasNodeAttr(kAttrRecursive, kernel_cnodes[i]) &&