From 737970cd898090c7747d22768300da755fec25db Mon Sep 17 00:00:00 2001 From: Margaret_wangrui Date: Tue, 20 Jul 2021 11:04:16 +0800 Subject: [PATCH] code check clean up --- .../ccsrc/frontend/optimizer/ad/kpynative.cc | 1 - .../ccsrc/frontend/optimizer/recompute.cc | 26 +++++++++---------- mindspore/core/abstract/abstract_value.cc | 4 +-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/mindspore/ccsrc/frontend/optimizer/ad/kpynative.cc b/mindspore/ccsrc/frontend/optimizer/ad/kpynative.cc index 02c75063f8d..53329fd49a6 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/kpynative.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/kpynative.cc @@ -827,7 +827,6 @@ bool KPynativeCellImpl::BackPropagate(bool by_value) { MS_LOG(DEBUG) << "BackPropagate for CNode: " << cnode->DebugString(); auto fg = iter->second->fg(); auto fg_type = iter->second->fg_type(); - if (fg_type == PynativeAdjoint::kBackwardPropagate) { BackPropagateOneCNodeWithBPropFuncGraph(cnode, iter->second, fg, by_value); } else { diff --git a/mindspore/ccsrc/frontend/optimizer/recompute.cc b/mindspore/ccsrc/frontend/optimizer/recompute.cc index 371d20f244a..313c37a5401 100644 --- a/mindspore/ccsrc/frontend/optimizer/recompute.cc +++ b/mindspore/ccsrc/frontend/optimizer/recompute.cc @@ -103,7 +103,7 @@ std::vector FindCandidateRecomputedNodes(const FuncGraphManagerPtr &mn if (std::any_of(inputs.begin(), inputs.end(), [](const AnfNodePtr &node) { return IsBpropNode(node); })) { continue; } - candidate_recomputed_nodes.emplace_back(cnode); + (void)candidate_recomputed_nodes.emplace_back(cnode); } return candidate_recomputed_nodes; } @@ -204,7 +204,7 @@ std::vector GetFirstTargetInputs(const std::vector &origin if (recomputed_origin_nodes.find(input->cast()) != recomputed_origin_nodes.end()) { continue; } - first_target_inputs.emplace_back(input); + (void)first_target_inputs.emplace_back(input); } break; } @@ -261,7 +261,7 @@ void GetTupleGetItemOutputNodes(const FuncGraphManagerPtr &mng, const AnfNodePtr } for (const auto &node_index_set : output_set_iter->second) { if (IsPrimitiveCNode(node_index_set.first, prim::kPrimTupleGetItem)) { - tuple_getitem_output_nodes->emplace_back(node_index_set.first); + (void)tuple_getitem_output_nodes->emplace_back(node_index_set.first); } } } @@ -304,7 +304,7 @@ void SetRecomputedAttr(const FuncGraphPtr &graph, const std::vector &o auto prim_recompute_attr = prim->GetAttr(kAttrRecompute); int prim_recompute_val = -1; if (prim_recompute_attr != nullptr && prim_recompute_attr->isa()) { - prim_recompute_val = GetValue(prim_recompute_attr); + prim_recompute_val = static_cast(GetValue(prim_recompute_attr)); } if ((SetRecomputedScope(cnode) && prim_recompute_val != 0) || prim_recompute_val == 1) { cnode->AddAttr(kAttrRecompute, MakeValue(true)); @@ -352,7 +352,7 @@ CNodePtr NewRecomputedNode(const FuncGraphPtr &graph, const CNodePtr &origin_nod auto input = origin_node->input(i); MS_EXCEPTION_IF_NULL(input); if (!input->isa()) { - new_inputs.emplace_back(input); + (void)new_inputs.emplace_back(input); continue; } auto input_cnode = input->cast(); @@ -360,14 +360,14 @@ CNodePtr NewRecomputedNode(const FuncGraphPtr &graph, const CNodePtr &origin_nod if (IsPrimitiveCNode(input_cnode, prim::kPrimUpdateState)) { auto u = NewValueNode(kUMonad); u->set_abstract(kUMonad->ToAbstract()); - new_inputs.emplace_back(u); + (void)new_inputs.emplace_back(u); } else { - new_inputs.emplace_back(input); + (void)new_inputs.emplace_back(input); } } else { has_recomputed_inputs = true; - new_inputs.emplace_back(NewRecomputedNode(graph, input_cnode, first_target_inputs, recomputed_origin_nodes, - origin_to_recomputed_nodes)); + (void)new_inputs.emplace_back(NewRecomputedNode(graph, input_cnode, first_target_inputs, recomputed_origin_nodes, + origin_to_recomputed_nodes)); } } // Add the execution dependency. @@ -404,14 +404,14 @@ void DuplicateRecomputedNodes(const FuncGraphPtr &graph, const std::unordered_se for (const auto &input : target_cnode->inputs()) { MS_EXCEPTION_IF_NULL(input); if (!input->isa()) { - new_target_inputs.emplace_back(input); + (void)new_target_inputs.emplace_back(input); } else { auto input_cnode = input->cast(); if (origin_recomputed_nodes.find(input_cnode) != origin_recomputed_nodes.end()) { - new_target_inputs.emplace_back(NewRecomputedNode(graph, input_cnode, first_target_inputs, - origin_recomputed_nodes, origin_to_recomputed_nodes)); + (void)new_target_inputs.emplace_back(NewRecomputedNode(graph, input_cnode, first_target_inputs, + origin_recomputed_nodes, origin_to_recomputed_nodes)); } else { - new_target_inputs.emplace_back(input_cnode); + (void)new_target_inputs.emplace_back(input_cnode); } } } diff --git a/mindspore/core/abstract/abstract_value.cc b/mindspore/core/abstract/abstract_value.cc index c1ea95acf1b..f32bfad28d2 100644 --- a/mindspore/core/abstract/abstract_value.cc +++ b/mindspore/core/abstract/abstract_value.cc @@ -30,8 +30,8 @@ namespace mindspore { namespace abstract { AnfNodePtr GetTraceNode(const AbstractBasePtr &abs) { AnfNodePtr node = nullptr; - if (abs->trace_node_provider_ != nullptr) { - abs->trace_node_provider_(&node); + if (mindspore::abstract::AbstractBase::trace_node_provider_ != nullptr) { + mindspore::abstract::AbstractBase::trace_node_provider_(&node); } return node; }