From 4b6fc40c259be5beeeae4681a1ab8ffa317c4eba Mon Sep 17 00:00:00 2001 From: zengzitao Date: Thu, 29 Apr 2021 20:21:05 +0800 Subject: [PATCH] fix static warnings for some graph_kernel files --- .../optimizer/graph_kernel/eliminate_redundant_output.cc | 9 +++++---- .../optimizer/graph_kernel/eliminate_redundant_output.h | 2 +- .../optimizer/graph_kernel/update_state_formatter.cc | 2 +- .../backend/optimizer/graph_kernel/value_graph_binder.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/eliminate_redundant_output.cc b/mindspore/ccsrc/backend/optimizer/graph_kernel/eliminate_redundant_output.cc index a183371685..ad634eff4a 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/eliminate_redundant_output.cc +++ b/mindspore/ccsrc/backend/optimizer/graph_kernel/eliminate_redundant_output.cc @@ -123,7 +123,7 @@ bool IsSideEffectNode(const AnfNodePtr &node) { */ class UnifyRepeatedOutput : public Pass { public: - bool Run(const FuncGraphPtr &func_graph) { + bool Run(const FuncGraphPtr &func_graph) override { auto mng = func_graph->manager(); MS_EXCEPTION_IF_NULL(mng); auto todos = FindGraphKernelsWithMultiOutput(func_graph); @@ -156,7 +156,8 @@ class UnifyRepeatedOutput : public Pass { index_map_.resize(outputs.size()); bool found = false; for (size_t i = 0; i < outputs.size(); ++i) { - index_map_[i] = std::find(outputs.begin(), outputs.begin() + i, outputs[i]) - outputs.begin(); + index_map_[i] = + static_cast(std::find(outputs.begin(), outputs.begin() + i, outputs[i]) - outputs.begin()); if (index_map_[i] != i) { found = true; } @@ -184,7 +185,7 @@ class UnifyRepeatedOutput : public Pass { */ class UnifyRepeatedGetitem : public Pass { public: - bool Run(const FuncGraphPtr &func_graph) { + bool Run(const FuncGraphPtr &func_graph) override { auto mng = func_graph->manager(); MS_EXCEPTION_IF_NULL(mng); auto todos = FindGraphKernelsWithMultiOutput(func_graph); @@ -211,7 +212,7 @@ bool EliminateRedundantOutput::Run(const FuncGraphPtr &func_graph) { return changed; } -void EliminateHangingOutput::UpdateGetitemIndex(const AnfNodePtr &getitem, size_t offset) { +void EliminateHangingOutput::UpdateGetitemIndex(const AnfNodePtr &getitem, size_t offset) const { if (offset == 0) return; MS_EXCEPTION_IF_NULL(getitem); auto index = GetIndex(getitem); diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/eliminate_redundant_output.h b/mindspore/ccsrc/backend/optimizer/graph_kernel/eliminate_redundant_output.h index 7cc9064095..cc3ed83cbd 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/eliminate_redundant_output.h +++ b/mindspore/ccsrc/backend/optimizer/graph_kernel/eliminate_redundant_output.h @@ -41,7 +41,7 @@ class EliminateHangingOutput : public Pass { private: // update the GetItem(node, i) to GetItem(node, i - offset) - void UpdateGetitemIndex(const AnfNodePtr &getitem, size_t offset); + void UpdateGetitemIndex(const AnfNodePtr &getitem, size_t offset) const; AnfNodePtr ReplaceMakeTuple(const AnfNodePtr &node, const AnfNodePtrList &getitems); }; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/update_state_formatter.cc b/mindspore/ccsrc/backend/optimizer/graph_kernel/update_state_formatter.cc index e79921f980..d28830d8be 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/update_state_formatter.cc +++ b/mindspore/ccsrc/backend/optimizer/graph_kernel/update_state_formatter.cc @@ -220,7 +220,7 @@ bool ExtendOutputForUpdateState::ProcessIndex(const FuncGraphPtr &func_graph, co MS_EXCEPTION_IF_NULL(mng); for (auto user : mng->node_users()[getitems_[index]]) { if (IsPrimitiveCNode(user.first, prim::kPrimUpdateState)) { - user.first->cast()->set_input(user.second, new_node); + user.first->cast()->set_input(static_cast(user.second), new_node); } } return true; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.h b/mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.h index b9fd608e69..e7db9c3abb 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.h +++ b/mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.h @@ -25,7 +25,7 @@ class BindValueToGraph : public Pass { public: BindValueToGraph() : Pass("bind_value_to_graph") {} ~BindValueToGraph() override = default; - bool Run(const FuncGraphPtr &func_graph); + bool Run(const FuncGraphPtr &func_graph) override; }; using BindValueToGraphPtr = std::shared_ptr; } // namespace opt