From adabf8b9344412cd04ab20de3919b9d1890e07e5 Mon Sep 17 00:00:00 2001 From: ttudu Date: Mon, 25 Jul 2022 19:57:40 +0800 Subject: [PATCH] codeclean --- .../ascend/hal/device/ascend_stream_assign.cc | 30 ++++++++++--------- .../ascend/hal/device/ascend_stream_assign.h | 19 ++++++------ 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.cc index 6f77ba4548d..985298a506a 100644 --- a/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.cc @@ -302,10 +302,10 @@ void GenKernelIoExecInfoMap(const NotNull &kernel_graph, } } -void AscendStreamAssign::InsertEventsForInputs(const NotNull &kernel_graph, const CNodePtr &kernel, - const NodeIoExecInfoPtr &io_exec_info, - mindspore::HashMap> *kernel_send, - mindspore::HashMap> *kernel_recv) { +void AscendStreamAssign::InsertEventsForInputs( + const NotNull &kernel_graph, const CNodePtr &kernel, const NodeIoExecInfoPtr &io_exec_info, + mindspore::HashMap> *kernel_send, + mindspore::HashMap> *kernel_recv) const { auto process_stream_id = AnfAlgo::GetStreamId(kernel); auto input_exec_info_list = io_exec_info->inputs; mindspore::HashMap stream_max_exec_node_map; @@ -333,10 +333,10 @@ void AscendStreamAssign::InsertEventsForInputs(const NotNull &ke } } -void AscendStreamAssign::InsertEventsForOutputs(const NotNull &kernel_graph, const CNodePtr &kernel, - const NodeIoExecInfoPtr &io_exec_info, - mindspore::HashMap> *kernel_send, - mindspore::HashMap> *kernel_recv) { +void AscendStreamAssign::InsertEventsForOutputs( + const NotNull &kernel_graph, const CNodePtr &kernel, const NodeIoExecInfoPtr &io_exec_info, + mindspore::HashMap> *kernel_send, + mindspore::HashMap> *kernel_recv) const { auto process_stream_id = AnfAlgo::GetStreamId(kernel); auto output_exec_info_list = io_exec_info->outputs; mindspore::HashMap stream_min_exec_node_map; @@ -731,7 +731,8 @@ CNodePtr AscendStreamAssign::GetCNodesNeededMoved(vector *moved_backwa } CNodePtr AscendStreamAssign::GetTargetOutputNode(const vector &moved_backward_cnodes, - const CNodePtr first_node, const NotNull &graph_ptr) { + const CNodePtr first_node, + const NotNull &graph_ptr) const { auto cnode_ptr_list = graph_ptr->execution_order(); if (moved_backward_cnodes.empty() || !first_node) { return nullptr; @@ -770,7 +771,7 @@ CNodePtr AscendStreamAssign::GetTargetOutputNode(const vector &moved_b return first_output_node_ptr; } -bool AscendStreamAssign::FinetuneSubgraphExecOrder(vector *cnodes) { +bool AscendStreamAssign::FinetuneSubgraphExecOrder(vector *cnodes) const { MS_EXCEPTION_IF_NULL(cnodes); auto hcom_pos = find_if(cnodes->begin(), cnodes->end(), [](const CNodePtr &node_ptr) -> bool { return common::AnfAlgo::GetCNodeName(node_ptr) == "AllReduce"; @@ -1005,7 +1006,7 @@ void AscendStreamAssign::ClassifyNodeByGroupAndGraph(const std::vector } } -std::set AscendStreamAssign::AssignNodeStreamInOrder(const std::vector node_list) { +std::set AscendStreamAssign::AssignNodeStreamInOrder(const std::vector node_list) const { AscendStreamMng &resource_manager = AscendStreamMng::GetInstance(); auto cur_stream_id = resource_manager.ApplyNewStream(); std::map stream_task_map; @@ -1584,7 +1585,7 @@ void AscendStreamAssign::InsertRecvForNotLoopSink(const NotNull } } -void AscendStreamAssign::GraphLoopSync(const NotNull &root_graph, uint32_t graph_id) { +void AscendStreamAssign::GraphLoopSync(const NotNull &root_graph, uint32_t graph_id) const { if (ExistStreamSendAfterLastHcomNode(root_graph, graph_id)) { return; } @@ -1733,7 +1734,7 @@ void AscendStreamAssign::InsertEventHcomDependCommonBak(const NotNull AscendStreamAssign::GetLastInputCnode(const NotNull &graph_ptr, - const CNodePtr &cur_cnode_ptr) { + const CNodePtr &cur_cnode_ptr) const { auto group_name = GetHcomGroup(cur_cnode_ptr); auto input_cnodes = GetInputKernels(cur_cnode_ptr); if (input_cnodes.empty()) { @@ -1894,7 +1895,8 @@ std::vector>> AscendStreamAssign::GetStreamID } void AscendStreamAssign::InsertEventHcomDependHcomAtSameGroup( - const NotNull &graph_ptr, std::pair>> group_item) { + const NotNull &graph_ptr, + std::pair>> group_item) const { for (const auto &graph_item : std::as_const(group_item.second)) { auto stream_indices = GetStreamIDHcomMap(graph_ptr->execution_order(), group_item.first, graph_item.first); constexpr size_t kStreamMax = 2; diff --git a/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.h index a303a88f930..fa05ba9ae16 100644 --- a/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.h @@ -87,7 +87,7 @@ class AscendStreamAssign { ~AscendStreamAssign() = default; void AssignAllNodesStream(const NotNull &graph_ptr); - std::set AssignNodeStreamInOrder(const std::vector node_list); + std::set AssignNodeStreamInOrder(const std::vector node_list) const; void ClassifyNodeByKernel(const NotNull &graph_ptr, std::vector *common_list, std::vector *hcom_list, std::vector *independent_list, std::vector *comm_sub_graph_list) const; @@ -124,8 +124,9 @@ class AscendStreamAssign { void InsertEventBetweenHcom(const NotNull &graph_ptr, const std::vector>> &hcom_index) const; void InsertEventForCallCommSubGraph(const NotNull &graph_ptr) const; - void InsertEventHcomDependHcomAtSameGroup(const NotNull &graph_ptr, - std::pair>> group_item); + void InsertEventHcomDependHcomAtSameGroup( + const NotNull &graph_ptr, + std::pair>> group_item) const; void InsertRecvForLoopSink(const NotNull &root_graph, std::vector *cnodes, uint32_t cur_event_id, uint32_t graph_id) const; void InsertRecvForNotLoopSink(const NotNull &root_graph, std::vector *cnodes, @@ -134,7 +135,7 @@ class AscendStreamAssign { const std::string group, size_t graph_id) const; void AdjustAtomicAddrCleanOrder(const NotNull &graph_ptr) const; - vector GetLastInputCnode(const NotNull &graph_ptr, const CNodePtr &cur_cnode_ptr); + vector GetLastInputCnode(const NotNull &graph_ptr, const CNodePtr &cur_cnode_ptr) const; vector GetIndependentNodesNeedsInsertActive(const std::vector exe_orders, const uint32_t graph_id) const; bool IsSatisfiedHcom(const std::vector>> &hcom_index, const CNodePtr &node_ptr, @@ -148,8 +149,8 @@ class AscendStreamAssign { CNodePtr GetCNodesNeededMoved(vector *moved_backward_cnodes, vector *moved_forward_cnodes, const vector &last_grad_and_status, const NotNull &graph_ptr); CNodePtr GetTargetOutputNode(const vector &moved_backward_cnodes, const CNodePtr first_node, - const NotNull &graph_ptr); - bool FinetuneSubgraphExecOrder(vector *cnodes); + const NotNull &graph_ptr) const; + bool FinetuneSubgraphExecOrder(vector *cnodes) const; void TrailingTimeOptimizationByReorder(const NotNull &graph_ptr); uint32_t GetMaxIndexTarget(const NotNull &graph_ptr); @@ -185,7 +186,7 @@ class AscendStreamAssign { bool ExistStreamSendAfterLastHcomNode(const NotNull &graph_ptr, uint32_t graph_id) const; void GetAllGraphID(const NotNull &graph_ptr, std::vector *graphs_id); - void GraphLoopSync(const NotNull &root_graph, uint32_t graph_id); + void GraphLoopSync(const NotNull &root_graph, uint32_t graph_id) const; void InsertEventForMicroBatchIndependent(const NotNull &graph_ptr) const; @@ -231,11 +232,11 @@ class AscendStreamAssign { void InsertEventsForInputs(const NotNull &kernel_graph, const CNodePtr &kernel, const NodeIoExecInfoPtr &io_exec_info, HashMap> *kernel_send, - HashMap> *kernel_recv); + HashMap> *kernel_recv) const; void InsertEventsForOutputs(const NotNull &kernel_graph, const CNodePtr &kernel, const NodeIoExecInfoPtr &io_exec_info, HashMap> *kernel_send, - HashMap> *kernel_recv); + HashMap> *kernel_recv) const; void InsertEvents(const NotNull &kernel_graph, const CNodePtr ¶llel_cnode, const AnfNodePtr &node_before_send, HashMap> *kernel_send,