From 3bb48ffee17d3d2c5bcbfc545ae0a97ba425a3f6 Mon Sep 17 00:00:00 2001 From: c00425699 Date: Tue, 31 Mar 2020 12:29:14 +0800 Subject: [PATCH] use std::vector instead of std::list to promote performance for parallel module --- mindspore/ccsrc/parallel/context.cc | 1 - mindspore/ccsrc/parallel/context.h | 1 - mindspore/ccsrc/parallel/device.h | 1 - mindspore/ccsrc/parallel/device_manager.cc | 19 ++++++++-------- mindspore/ccsrc/parallel/device_manager.h | 20 ++++++++--------- mindspore/ccsrc/parallel/device_matrix.cc | 6 ++--- mindspore/ccsrc/parallel/device_matrix.h | 9 ++++---- .../parallel/graph_util/generate_graph.cc | 1 - .../parallel/graph_util/generate_graph.h | 1 - mindspore/ccsrc/parallel/group_manager.cc | 6 ++--- mindspore/ccsrc/parallel/group_manager.h | 10 ++++----- .../ccsrc/parallel/ops_info/activation_info.h | 1 - .../ccsrc/parallel/ops_info/arithmetic_info.h | 1 - .../parallel/ops_info/batch_parallel_info.h | 1 - .../ccsrc/parallel/ops_info/bias_add_info.h | 2 +- .../ops_info/comparison_function_info.h | 1 - .../parallel/ops_info/dropout_do_mask_info.h | 1 - .../ops_info/elementary_function_info.h | 1 - .../ccsrc/parallel/ops_info/generator_info.h | 1 - .../ccsrc/parallel/ops_info/get_next_info.h | 1 - .../parallel/ops_info/l2_normalize_info.h | 1 - mindspore/ccsrc/parallel/ops_info/loss_info.h | 2 +- .../ccsrc/parallel/ops_info/matmul_info.cc | 2 +- .../ccsrc/parallel/ops_info/matmul_info.h | 2 +- .../ccsrc/parallel/ops_info/onehot_info.h | 2 +- .../ccsrc/parallel/ops_info/operator_info.h | 1 - .../ccsrc/parallel/ops_info/prelu_info.h | 2 +- .../parallel/ops_info/reduce_method_info.cc | 2 +- .../parallel/ops_info/reduce_method_info.h | 1 - .../ccsrc/parallel/ops_info/reshape_info.h | 1 - .../parallel/ops_info/tmp_identity_info.h | 1 + .../ccsrc/parallel/ops_info/transpose_info.h | 2 +- .../parallel/ops_info/virtual_dataset_info.h | 2 +- mindspore/ccsrc/parallel/status.h | 1 - mindspore/ccsrc/parallel/step_parallel.cc | 2 +- mindspore/ccsrc/parallel/step_parallel.h | 2 +- mindspore/ccsrc/parallel/strategy.h | 1 - .../redistribution_operator_infer.h | 1 - .../parallel/auto_parallel/dp_algo_test.cc | 4 ++-- .../auto_parallel/edge_costmodel_test.cc | 4 ++-- .../auto_parallel/graph_costmodel_test.cc | 4 ++-- .../auto_parallel/operator_costmodel_test.cc | 12 +++++----- tests/ut/cpp/parallel/device_manager_test.cc | 16 +++++++------- tests/ut/cpp/parallel/device_matrix_test.cc | 16 +++++++------- tests/ut/cpp/parallel/group_manager_test.cc | 22 +++++++++---------- .../parallel/ops_info/activation_info_test.cc | 4 ++-- .../cpp/parallel/ops_info/activation_test.cc | 4 ++-- .../ops_info/dropout_do_mask_info_test.cc | 4 ++-- .../cpp/parallel/ops_info/gelu_info_test.cc | 4 ++-- .../ops_info/generate_strategy_test.cc | 4 ++-- .../parallel/ops_info/generator_info_test.cc | 4 ++-- .../parallel/ops_info/get_next_info_test.cc | 4 ++-- .../ops_info/l2_normalize_info_test.cc | 4 ++-- .../ops_info/log_softmax_info_test.cc | 4 ++-- .../cpp/parallel/ops_info/matmul_info_test.cc | 4 ++-- .../cpp/parallel/ops_info/onehot_info_test.cc | 4 ++-- .../ops_info/onehot_info_test_axis_0.cc | 4 ++-- .../ut/cpp/parallel/ops_info/pow_info_test.cc | 4 ++-- tests/ut/cpp/parallel/ops_info/prelu_test.cc | 4 ++-- .../parallel/ops_info/reduce_method_test.cc | 4 ++-- .../ut/cpp/parallel/ops_info/reshape_test.cc | 4 ++-- .../softmax_entropy_loss_info_test.cc | 4 ++-- .../parallel/ops_info/softmax_info_test.cc | 4 ++-- .../cpp/parallel/ops_info/tanh_info_test.cc | 4 ++-- .../parallel/ops_info/tensor_add_info_test.cc | 4 ++-- .../cpp/parallel/ops_info/tmpidentity_test.cc | 4 ++-- .../cpp/parallel/ops_info/transpose_test.cc | 4 ++-- .../cpp/parallel/step_auto_parallel_test.cc | 4 ++-- tests/ut/cpp/parallel/step_parallel_test.cc | 4 ++-- .../tensor_layout/construct_operator_test.cc | 4 ++-- .../redistribution_operator_infer_test.cc | 4 ++-- .../tensor_redistribution_test.cc | 2 +- tests/ut/cpp/parallel/virtual_dataset_test.cc | 4 ++-- 73 files changed, 141 insertions(+), 160 deletions(-) diff --git a/mindspore/ccsrc/parallel/context.cc b/mindspore/ccsrc/parallel/context.cc index 74ec948c49..64cecf1669 100644 --- a/mindspore/ccsrc/parallel/context.cc +++ b/mindspore/ccsrc/parallel/context.cc @@ -21,7 +21,6 @@ #include #include #include -#include #include #include "parallel/device_manager.h" diff --git a/mindspore/ccsrc/parallel/context.h b/mindspore/ccsrc/parallel/context.h index 22a5f89e38..866609fbfe 100644 --- a/mindspore/ccsrc/parallel/context.h +++ b/mindspore/ccsrc/parallel/context.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "parallel/status.h" diff --git a/mindspore/ccsrc/parallel/device.h b/mindspore/ccsrc/parallel/device.h index 0373617ad5..8c3174ae55 100644 --- a/mindspore/ccsrc/parallel/device.h +++ b/mindspore/ccsrc/parallel/device.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_DEVICE_H_ #include -#include #include #include diff --git a/mindspore/ccsrc/parallel/device_manager.cc b/mindspore/ccsrc/parallel/device_manager.cc index 999d6b4432..3a553e08ec 100644 --- a/mindspore/ccsrc/parallel/device_manager.cc +++ b/mindspore/ccsrc/parallel/device_manager.cc @@ -30,7 +30,7 @@ namespace mindspore { namespace parallel { DeviceManagerPtr g_device_manager = nullptr; -Stage::Stage(const std::list& devices, int num, int rank) +Stage::Stage(const std::vector& devices, int num, int rank) : devices_(devices), number_(num), rank_(rank) { gm_ = GroupManager(); } @@ -104,7 +104,7 @@ int32_t GetListMemberByIndex(size_t index, const RankList& devices) { return result; } -std::shared_ptr GetListMemberByIndex(size_t index, const std::list>& device_list) { +std::shared_ptr GetListMemberByIndex(size_t index, const std::vector>& device_list) { size_t i = 0; std::shared_ptr result; if ((device_list.empty()) || (index >= device_list.size())) { @@ -178,7 +178,7 @@ Status DeviceManager::Init(const RankList& devices, int32_t global_device_rank, MS_LOG(ERROR) << "The number of 'devices' in a stage must be positive"; return Status::FAILED; } - std::list curr_dev_list; + std::vector curr_dev_list; for (int i = 0; i < num_device; ++i) { curr_dev_list.push_back(*GetListMemberByIndex(global_index, devices_)); global_index++; @@ -278,8 +278,8 @@ RankList DeviceManager::global_device_list(int32_t stage_id, int32_t rank, int32 Device DeviceManager::CreateNewDeviceByRank(int32_t rank) const { return Device(rank); } -std::list DeviceManager::CreateDeviceListByRankList(RankList ranks) { - std::list dev_list; +std::vector DeviceManager::CreateDeviceListByRankList(RankList ranks) { + std::vector dev_list; for (auto& rank : ranks) { Device one = CreateNewDeviceByRank(rank); dev_list.push_back(one); @@ -312,8 +312,8 @@ std::string HashName(const std::string& origin_name) { return std::to_string(std // is '0-1-3-5-7'. std::string DeviceManager::GenerateGroupNameByRanks(RankList ranks) { std::string rank_list_name; - std::list::iterator it; - ranks.sort(); // sorted in increasing order + std::vector::iterator it; + std::sort(ranks.begin(), ranks.end()); // sorted in increasing order for (it = ranks.begin(); it != ranks.end(); ++it) { if (it == ranks.begin()) { rank_list_name = std::to_string(*it); @@ -343,7 +343,8 @@ std::string DeviceManager::GenerateGroupNameByRanks(RankList ranks) { // Create the group with the given devices and the given name. The GroupManager // gm_ will create a new group only if there does not exit a group with the same // name. Otherwise, let the pointer g point to that group. -Group DeviceManager::CreateGroup(const std::string& group_name, const std::list& devices) { +Group DeviceManager::CreateGroup(const std::string& group_name, + const std::vector& devices) { if ((world_group() == NCCL_WORLD_GROUP) && (devices.size() != devices_.size())) { MS_LOG(EXCEPTION) << "Do not support sub group for nccl"; } @@ -360,7 +361,7 @@ Group DeviceManager::CreateGroup(const RankList& dev_ranks) { } std::string group_name = GenerateGroupNameByRanks(dev_ranks); - std::list dev_list = CreateDeviceListByRankList(dev_ranks); + auto dev_list = CreateDeviceListByRankList(dev_ranks); return CreateGroup(group_name, dev_list); } diff --git a/mindspore/ccsrc/parallel/device_manager.h b/mindspore/ccsrc/parallel/device_manager.h index 80beb15f86..798d99383d 100644 --- a/mindspore/ccsrc/parallel/device_manager.h +++ b/mindspore/ccsrc/parallel/device_manager.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -50,19 +50,19 @@ class Stage { // This class is used in pipeline-parallelization. Available devices are partitioned into multiple stages. // Currently, the function of pipeline-parallelization and this class are NOT implemented. public: - explicit Stage(std::list devices) : devices_(std::move(devices)), number_(0), rank_(0) { + explicit Stage(std::vector devices) : devices_(std::move(devices)), number_(0), rank_(0) { gm_ = GroupManager(); } - Stage(const std::list& devices, int num, int rank); + Stage(const std::vector& devices, int num, int rank); ~Stage() = default; int GetStageNum() const { return number_; } size_t GetDevicesNum() const { return devices_.size(); } - std::list GetDevicesList() { return devices_; } + std::vector GetDevicesList() { return devices_; } int global_rank(Group* g) const; private: - std::list devices_; + std::vector devices_; int number_; int32_t rank_; GroupManager gm_; @@ -89,10 +89,10 @@ class DeviceManager { RankList global_device_list(int32_t stage_id, int32_t rank, int32_t split_num) const; Device CreateNewDeviceByRank(int32_t rank) const; - std::list CreateDeviceListByRankList(RankList ranks); + std::vector CreateDeviceListByRankList(RankList ranks); std::string GenerateGroupNameByRanks(RankList dev_ranks); - Group CreateGroup(const std::string& group_name, const std::list& devices); + Group CreateGroup(const std::string& group_name, const std::vector& devices); Group CreateGroup(const RankList& dev_ranks); std::shared_ptr GetStageById(int32_t stage_id); @@ -108,11 +108,11 @@ class DeviceManager { std::string FindRankListNameByHashName(const std::string& hash_name); private: - std::list> devices_; + std::vector> devices_; // each stage has a list of devices - std::list> stage_devices_; + std::vector> stage_devices_; std::shared_ptr device_; - std::list> stages_; + std::vector> stages_; GroupManager gm_; std::string backend_; diff --git a/mindspore/ccsrc/parallel/device_matrix.cc b/mindspore/ccsrc/parallel/device_matrix.cc index 5a7aa36c8e..f9f314d5a3 100644 --- a/mindspore/ccsrc/parallel/device_matrix.cc +++ b/mindspore/ccsrc/parallel/device_matrix.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "parallel/status.h" #include "parallel/ops_info/operator_info.h" @@ -64,7 +64,7 @@ Status DeviceMatrix::GetDevicesAlongDim(const uint32_t& dim, RankList* devices) } RankList group; - std::list local_group_list; + std::vector local_group_list; // lower than dim int32_t step = 1; @@ -160,7 +160,7 @@ std::string ShapeToString(const Shape& shape) { return str + "]"; } -std::string ListToString(const std::list& list) { +std::string ListToString(const std::vector& list) { std::string str = "["; for (auto& element : list) { str += std::to_string(element) + ", "; diff --git a/mindspore/ccsrc/parallel/device_matrix.h b/mindspore/ccsrc/parallel/device_matrix.h index d3b0fdcb49..a912000604 100644 --- a/mindspore/ccsrc/parallel/device_matrix.h +++ b/mindspore/ccsrc/parallel/device_matrix.h @@ -20,7 +20,6 @@ #include #include #include -#include #include "parallel/status.h" #include "utils/convert_utils.h" @@ -28,7 +27,7 @@ namespace mindspore { namespace parallel { -using RankList = std::list; +using RankList = std::vector; using Shape = std::vector; class DeviceMatrix { @@ -36,7 +35,7 @@ class DeviceMatrix { DeviceMatrix(int32_t rank, RankList devices, Shape dev_shape); DeviceMatrix() = default; ~DeviceMatrix() = default; - std::list group_list() const { return group_list_; } + std::vector group_list() const { return group_list_; } Status CreateGroupList(); Status GetDevicesByTensorMap(const Shape& tensor_map, RankList* rank_list); Status GetDevicesAlongDim(const uint32_t& dim, RankList* devices); @@ -46,11 +45,11 @@ class DeviceMatrix { RankList dev_list_; // From low dim to high dim. eg: [D0 D1 D2 D3] Shape dev_shape_; - std::list group_list_; + std::vector group_list_; }; std::string ShapeToString(const Shape& shape); -std::string ListToString(const std::list& list); +std::string ListToString(const std::vector& list); } // namespace parallel } // namespace mindspore diff --git a/mindspore/ccsrc/parallel/graph_util/generate_graph.cc b/mindspore/ccsrc/parallel/graph_util/generate_graph.cc index d0548ec647..43df9fe802 100644 --- a/mindspore/ccsrc/parallel/graph_util/generate_graph.cc +++ b/mindspore/ccsrc/parallel/graph_util/generate_graph.cc @@ -17,7 +17,6 @@ #include "parallel/graph_util/generate_graph.h" #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/graph_util/generate_graph.h b/mindspore/ccsrc/parallel/graph_util/generate_graph.h index 713c13dfb5..bb1f811f2f 100644 --- a/mindspore/ccsrc/parallel/graph_util/generate_graph.h +++ b/mindspore/ccsrc/parallel/graph_util/generate_graph.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_GRAPH_UTIL_GENERATE_GRAPH_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/group_manager.cc b/mindspore/ccsrc/parallel/group_manager.cc index 35e81a7d83..cff5877f0a 100644 --- a/mindspore/ccsrc/parallel/group_manager.cc +++ b/mindspore/ccsrc/parallel/group_manager.cc @@ -30,13 +30,13 @@ Group::Group() { devices_.clear(); } -Status Group::Init(const std::string &name, const std::list &devices) { +Status Group::Init(const std::string &name, const std::vector &devices) { this->name_ = name; this->devices_ = devices; return Status::SUCCESS; } -std::list Group::GetDevicesList() const { return devices_; } +std::vector Group::GetDevicesList() const { return devices_; } bool Group::IsInThisGroup(int32_t device_rank) { for (auto &device : devices_) { @@ -66,7 +66,7 @@ Status Group::GetIndex(size_t *index) { GroupManager::GroupManager() { groups_.clear(); } -Status GroupManager::CreateGroup(const std::string &group_name, const std::list &devices, +Status GroupManager::CreateGroup(const std::string &group_name, const std::vector &devices, mindspore::parallel::Group *const group) { // it is simple to use size to determine whether it is a world group uint32_t world_size = 0; diff --git a/mindspore/ccsrc/parallel/group_manager.h b/mindspore/ccsrc/parallel/group_manager.h index c3b95b99e0..9e23569b15 100644 --- a/mindspore/ccsrc/parallel/group_manager.h +++ b/mindspore/ccsrc/parallel/group_manager.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_PARALLEL_GROUP_MANAGER_H_ #include -#include +#include #include #include @@ -37,8 +37,8 @@ class Group { public: Group(); ~Group() = default; - Status Init(const std::string& name, const std::list& devices); - std::list GetDevicesList() const; + Status Init(const std::string& name, const std::vector& devices); + std::vector GetDevicesList() const; std::string name() const { return name_; } bool IsInThisGroup(int32_t device_rank); Status GetIndex(size_t* index); @@ -46,7 +46,7 @@ class Group { private: std::string name_; - std::list devices_; + std::vector devices_; }; class GroupManager { @@ -54,7 +54,7 @@ class GroupManager { GroupManager(); ~GroupManager() = default; - Status CreateGroup(const std::string& name, const std::list& devices, Group* group); + Status CreateGroup(const std::string& name, const std::vector& devices, Group* group); Status DestroyGroup(Group* group); Status DestroyAllGroups(); Status GetRankID(const std::string& name, unsigned int* rank_id); diff --git a/mindspore/ccsrc/parallel/ops_info/activation_info.h b/mindspore/ccsrc/parallel/ops_info/activation_info.h index e988ccf54c..d8de19b328 100644 --- a/mindspore/ccsrc/parallel/ops_info/activation_info.h +++ b/mindspore/ccsrc/parallel/ops_info/activation_info.h @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h b/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h index 1b641152aa..734368a533 100644 --- a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h +++ b/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ARITHMETIC_INFO_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h b/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h index fb08fbe9fc..0ffdea97f3 100644 --- a/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h +++ b/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h @@ -17,7 +17,6 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BATCH_PARALLEL_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BATCH_PARALLEL_INFO_H_ -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/bias_add_info.h b/mindspore/ccsrc/parallel/ops_info/bias_add_info.h index ac263ec91f..e5001fc0d3 100644 --- a/mindspore/ccsrc/parallel/ops_info/bias_add_info.h +++ b/mindspore/ccsrc/parallel/ops_info/bias_add_info.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BIAS_ADD_INFO_H_ #include -#include + #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h b/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h index 2762f94eb9..8760ce5666 100644 --- a/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h +++ b/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_COMPARISON_FUNCTION_INFO_H_ #include -#include #include #include #include "ir/value.h" diff --git a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h b/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h index 2fc18b521d..45d4c28d8e 100644 --- a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h +++ b/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_DROPOUT_DO_MASK_INFO_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h b/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h index cf85d28fb0..33ad04023b 100644 --- a/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h +++ b/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ELEMENTARY_FUNCTION_INFO_H_ #include -#include #include #include #include "ir/value.h" diff --git a/mindspore/ccsrc/parallel/ops_info/generator_info.h b/mindspore/ccsrc/parallel/ops_info/generator_info.h index 0f1d7209c8..1473fead67 100644 --- a/mindspore/ccsrc/parallel/ops_info/generator_info.h +++ b/mindspore/ccsrc/parallel/ops_info/generator_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GENERATOR_INFO_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/get_next_info.h b/mindspore/ccsrc/parallel/ops_info/get_next_info.h index 1280d3b191..3dd639ba57 100644 --- a/mindspore/ccsrc/parallel/ops_info/get_next_info.h +++ b/mindspore/ccsrc/parallel/ops_info/get_next_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GETNEXT_INFO_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h b/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h index 10bf46d8ff..1a67073065 100644 --- a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h +++ b/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_L2_NORMALIZE_INFO_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/loss_info.h b/mindspore/ccsrc/parallel/ops_info/loss_info.h index 70de84fda3..585545302f 100644 --- a/mindspore/ccsrc/parallel/ops_info/loss_info.h +++ b/mindspore/ccsrc/parallel/ops_info/loss_info.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_LOSS_INFO_H_ #include -#include #include #include #include + #include "ir/value.h" #include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/activation_info.h" diff --git a/mindspore/ccsrc/parallel/ops_info/matmul_info.cc b/mindspore/ccsrc/parallel/ops_info/matmul_info.cc index 2cd8e0df8f..6103087a1d 100644 --- a/mindspore/ccsrc/parallel/ops_info/matmul_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/matmul_info.cc @@ -397,7 +397,7 @@ Status MatMulBase::GenerateStrategies(int32_t stage_id) { return FAILED; } CheckGlobalDeviceManager(); - std::list dev_list = g_device_manager->GetDeviceListByStageId(stage_id); + std::vector dev_list = g_device_manager->GetDeviceListByStageId(stage_id); size_t dev_num = dev_list.size(); Shape input0_shape = inputs_shape_[0], input1_shape = inputs_shape_[1]; if (transpose_a_) { diff --git a/mindspore/ccsrc/parallel/ops_info/matmul_info.h b/mindspore/ccsrc/parallel/ops_info/matmul_info.h index daf422e6d6..c9feae55b6 100644 --- a/mindspore/ccsrc/parallel/ops_info/matmul_info.h +++ b/mindspore/ccsrc/parallel/ops_info/matmul_info.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_MATMUL_INFO_H_ #include -#include #include #include #include + #include "ir/value.h" #include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/onehot_info.h b/mindspore/ccsrc/parallel/ops_info/onehot_info.h index fd5d6be8f6..62c66695fa 100644 --- a/mindspore/ccsrc/parallel/ops_info/onehot_info.h +++ b/mindspore/ccsrc/parallel/ops_info/onehot_info.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ONEHOT_INFO_H_ #include -#include #include #include #include + #include "ir/value.h" #include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" diff --git a/mindspore/ccsrc/parallel/ops_info/operator_info.h b/mindspore/ccsrc/parallel/ops_info/operator_info.h index 9902c69ce7..89fd73564f 100644 --- a/mindspore/ccsrc/parallel/ops_info/operator_info.h +++ b/mindspore/ccsrc/parallel/ops_info/operator_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_OPERATOR_INFO_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/prelu_info.h b/mindspore/ccsrc/parallel/ops_info/prelu_info.h index d7dac46291..2e74118f80 100644 --- a/mindspore/ccsrc/parallel/ops_info/prelu_info.h +++ b/mindspore/ccsrc/parallel/ops_info/prelu_info.h @@ -17,11 +17,11 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_PRELU_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_PRELU_INFO_H_ -#include #include #include #include #include + #include "ir/value.h" #include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc b/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc index 216357d5ab..5f9a67c22d 100644 --- a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc @@ -198,7 +198,7 @@ ForwardOp CreatReduceMeanForwardOp(const std::vector &forward_group, cons // Creat RealDiv op OperatorName operator1_name = REAL_DIV; - std::list device_list = forward_group[0].GetDevicesList(); + std::vector device_list = forward_group[0].GetDevicesList(); auto divisor = static_cast(device_list.size()); py::tuple tuple = py::make_tuple(divisor); mindspore::tensor::TensorPtr tensor_ptr = std::make_shared(tuple, dtype); diff --git a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h b/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h index e9f03bcdee..6f26b99ffb 100644 --- a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h +++ b/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_REDUCE_SUM_INFO_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/reshape_info.h b/mindspore/ccsrc/parallel/ops_info/reshape_info.h index a8a9323540..982894a8e0 100644 --- a/mindspore/ccsrc/parallel/ops_info/reshape_info.h +++ b/mindspore/ccsrc/parallel/ops_info/reshape_info.h @@ -19,7 +19,6 @@ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h b/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h index 1ef7341f3b..304e336adf 100644 --- a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h +++ b/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h @@ -20,6 +20,7 @@ #include #include #include + #include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/transpose_info.h b/mindspore/ccsrc/parallel/ops_info/transpose_info.h index 6c5e98e3b9..c7c1c96675 100644 --- a/mindspore/ccsrc/parallel/ops_info/transpose_info.h +++ b/mindspore/ccsrc/parallel/ops_info/transpose_info.h @@ -17,11 +17,11 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TRANSPOSE_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TRANSPOSE_INFO_H_ -#include #include #include #include #include + #include "ir/value.h" #include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h b/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h index d22565d305..c4fdfcef04 100644 --- a/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h +++ b/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h @@ -17,11 +17,11 @@ #ifndef PARALLEL_OPS_INFO_DATASET_INFO_H_ #define PARALLEL_OPS_INFO_DATASET_INFO_H_ -#include #include #include #include #include + #include "ir/value.h" #include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/status.h b/mindspore/ccsrc/parallel/status.h index 4c018c7c17..9d773f0d9b 100644 --- a/mindspore/ccsrc/parallel/status.h +++ b/mindspore/ccsrc/parallel/status.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_STATUS_H_ #include -#include namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/step_parallel.cc b/mindspore/ccsrc/parallel/step_parallel.cc index 927acea705..379a8a473e 100644 --- a/mindspore/ccsrc/parallel/step_parallel.cc +++ b/mindspore/ccsrc/parallel/step_parallel.cc @@ -19,7 +19,7 @@ #include #include #include -#include + #include #include #include diff --git a/mindspore/ccsrc/parallel/step_parallel.h b/mindspore/ccsrc/parallel/step_parallel.h index ac7376a09d..2d1982dc9c 100644 --- a/mindspore/ccsrc/parallel/step_parallel.h +++ b/mindspore/ccsrc/parallel/step_parallel.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_PARALLEL_STEP_PARALLEL_H_ #include -#include + #include #include #include diff --git a/mindspore/ccsrc/parallel/strategy.h b/mindspore/ccsrc/parallel/strategy.h index 24879c12c1..68ba4962d7 100644 --- a/mindspore/ccsrc/parallel/strategy.h +++ b/mindspore/ccsrc/parallel/strategy.h @@ -18,7 +18,6 @@ #define MINDSPORE_CCSRC_PARALLEL_STRATEGY_H_ #include -#include #include #include #include diff --git a/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h b/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h index 77955b5d1a..3515c7383a 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h +++ b/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h @@ -22,7 +22,6 @@ #include #include #include -#include #include "parallel/tensor_layout/redistribution_layout_transfer.h" #include "parallel/tensor_layout/construct_operator.h" diff --git a/tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc b/tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc index 73eff99304..d0243d5327 100644 --- a/tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc @@ -154,13 +154,13 @@ class TestDPAlgo : public UT::Common { void TestDPAlgo::SetUp() { cost_graph = std::make_shared(); cost_graph->SetDeviceMemoryAndCostParameter(); - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 10; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(8); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc b/tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc index adf06d8fcc..467f4976e8 100644 --- a/tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc @@ -42,13 +42,13 @@ class TestEdgeCostModel : public UT::Common { }; void TestEdgeCostModel::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 10; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(8); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc b/tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc index 1428193481..83a9eceacc 100644 --- a/tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc @@ -53,13 +53,13 @@ class TestCostGraph : public UT::Common { void TestCostGraph::SetUp() { cost_graph.SetDeviceMemoryAndCostParameter(); - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 10; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(8); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc b/tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc index 3b71c80c4b..3bd65c049c 100644 --- a/tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc @@ -33,13 +33,13 @@ class TestMatMulCost : public UT::Common { void TestMatMulCost::SetUp() { mmcost_ = MatMulCost(); - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); @@ -90,13 +90,13 @@ class TestActivationCost : public UT::Common { void TestActivationCost::SetUp() { ac_cost_ = ActivationCost(); - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); @@ -142,13 +142,13 @@ class TestPReLUCost : public UT::Common { void TestPReLUCost::SetUp() { prelu_cost_ = PReLUCost(); - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); diff --git a/tests/ut/cpp/parallel/device_manager_test.cc b/tests/ut/cpp/parallel/device_manager_test.cc index 0814ca64d0..056896f514 100644 --- a/tests/ut/cpp/parallel/device_manager_test.cc +++ b/tests/ut/cpp/parallel/device_manager_test.cc @@ -69,8 +69,8 @@ void TestDeviceManager::TearDown() { } TEST_F(TestDeviceManager, test_dm_init_AND_get_device_list) { - std::list dev_list; - std::list stage_map; + std::vector dev_list; + std::vector stage_map; int32_t local_dev = 0; dev_list.push_back(5); @@ -85,12 +85,12 @@ TEST_F(TestDeviceManager, test_dm_init_AND_get_device_list) { ASSERT_EQ(dm_.DeviceNum(), 4); ASSERT_EQ(dm_.GetStageNum(), (int32_t)(2)); - std::list dev_list_0 = dm_.GetDeviceListByStageId(0); - std::list dev_list_1 = dm_.GetDeviceListByStageId(1); + std::vector dev_list_0 = dm_.GetDeviceListByStageId(0); + std::vector dev_list_1 = dm_.GetDeviceListByStageId(1); ASSERT_EQ(dev_list_0.size(), 2); ASSERT_EQ(dev_list_1.size(), 2); - std::list::iterator it = dev_list_0.begin(); + std::vector::iterator it = dev_list_0.begin(); ASSERT_EQ((*it), int32_t(5)); it++; ASSERT_EQ((*it), int32_t(3)); @@ -111,13 +111,13 @@ TEST_F(TestDeviceManager, test_CreateNewDeviceByRank) { } TEST_F(TestDeviceManager, test_CreateDeviceListByRankList) { - std::list dev_list; - std::list rlist; + std::vector dev_list; + std::vector rlist; rlist.push_back(int32_t(2)); rlist.push_back(int32_t(1)); dev_list = dm_.CreateDeviceListByRankList(rlist); - std::list::iterator it = dev_list.begin(); + std::vector::iterator it = dev_list.begin(); ASSERT_EQ(it->rank(), int32_t(2)); it++; ASSERT_EQ(it->rank(), int32_t(1)); diff --git a/tests/ut/cpp/parallel/device_matrix_test.cc b/tests/ut/cpp/parallel/device_matrix_test.cc index 9c3fa9a861..877a211df8 100644 --- a/tests/ut/cpp/parallel/device_matrix_test.cc +++ b/tests/ut/cpp/parallel/device_matrix_test.cc @@ -35,9 +35,9 @@ TEST_F(TestDeviceMatrix, Test2Dgroup_list) { Shape shape = {2, 3}; DeviceMatrix arr(0, dev_list, shape); - std::list group_list; + std::vector group_list; if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list(); - std::list group_list_expect = {{0, 3}, {0, 1, 2}}; + std::vector group_list_expect = {{0, 3}, {0, 1, 2}}; ASSERT_EQ(group_list, group_list_expect); } @@ -46,9 +46,9 @@ TEST_F(TestDeviceMatrix, Test3Dgroup_list) { Shape shape = {2, 2, 3}; DeviceMatrix arr(5, dev_list, shape); - std::list group_list; + std::vector group_list; if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list(); - std::list group_list_expect = {{5, 11}, {2, 5}, {3, 4, 5}}; + std::vector group_list_expect = {{5, 11}, {2, 5}, {3, 4, 5}}; ASSERT_EQ(group_list, group_list_expect); } @@ -57,9 +57,9 @@ TEST_F(TestDeviceMatrix, Test4DGetAlongDim) { Shape shape = {2, 1, 4, 2}; DeviceMatrix arr(5, dev_list, shape); - std::list group_list; + std::vector group_list; if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list(); - std::list group_list_expect = {{5, 13}, {5}, {1, 3, 5, 7}, {4, 5}}; + std::vector group_list_expect = {{5, 13}, {5}, {1, 3, 5, 7}, {4, 5}}; ASSERT_EQ(group_list, group_list_expect); } @@ -69,9 +69,9 @@ TEST_F(TestDeviceMatrix, Test5DGetAlongDim) { Shape shape = {3, 4, 2, 3, 2}; DeviceMatrix arr(5, dev_list, shape); - std::list group_list; + std::vector group_list; if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list(); - std::list group_list_expect = {{5, 53, 101}, {5, 17, 29, 41}, {5, 11}, {1, 3, 5}, {4, 5}}; + std::vector group_list_expect = {{5, 53, 101}, {5, 17, 29, 41}, {5, 11}, {1, 3, 5}, {4, 5}}; ASSERT_EQ(group_list, group_list_expect); } diff --git a/tests/ut/cpp/parallel/group_manager_test.cc b/tests/ut/cpp/parallel/group_manager_test.cc index 1e9ec9c060..e3d2b3a364 100644 --- a/tests/ut/cpp/parallel/group_manager_test.cc +++ b/tests/ut/cpp/parallel/group_manager_test.cc @@ -42,7 +42,7 @@ void TestGroup::TearDown() { Status TestGroup::Init() { std::string gname = "1-2"; - std::list dev_list; + std::vector dev_list; Device one = Device(int32_t(1)); dev_list.push_back(one); Device two = Device(int32_t(2)); @@ -55,8 +55,8 @@ TEST_F(TestGroup, test_Init) { ASSERT_EQ(Init(), Status::SUCCESS); } TEST_F(TestGroup, test_GetDevicesList) { Init(); - std::list res_dev_list = gp.GetDevicesList(); - std::list::iterator it = res_dev_list.begin(); + std::vector res_dev_list = gp.GetDevicesList(); + std::vector::iterator it = res_dev_list.begin(); ASSERT_EQ(it->rank(), int32_t(1)); it++; ASSERT_EQ(it->rank(), int32_t(2)); @@ -88,7 +88,7 @@ void TestGroupManager::TearDown() { Status TestGroupManager::Init(Group** gp_ptr) { std::string gname = "1-2"; - std::list dev_list; + std::vector dev_list; Device one = Device(int32_t(1)); dev_list.push_back(one); Device two = Device(int32_t(2)); @@ -102,15 +102,15 @@ TEST_F(TestGroupManager, test_CreateGroup) { Group* gp_ptr = new Group(); ASSERT_EQ(Init(&gp_ptr), Status::SUCCESS); - std::list res_dev_list = gp_ptr->GetDevicesList(); - std::list::iterator it = res_dev_list.begin(); + std::vector res_dev_list = gp_ptr->GetDevicesList(); + std::vector::iterator it = res_dev_list.begin(); ASSERT_EQ(it->rank(), int32_t(1)); it++; ASSERT_EQ(it->rank(), int32_t(2)); delete gp_ptr; // testing for creating a group with an existing group name - std::list dev_list2; + std::vector dev_list2; Device three = Device(int32_t(3)); dev_list2.push_back(three); Device four = Device(int32_t(4)); @@ -119,8 +119,8 @@ TEST_F(TestGroupManager, test_CreateGroup) { ASSERT_EQ(gm.CreateGroup("1-2", dev_list2, gp_ptr), Status::SUCCESS); ASSERT_STREQ(gp_ptr->name().data(), "1-2"); - std::list res_dev_list2 = gp_ptr->GetDevicesList(); - std::list::iterator it2 = res_dev_list2.begin(); + std::vector res_dev_list2 = gp_ptr->GetDevicesList(); + std::vector::iterator it2 = res_dev_list2.begin(); ASSERT_EQ(it2->rank(), int32_t(1)); it2++; ASSERT_EQ(it2->rank(), int32_t(2)); @@ -136,8 +136,8 @@ TEST_F(TestGroupManager, test_FindGroup) { ASSERT_EQ(gm.FindGroup(gname, &gp_ptr2), Status::SUCCESS); - std::list res_dev_list = gp_ptr2->GetDevicesList(); - std::list::iterator it = res_dev_list.begin(); + std::vector res_dev_list = gp_ptr2->GetDevicesList(); + std::vector::iterator it = res_dev_list.begin(); ASSERT_EQ(it->rank(), int32_t(1)); it++; ASSERT_EQ(it->rank(), int32_t(2)); diff --git a/tests/ut/cpp/parallel/ops_info/activation_info_test.cc b/tests/ut/cpp/parallel/ops_info/activation_info_test.cc index a725cb0bf7..a9fe9b4c48 100644 --- a/tests/ut/cpp/parallel/ops_info/activation_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/activation_info_test.cc @@ -38,13 +38,13 @@ class TestActivationInfo : public UT::Common { }; void TestActivationInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); diff --git a/tests/ut/cpp/parallel/ops_info/activation_test.cc b/tests/ut/cpp/parallel/ops_info/activation_test.cc index 200b96eb2e..149aa9d5af 100644 --- a/tests/ut/cpp/parallel/ops_info/activation_test.cc +++ b/tests/ut/cpp/parallel/ops_info/activation_test.cc @@ -40,13 +40,13 @@ class TestActivation : public UT::Common { }; void TestActivation::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); diff --git a/tests/ut/cpp/parallel/ops_info/dropout_do_mask_info_test.cc b/tests/ut/cpp/parallel/ops_info/dropout_do_mask_info_test.cc index 5ae79e2851..2f17fb4450 100644 --- a/tests/ut/cpp/parallel/ops_info/dropout_do_mask_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/dropout_do_mask_info_test.cc @@ -38,13 +38,13 @@ class TestDropoutDoMaskInfo : public UT::Common { }; void TestDropoutDoMaskInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 34; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(32); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/gelu_info_test.cc b/tests/ut/cpp/parallel/ops_info/gelu_info_test.cc index d07794f63d..e54d1f2423 100644 --- a/tests/ut/cpp/parallel/ops_info/gelu_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/gelu_info_test.cc @@ -38,13 +38,13 @@ class TestGeluInfo : public UT::Common { }; void TestGeluInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 130; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(128); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc b/tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc index 81b1d3a1ec..947ad60cca 100644 --- a/tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc +++ b/tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc @@ -34,13 +34,13 @@ class TestGenerateStrategy : public UT::Common { }; void TestGenerateStrategy::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 10; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(8); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/generator_info_test.cc b/tests/ut/cpp/parallel/ops_info/generator_info_test.cc index bfd14ced30..eb463066a6 100644 --- a/tests/ut/cpp/parallel/ops_info/generator_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/generator_info_test.cc @@ -38,13 +38,13 @@ class TestDropoutGenMaskInfo : public UT::Common { }; void TestDropoutGenMaskInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 10; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(8); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/get_next_info_test.cc b/tests/ut/cpp/parallel/ops_info/get_next_info_test.cc index 1276a30225..503edf2eda 100644 --- a/tests/ut/cpp/parallel/ops_info/get_next_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/get_next_info_test.cc @@ -38,13 +38,13 @@ class TestGetNextInfo : public UT::Common { }; void TestGetNextInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 8; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(8); int32_t local_dev = 0; // create a new g_device_manager diff --git a/tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc b/tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc index 07a160ec99..b59481e1f6 100644 --- a/tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc @@ -38,13 +38,13 @@ class TestL2NormalizeInfo : public UT::Common { }; void TestL2NormalizeInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 34; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(32); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc b/tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc index 1c31463c88..cf5a4239a2 100644 --- a/tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc @@ -38,13 +38,13 @@ class TestLogSoftmaxInfo : public UT::Common { }; void TestLogSoftmaxInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 130; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(128); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/matmul_info_test.cc b/tests/ut/cpp/parallel/ops_info/matmul_info_test.cc index 02f4488744..978b792a0c 100644 --- a/tests/ut/cpp/parallel/ops_info/matmul_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/matmul_info_test.cc @@ -42,13 +42,13 @@ class TestMatmulInfo : public UT::Common { }; void TestMatmulInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); diff --git a/tests/ut/cpp/parallel/ops_info/onehot_info_test.cc b/tests/ut/cpp/parallel/ops_info/onehot_info_test.cc index df67175ae6..07d150a294 100644 --- a/tests/ut/cpp/parallel/ops_info/onehot_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/onehot_info_test.cc @@ -38,13 +38,13 @@ class TestOneHotInfo : public UT::Common { }; void TestOneHotInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 10; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(8); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc b/tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc index 17fe365176..c89bf97fb3 100644 --- a/tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc +++ b/tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc @@ -38,13 +38,13 @@ class TestOneHotInfo2 : public UT::Common { }; void TestOneHotInfo2::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 10; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(8); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/pow_info_test.cc b/tests/ut/cpp/parallel/ops_info/pow_info_test.cc index 86d62190a7..f6ea2c3d3c 100644 --- a/tests/ut/cpp/parallel/ops_info/pow_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/pow_info_test.cc @@ -38,13 +38,13 @@ class TestPowInfo : public UT::Common { }; void TestPowInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 66; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(64); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/prelu_test.cc b/tests/ut/cpp/parallel/ops_info/prelu_test.cc index bb815921e0..5ff261234f 100644 --- a/tests/ut/cpp/parallel/ops_info/prelu_test.cc +++ b/tests/ut/cpp/parallel/ops_info/prelu_test.cc @@ -39,13 +39,13 @@ class TestPReLUInfo : public UT::Common { }; void TestPReLUInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); int32_t local_dev = 0; diff --git a/tests/ut/cpp/parallel/ops_info/reduce_method_test.cc b/tests/ut/cpp/parallel/ops_info/reduce_method_test.cc index 0ce81b0cd0..a1fe46ca33 100644 --- a/tests/ut/cpp/parallel/ops_info/reduce_method_test.cc +++ b/tests/ut/cpp/parallel/ops_info/reduce_method_test.cc @@ -39,13 +39,13 @@ class TestReduceSumInfo : public UT::Common { void TestReduceSumInfo::SetUp() { UT::InitPythonPath(); - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 34; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(32); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/reshape_test.cc b/tests/ut/cpp/parallel/ops_info/reshape_test.cc index 73a0d68be5..7ff94e9af5 100644 --- a/tests/ut/cpp/parallel/ops_info/reshape_test.cc +++ b/tests/ut/cpp/parallel/ops_info/reshape_test.cc @@ -38,13 +38,13 @@ class TestReshapeInfo : public UT::Common { }; void TestReshapeInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 34; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(32); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc b/tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc index cba9b7ecd6..03634b9a6f 100644 --- a/tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc @@ -38,13 +38,13 @@ class TestSoftmaxLoss : public UT::Common { }; void TestSoftmaxLoss::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 65; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(64); stage_map.push_back(1); diff --git a/tests/ut/cpp/parallel/ops_info/softmax_info_test.cc b/tests/ut/cpp/parallel/ops_info/softmax_info_test.cc index 65fd46fb9c..bba6e89626 100644 --- a/tests/ut/cpp/parallel/ops_info/softmax_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/softmax_info_test.cc @@ -39,13 +39,13 @@ class TestSoftmaxInfo : public UT::Common { }; void TestSoftmaxInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 130; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(128); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/tanh_info_test.cc b/tests/ut/cpp/parallel/ops_info/tanh_info_test.cc index 3ee99d093f..a892c5c84a 100644 --- a/tests/ut/cpp/parallel/ops_info/tanh_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/tanh_info_test.cc @@ -38,13 +38,13 @@ class TestTanhInfo : public UT::Common { }; void TestTanhInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 130; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(128); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc b/tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc index 612b344514..e7736a4b3e 100644 --- a/tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc @@ -38,13 +38,13 @@ class TestTensorAddInfo : public UT::Common { }; void TestTensorAddInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 34; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(32); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc b/tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc index 7edeb5a553..ce1238baeb 100644 --- a/tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc +++ b/tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc @@ -38,13 +38,13 @@ class TestTmpIdentityInfo : public UT::Common { }; void TestTmpIdentityInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); diff --git a/tests/ut/cpp/parallel/ops_info/transpose_test.cc b/tests/ut/cpp/parallel/ops_info/transpose_test.cc index d54258915d..991ec47820 100644 --- a/tests/ut/cpp/parallel/ops_info/transpose_test.cc +++ b/tests/ut/cpp/parallel/ops_info/transpose_test.cc @@ -38,13 +38,13 @@ class TestTransposeInfo : public UT::Common { }; void TestTransposeInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 34; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(32); stage_map.push_back(2); diff --git a/tests/ut/cpp/parallel/step_auto_parallel_test.cc b/tests/ut/cpp/parallel/step_auto_parallel_test.cc index 5503377ee2..a1474ca244 100644 --- a/tests/ut/cpp/parallel/step_auto_parallel_test.cc +++ b/tests/ut/cpp/parallel/step_auto_parallel_test.cc @@ -32,13 +32,13 @@ class TestStepAutoParallel : public UT::Common { }; void TestStepAutoParallel::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 20; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(16); stage_map.push_back(4); diff --git a/tests/ut/cpp/parallel/step_parallel_test.cc b/tests/ut/cpp/parallel/step_parallel_test.cc index 23debf11ac..afc898907b 100644 --- a/tests/ut/cpp/parallel/step_parallel_test.cc +++ b/tests/ut/cpp/parallel/step_parallel_test.cc @@ -34,13 +34,13 @@ class TestStepParallel : public UT::Common { void TestStepParallel::SetUp() { UT::InitPythonPath(); } void Init_Device_Manager() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 20; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(16); stage_map.push_back(4); diff --git a/tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc b/tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc index bebe55250b..2ba8cc9dfc 100644 --- a/tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc @@ -39,12 +39,12 @@ class TestConstructOperator : public UT::Common { }; void TestConstructOperator::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); diff --git a/tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc b/tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc index 5ffd9b22ce..1b1dd4af04 100644 --- a/tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc @@ -28,13 +28,13 @@ class TestRedistributionOperatorInfer : public UT::Common { TestRedistributionOperatorInfer() {} void SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 1050; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(1024); stage_map.push_back(26); diff --git a/tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc b/tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc index ad20793417..572763faa3 100644 --- a/tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc @@ -33,7 +33,7 @@ class TestTensorRedistribution : public UT::Common { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(16); stage_map.push_back(4); diff --git a/tests/ut/cpp/parallel/virtual_dataset_test.cc b/tests/ut/cpp/parallel/virtual_dataset_test.cc index 602a7370f1..1d3ff081c7 100644 --- a/tests/ut/cpp/parallel/virtual_dataset_test.cc +++ b/tests/ut/cpp/parallel/virtual_dataset_test.cc @@ -37,13 +37,13 @@ class TestVirtualDatasetInfo : public UT::Common { }; void TestVirtualDatasetInfo::SetUp() { - std::list dev_list; + std::vector dev_list; for (int32_t i = 0; i < 130; i++) { dev_list.push_back(i); } - std::list stage_map; + std::vector stage_map; stage_map.push_back(16); stage_map.push_back(114);