ShiyuW
/
mindspore2022
forked from huawei/mindspore2022
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!20811 code clean in master 

Merge pull request !20811 from liangzelang/clean_code_master
This commit is contained in:
i-robot 2021-07-27 06:18:31 +00:00 committed by Gitee
parent 90358906d2 2e235dd276
commit ff5edd69dd
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mindspore/ccsrc/backend/session/ascend_auto_monad.cc
View File

@ -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<Parameter>()) {
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<CNodePtr> *stack_pushs) {
CNodePtr InsertStackPop(const AnfNodePtr &node_input, std::vector<CNodePtr> *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<CNodePtr> GetAllNodes(std::map<CNodePtr, size_t> *search_list) {
std::set<CNodePtr> GetAllNodes(std::map<CNodePtr, const size_t> *search_list) {
const auto &all_graphs = context_.visited_graphs();
std::set<CNodePtr> 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<CNodePtr, size_t> search_list;
std::map<CNodePtr, const size_t> 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<Parameter>()) {
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<AnfNodePtr, std::pair<int, size_t>> CountParameterAssigns(const std::map<CNodePtr, size_t> &search_list,
const std::vector<CNodePtr> &exec_order) {
std::map<AnfNodePtr, std::pair<int, size_t>> CountParameterAssigns(
const std::map<CNodePtr, const size_t> &search_list, const std::vector<CNodePtr> &exec_order) {
auto ref_map = graph_->GetRefMap();
std::multimap<AnfNodePtr, std::tuple<size_t, AnfNodePtr, size_t>> ref_multimap;
std::set<AnfNodePtr> root_inputs(graph_->inputs().begin(), graph_->inputs().end());

13
mindspore/ccsrc/backend/session/ascend_session.cc
View File

@ -942,7 +942,7 @@ void AscendSession::BuildDynamicKernel(const std::shared_ptr<KernelGraph> &kerne
}
static CNodePtr GetNextLabelSet(const std::vector<CNodePtr> &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<CNodePtr> HandleRecursiveCall(const std::vector<CNodePtr> &ke
std::vector<CNodePtr> front;
std::vector<CNodePtr> 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<CNodePtr> HandleRecursiveCall(const std::vector<CNodePtr> &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<uint32_t, uint32_t> label_id_index_map;
auto kernel_cnodes = kernel_graph->execution_order();
std::vector<CNodePtr> 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]) &&