Skip to content

M
mindspore

正统之独孤求败 / mindspore
与 Fork 源项目一致

Fork自 MindSpore / mindspore

通知 1
Star 0
Fork 0
M
mindspore

体验新版 GitCode，发现更多精彩内容 >>

提交 da447b8d 编写于 作者: M mindspore-ci-bot 提交者： Gitee
浏览文件
操作

!45 use std::vector instead of std::list to promote performance for parallel module 

Merge pull request !45 from chentingting/permote_auto_prallel_performance
上级 04c10bb9 3bb48ffe
隐藏空白更改
内联 并排
Showing with 141 addition and 160 deletion
mindspore/ccsrc/parallel/context.cc
浏览文件 @ da447b8d
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <utility> #include <utility>
#include <numeric> #include <numeric>
#include <functional> #include <functional>
#include <list>
#include <memory> #include <memory>
#include "parallel/device_manager.h" #include "parallel/device_manager.h"
......
mindspore/ccsrc/parallel/context.h
浏览文件 @ da447b8d
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include <vector> #include <vector>
#include <list>
#include <memory> #include <memory>
#include "parallel/status.h" #include "parallel/status.h"
......
mindspore/ccsrc/parallel/device.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_DEVICE_H_ #define MINDSPORE_CCSRC_PARALLEL_DEVICE_H_
#include <cstdint> #include <cstdint>
#include <list>
#include <string> #include <string>
#include <utility> #include <utility>
......
mindspore/ccsrc/parallel/device_manager.cc
浏览文件 @ da447b8d
...@@ -30,7 +30,7 @@ namespace mindspore { ...@@ -30,7 +30,7 @@ namespace mindspore {
namespace parallel { namespace parallel {
DeviceManagerPtr g_device_manager = nullptr; DeviceManagerPtr g_device_manager = nullptr;
Stage::Stage(const std::list<mindspore::parallel::Device>& devices, int num, int rank) Stage::Stage(const std::vector<mindspore::parallel::Device>& devices, int num, int rank)
: devices_(devices), number_(num), rank_(rank) { : devices_(devices), number_(num), rank_(rank) {
gm_ = GroupManager(); gm_ = GroupManager();
} }
...@@ -104,7 +104,7 @@ int32_t GetListMemberByIndex(size_t index, const RankList& devices) { ...@@ -104,7 +104,7 @@ int32_t GetListMemberByIndex(size_t index, const RankList& devices) {
return result; return result;
} }
std::shared_ptr<Device> GetListMemberByIndex(size_t index, const std::list<std::shared_ptr<Device>>& device_list) { std::shared_ptr<Device> GetListMemberByIndex(size_t index, const std::vector<std::shared_ptr<Device>>& device_list) {
size_t i = 0; size_t i = 0;
std::shared_ptr<Device> result; std::shared_ptr<Device> result;
if ((device_list.empty()) || (index >= device_list.size())) { if ((device_list.empty()) || (index >= device_list.size())) {
...@@ -178,7 +178,7 @@ Status DeviceManager::Init(const RankList& devices, int32_t global_device_rank, ...@@ -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"; MS_LOG(ERROR) << "The number of 'devices' in a stage must be positive";
return Status::FAILED; return Status::FAILED;
} }
std::list<Device> curr_dev_list; std::vector<Device> curr_dev_list;
for (int i = 0; i < num_device; ++i) { for (int i = 0; i < num_device; ++i) {
curr_dev_list.push_back(*GetListMemberByIndex(global_index, devices_)); curr_dev_list.push_back(*GetListMemberByIndex(global_index, devices_));
global_index++; global_index++;
...@@ -278,8 +278,8 @@ RankList DeviceManager::global_device_list(int32_t stage_id, int32_t rank, int32 ...@@ -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); } Device DeviceManager::CreateNewDeviceByRank(int32_t rank) const { return Device(rank); }
std::list<Device> DeviceManager::CreateDeviceListByRankList(RankList ranks) { std::vector<Device> DeviceManager::CreateDeviceListByRankList(RankList ranks) {
std::list<Device> dev_list; std::vector<Device> dev_list;
for (auto& rank : ranks) { for (auto& rank : ranks) {
Device one = CreateNewDeviceByRank(rank); Device one = CreateNewDeviceByRank(rank);
dev_list.push_back(one); dev_list.push_back(one);
...@@ -312,8 +312,8 @@ std::string HashName(const std::string& origin_name) { return std::to_string(std ...@@ -312,8 +312,8 @@ std::string HashName(const std::string& origin_name) { return std::to_string(std
// is '0-1-3-5-7'. // is '0-1-3-5-7'.
std::string DeviceManager::GenerateGroupNameByRanks(RankList ranks) { std::string DeviceManager::GenerateGroupNameByRanks(RankList ranks) {
std::string rank_list_name; std::string rank_list_name;
std::list<int32_t>::iterator it; std::vector<int32_t>::iterator it;
ranks.sort(); // sorted in increasing order std::sort(ranks.begin(), ranks.end()); // sorted in increasing order
for (it = ranks.begin(); it != ranks.end(); ++it) { for (it = ranks.begin(); it != ranks.end(); ++it) {
if (it == ranks.begin()) { if (it == ranks.begin()) {
rank_list_name = std::to_string(*it); rank_list_name = std::to_string(*it);
...@@ -343,7 +343,8 @@ std::string DeviceManager::GenerateGroupNameByRanks(RankList ranks) { ...@@ -343,7 +343,8 @@ std::string DeviceManager::GenerateGroupNameByRanks(RankList ranks) {
// Create the group with the given devices and the given name. The GroupManager // 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 // 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. // name. Otherwise, let the pointer g point to that group.
Group DeviceManager::CreateGroup(const std::string& group_name, const std::list<mindspore::parallel::Device>& devices) { Group DeviceManager::CreateGroup(const std::string& group_name,
const std::vector<mindspore::parallel::Device>& devices) {
if ((world_group() == NCCL_WORLD_GROUP) && (devices.size() != devices_.size())) { if ((world_group() == NCCL_WORLD_GROUP) && (devices.size() != devices_.size())) {
MS_LOG(EXCEPTION) << "Do not support sub group for nccl"; MS_LOG(EXCEPTION) << "Do not support sub group for nccl";
} }
...@@ -360,7 +361,7 @@ Group DeviceManager::CreateGroup(const RankList& dev_ranks) { ...@@ -360,7 +361,7 @@ Group DeviceManager::CreateGroup(const RankList& dev_ranks) {
} }
std::string group_name = GenerateGroupNameByRanks(dev_ranks); std::string group_name = GenerateGroupNameByRanks(dev_ranks);
std::list<Device> dev_list = CreateDeviceListByRankList(dev_ranks); auto dev_list = CreateDeviceListByRankList(dev_ranks);
return CreateGroup(group_name, dev_list); return CreateGroup(group_name, dev_list);
} }
......
mindspore/ccsrc/parallel/device_manager.h
浏览文件 @ da447b8d
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include <list> #include <vector>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
...@@ -50,19 +50,19 @@ class Stage { ...@@ -50,19 +50,19 @@ class Stage {
// This class is used in pipeline-parallelization. Available devices are partitioned into multiple stages. // 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. // Currently, the function of pipeline-parallelization and this class are NOT implemented.
public: public:
explicit Stage(std::list<Device> devices) : devices_(std::move(devices)), number_(0), rank_(0) { explicit Stage(std::vector<Device> devices) : devices_(std::move(devices)), number_(0), rank_(0) {
gm_ = GroupManager(); gm_ = GroupManager();
} }
Stage(const std::list<mindspore::parallel::Device>& devices, int num, int rank); Stage(const std::vector<mindspore::parallel::Device>& devices, int num, int rank);
~Stage() = default; ~Stage() = default;
int GetStageNum() const { return number_; } int GetStageNum() const { return number_; }
size_t GetDevicesNum() const { return devices_.size(); } size_t GetDevicesNum() const { return devices_.size(); }
std::list<Device> GetDevicesList() { return devices_; } std::vector<Device> GetDevicesList() { return devices_; }
int global_rank(Group* g) const; int global_rank(Group* g) const;
private: private:
std::list<Device> devices_; std::vector<Device> devices_;
int number_; int number_;
int32_t rank_; int32_t rank_;
GroupManager gm_; GroupManager gm_;
...@@ -89,10 +89,10 @@ class DeviceManager { ...@@ -89,10 +89,10 @@ class DeviceManager {
RankList global_device_list(int32_t stage_id, int32_t rank, int32_t split_num) const; RankList global_device_list(int32_t stage_id, int32_t rank, int32_t split_num) const;
Device CreateNewDeviceByRank(int32_t rank) const; Device CreateNewDeviceByRank(int32_t rank) const;
std::list<Device> CreateDeviceListByRankList(RankList ranks); std::vector<Device> CreateDeviceListByRankList(RankList ranks);
std::string GenerateGroupNameByRanks(RankList dev_ranks); std::string GenerateGroupNameByRanks(RankList dev_ranks);
Group CreateGroup(const std::string& group_name, const std::list<Device>& devices); Group CreateGroup(const std::string& group_name, const std::vector<Device>& devices);
Group CreateGroup(const RankList& dev_ranks); Group CreateGroup(const RankList& dev_ranks);
std::shared_ptr<Stage> GetStageById(int32_t stage_id); std::shared_ptr<Stage> GetStageById(int32_t stage_id);
...@@ -108,11 +108,11 @@ class DeviceManager { ...@@ -108,11 +108,11 @@ class DeviceManager {
std::string FindRankListNameByHashName(const std::string& hash_name); std::string FindRankListNameByHashName(const std::string& hash_name);
private: private:
std::list<std::shared_ptr<Device>> devices_; std::vector<std::shared_ptr<Device>> devices_;
// each stage has a list of devices // each stage has a list of devices
std::list<std::list<int32_t>> stage_devices_; std::vector<std::vector<int32_t>> stage_devices_;
std::shared_ptr<Device> device_; std::shared_ptr<Device> device_;
std::list<std::shared_ptr<Stage>> stages_; std::vector<std::shared_ptr<Stage>> stages_;
GroupManager gm_; GroupManager gm_;
std::string backend_; std::string backend_;
......
mindspore/ccsrc/parallel/device_matrix.cc
浏览文件 @ da447b8d
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <utility> #include <utility>
#include <numeric> #include <numeric>
#include <functional> #include <functional>
#include <list> #include <vector>
#include "parallel/status.h" #include "parallel/status.h"
#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/operator_info.h"
...@@ -64,7 +64,7 @@ Status DeviceMatrix::GetDevicesAlongDim(const uint32_t& dim, RankList* devices) ...@@ -64,7 +64,7 @@ Status DeviceMatrix::GetDevicesAlongDim(const uint32_t& dim, RankList* devices)
} }
RankList group; RankList group;
std::list<RankList> local_group_list; std::vector<RankList> local_group_list;
// lower than dim // lower than dim
int32_t step = 1; int32_t step = 1;
...@@ -160,7 +160,7 @@ std::string ShapeToString(const Shape& shape) { ...@@ -160,7 +160,7 @@ std::string ShapeToString(const Shape& shape) {
return str + "]"; return str + "]";
} }
std::string ListToString(const std::list<int32_t>& list) { std::string ListToString(const std::vector<int32_t>& list) {
std::string str = "["; std::string str = "[";
for (auto& element : list) { for (auto& element : list) {
str += std::to_string(element) + ", "; str += std::to_string(element) + ", ";
......
mindspore/ccsrc/parallel/device_matrix.h
浏览文件 @ da447b8d
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include <vector> #include <vector>
#include <list>
#include "parallel/status.h" #include "parallel/status.h"
#include "utils/convert_utils.h" #include "utils/convert_utils.h"
...@@ -28,7 +27,7 @@ ...@@ -28,7 +27,7 @@
namespace mindspore { namespace mindspore {
namespace parallel { namespace parallel {
using RankList = std::list<int32_t>; using RankList = std::vector<int32_t>;
using Shape = std::vector<int32_t>; using Shape = std::vector<int32_t>;
class DeviceMatrix { class DeviceMatrix {
...@@ -36,7 +35,7 @@ class DeviceMatrix { ...@@ -36,7 +35,7 @@ class DeviceMatrix {
DeviceMatrix(int32_t rank, RankList devices, Shape dev_shape); DeviceMatrix(int32_t rank, RankList devices, Shape dev_shape);
DeviceMatrix() = default; DeviceMatrix() = default;
~DeviceMatrix() = default; ~DeviceMatrix() = default;
std::list<RankList> group_list() const { return group_list_; } std::vector<RankList> group_list() const { return group_list_; }
Status CreateGroupList(); Status CreateGroupList();
Status GetDevicesByTensorMap(const Shape& tensor_map, RankList* rank_list); Status GetDevicesByTensorMap(const Shape& tensor_map, RankList* rank_list);
Status GetDevicesAlongDim(const uint32_t& dim, RankList* devices); Status GetDevicesAlongDim(const uint32_t& dim, RankList* devices);
...@@ -46,11 +45,11 @@ class DeviceMatrix { ...@@ -46,11 +45,11 @@ class DeviceMatrix {
RankList dev_list_; RankList dev_list_;
// From low dim to high dim. eg: [D0 D1 D2 D3] // From low dim to high dim. eg: [D0 D1 D2 D3]
Shape dev_shape_; Shape dev_shape_;
std::list<RankList> group_list_; std::vector<RankList> group_list_;
}; };
std::string ShapeToString(const Shape& shape); std::string ShapeToString(const Shape& shape);
std::string ListToString(const std::list<int32_t>& list); std::string ListToString(const std::vector<int32_t>& list);
} // namespace parallel } // namespace parallel
} // namespace mindspore } // namespace mindspore
......
mindspore/ccsrc/parallel/graph_util/generate_graph.cc
浏览文件 @ da447b8d
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "parallel/graph_util/generate_graph.h" #include "parallel/graph_util/generate_graph.h"
#include <algorithm> #include <algorithm>
#include <list>
#include <memory> #include <memory>
#include <string> #include <string>
#include <utility> #include <utility>
......
mindspore/ccsrc/parallel/graph_util/generate_graph.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_GRAPH_UTIL_GENERATE_GRAPH_H_ #define MINDSPORE_CCSRC_PARALLEL_GRAPH_UTIL_GENERATE_GRAPH_H_
#include <vector> #include <vector>
#include <list>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <map> #include <map>
......
mindspore/ccsrc/parallel/group_manager.cc
浏览文件 @ da447b8d
...@@ -30,13 +30,13 @@ Group::Group() { ...@@ -30,13 +30,13 @@ Group::Group() {
devices_.clear(); devices_.clear();
} }
Status Group::Init(const std::string &name, const std::list<Device> &devices) { Status Group::Init(const std::string &name, const std::vector<Device> &devices) {
this->name_ = name; this->name_ = name;
this->devices_ = devices; this->devices_ = devices;
return Status::SUCCESS; return Status::SUCCESS;
} }
std::list<Device> Group::GetDevicesList() const { return devices_; } std::vector<Device> Group::GetDevicesList() const { return devices_; }
bool Group::IsInThisGroup(int32_t device_rank) { bool Group::IsInThisGroup(int32_t device_rank) {
for (auto &device : devices_) { for (auto &device : devices_) {
...@@ -66,7 +66,7 @@ Status Group::GetIndex(size_t *index) { ...@@ -66,7 +66,7 @@ Status Group::GetIndex(size_t *index) {
GroupManager::GroupManager() { groups_.clear(); } GroupManager::GroupManager() { groups_.clear(); }
Status GroupManager::CreateGroup(const std::string &group_name, const std::list<Device> &devices, Status GroupManager::CreateGroup(const std::string &group_name, const std::vector<Device> &devices,
mindspore::parallel::Group *const group) { mindspore::parallel::Group *const group) {
// it is simple to use size to determine whether it is a world group // it is simple to use size to determine whether it is a world group
uint32_t world_size = 0; uint32_t world_size = 0;
......
mindspore/ccsrc/parallel/group_manager.h
浏览文件 @ da447b8d
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define MINDSPORE_CCSRC_PARALLEL_GROUP_MANAGER_H_ #define MINDSPORE_CCSRC_PARALLEL_GROUP_MANAGER_H_
#include <cstdint> #include <cstdint>
#include <list> #include <vector>
#include <map> #include <map>
#include <string> #include <string>
...@@ -37,8 +37,8 @@ class Group { ...@@ -37,8 +37,8 @@ class Group {
public: public:
Group(); Group();
~Group() = default; ~Group() = default;
Status Init(const std::string& name, const std::list<Device>& devices); Status Init(const std::string& name, const std::vector<Device>& devices);
std::list<Device> GetDevicesList() const; std::vector<Device> GetDevicesList() const;
std::string name() const { return name_; } std::string name() const { return name_; }
bool IsInThisGroup(int32_t device_rank); bool IsInThisGroup(int32_t device_rank);
Status GetIndex(size_t* index); Status GetIndex(size_t* index);
...@@ -46,7 +46,7 @@ class Group { ...@@ -46,7 +46,7 @@ class Group {
private: private:
std::string name_; std::string name_;
std::list<Device> devices_; std::vector<Device> devices_;
}; };
class GroupManager { class GroupManager {
...@@ -54,7 +54,7 @@ class GroupManager { ...@@ -54,7 +54,7 @@ class GroupManager {
GroupManager(); GroupManager();
~GroupManager() = default; ~GroupManager() = default;
Status CreateGroup(const std::string& name, const std::list<Device>& devices, Group* group); Status CreateGroup(const std::string& name, const std::vector<Device>& devices, Group* group);
Status DestroyGroup(Group* group); Status DestroyGroup(Group* group);
Status DestroyAllGroups(); Status DestroyAllGroups();
Status GetRankID(const std::string& name, unsigned int* rank_id); Status GetRankID(const std::string& name, unsigned int* rank_id);
......
mindspore/ccsrc/parallel/ops_info/activation_info.h
浏览文件 @ da447b8d
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <ir/value.h> #include <ir/value.h>
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/ops_info/arithmetic_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ARITHMETIC_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ARITHMETIC_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h
浏览文件 @ da447b8d
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BATCH_PARALLEL_INFO_H_ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BATCH_PARALLEL_INFO_H_
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BATCH_PARALLEL_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BATCH_PARALLEL_INFO_H_
#include <list>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
......
mindspore/ccsrc/parallel/ops_info/bias_add_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BIAS_ADD_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BIAS_ADD_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/ops_info/comparison_function_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_COMPARISON_FUNCTION_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_COMPARISON_FUNCTION_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "ir/value.h" #include "ir/value.h"
......
mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_DROPOUT_DO_MASK_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_DROPOUT_DO_MASK_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/ops_info/elementary_function_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ELEMENTARY_FUNCTION_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ELEMENTARY_FUNCTION_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "ir/value.h" #include "ir/value.h"
......
mindspore/ccsrc/parallel/ops_info/generator_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GENERATOR_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GENERATOR_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/ops_info/get_next_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GETNEXT_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GETNEXT_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_L2_NORMALIZE_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_L2_NORMALIZE_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/ops_info/loss_info.h
浏览文件 @ da447b8d
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_LOSS_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_LOSS_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "ir/value.h" #include "ir/value.h"
#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/operator_info.h"
#include "parallel/ops_info/activation_info.h" #include "parallel/ops_info/activation_info.h"
......
mindspore/ccsrc/parallel/ops_info/matmul_info.cc
浏览文件 @ da447b8d
...@@ -397,7 +397,7 @@ Status MatMulBase::GenerateStrategies(int32_t stage_id) { ...@@ -397,7 +397,7 @@ Status MatMulBase::GenerateStrategies(int32_t stage_id) {
return FAILED; return FAILED;
} }
CheckGlobalDeviceManager(); CheckGlobalDeviceManager();
std::list<int32_t> dev_list = g_device_manager->GetDeviceListByStageId(stage_id); std::vector<int32_t> dev_list = g_device_manager->GetDeviceListByStageId(stage_id);
size_t dev_num = dev_list.size(); size_t dev_num = dev_list.size();
Shape input0_shape = inputs_shape_[0], input1_shape = inputs_shape_[1]; Shape input0_shape = inputs_shape_[0], input1_shape = inputs_shape_[1];
if (transpose_a_) { if (transpose_a_) {
......
mindspore/ccsrc/parallel/ops_info/matmul_info.h
浏览文件 @ da447b8d
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_MATMUL_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_MATMUL_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "ir/value.h" #include "ir/value.h"
#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/operator_info.h"
#include "parallel/strategy.h" #include "parallel/strategy.h"
......
mindspore/ccsrc/parallel/ops_info/onehot_info.h
浏览文件 @ da447b8d
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ONEHOT_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ONEHOT_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "ir/value.h" #include "ir/value.h"
#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/operator_info.h"
#include "parallel/auto_parallel/operator_costmodel.h" #include "parallel/auto_parallel/operator_costmodel.h"
......
mindspore/ccsrc/parallel/ops_info/operator_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_OPERATOR_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_OPERATOR_INFO_H_
#include <cstdint> #include <cstdint>
#include <list>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
......
mindspore/ccsrc/parallel/ops_info/prelu_info.h
浏览文件 @ da447b8d
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
#ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_PRELU_INFO_H_ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_PRELU_INFO_H_
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_PRELU_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_PRELU_INFO_H_
#include <list>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "ir/value.h" #include "ir/value.h"
#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/operator_info.h"
#include "parallel/strategy.h" #include "parallel/strategy.h"
......
mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc
浏览文件 @ da447b8d
...@@ -198,7 +198,7 @@ ForwardOp CreatReduceMeanForwardOp(const std::vector<Group> &forward_group, cons ...@@ -198,7 +198,7 @@ ForwardOp CreatReduceMeanForwardOp(const std::vector<Group> &forward_group, cons
// Creat RealDiv op // Creat RealDiv op
OperatorName operator1_name = REAL_DIV; OperatorName operator1_name = REAL_DIV;
std::list<Device> device_list = forward_group[0].GetDevicesList(); std::vector<Device> device_list = forward_group[0].GetDevicesList();
auto divisor = static_cast<float>(device_list.size()); auto divisor = static_cast<float>(device_list.size());
py::tuple tuple = py::make_tuple(divisor); py::tuple tuple = py::make_tuple(divisor);
mindspore::tensor::TensorPtr tensor_ptr = std::make_shared<mindspore::tensor::Tensor>(tuple, dtype); mindspore::tensor::TensorPtr tensor_ptr = std::make_shared<mindspore::tensor::Tensor>(tuple, dtype);
......
mindspore/ccsrc/parallel/ops_info/reduce_method_info.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_REDUCE_SUM_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_REDUCE_SUM_INFO_H_
#include <string> #include <string>
#include <list>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/ops_info/reshape_info.h
浏览文件 @ da447b8d
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <ir/value.h> #include <ir/value.h>
#include <list>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
......
mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h
浏览文件 @ da447b8d
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <string> #include <string>
#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/operator_info.h"
#include "parallel/auto_parallel/operator_costmodel.h" #include "parallel/auto_parallel/operator_costmodel.h"
#include "parallel/strategy.h" #include "parallel/strategy.h"
......
mindspore/ccsrc/parallel/ops_info/transpose_info.h
浏览文件 @ da447b8d
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
#ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TRANSPOSE_INFO_H_ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TRANSPOSE_INFO_H_
#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TRANSPOSE_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TRANSPOSE_INFO_H_
#include <list>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "ir/value.h" #include "ir/value.h"
#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/operator_info.h"
#include "parallel/strategy.h" #include "parallel/strategy.h"
......
mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h
浏览文件 @ da447b8d
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
#ifndef PARALLEL_OPS_INFO_DATASET_INFO_H_ #ifndef PARALLEL_OPS_INFO_DATASET_INFO_H_
#define PARALLEL_OPS_INFO_DATASET_INFO_H_ #define PARALLEL_OPS_INFO_DATASET_INFO_H_
#include <list>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "ir/value.h" #include "ir/value.h"
#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/operator_info.h"
#include "parallel/strategy.h" #include "parallel/strategy.h"
......
mindspore/ccsrc/parallel/status.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_STATUS_H_ #define MINDSPORE_CCSRC_PARALLEL_STATUS_H_
#include <cstdint> #include <cstdint>
#include <list>
namespace mindspore { namespace mindspore {
namespace parallel { namespace parallel {
......
mindspore/ccsrc/parallel/step_parallel.cc
浏览文件 @ da447b8d
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <sys/time.h> #include <sys/time.h>
#include <algorithm> #include <algorithm>
#include <list>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
......
mindspore/ccsrc/parallel/step_parallel.h
浏览文件 @ da447b8d
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define MINDSPORE_CCSRC_PARALLEL_STEP_PARALLEL_H_ #define MINDSPORE_CCSRC_PARALLEL_STEP_PARALLEL_H_
#include <vector> #include <vector>
#include <list>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <map> #include <map>
......
mindspore/ccsrc/parallel/strategy.h
浏览文件 @ da447b8d
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define MINDSPORE_CCSRC_PARALLEL_STRATEGY_H_ #define MINDSPORE_CCSRC_PARALLEL_STRATEGY_H_
#include <cstdint> #include <cstdint>
#include <list>
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory> #include <memory>
......
mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h
浏览文件 @ da447b8d
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <utility> #include <utility>
#include <list>
#include "parallel/tensor_layout/redistribution_layout_transfer.h" #include "parallel/tensor_layout/redistribution_layout_transfer.h"
#include "parallel/tensor_layout/construct_operator.h" #include "parallel/tensor_layout/construct_operator.h"
......
tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc
浏览文件 @ da447b8d
...@@ -154,13 +154,13 @@ class TestDPAlgo : public UT::Common { ...@@ -154,13 +154,13 @@ class TestDPAlgo : public UT::Common {
void TestDPAlgo::SetUp() { void TestDPAlgo::SetUp() {
cost_graph = std::make_shared<CostGraph>(); cost_graph = std::make_shared<CostGraph>();
cost_graph->SetDeviceMemoryAndCostParameter(); cost_graph->SetDeviceMemoryAndCostParameter();
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 10; i++) { for (int32_t i = 0; i < 10; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(8); stage_map.push_back(8);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc
浏览文件 @ da447b8d
...@@ -42,13 +42,13 @@ class TestEdgeCostModel : public UT::Common { ...@@ -42,13 +42,13 @@ class TestEdgeCostModel : public UT::Common {
}; };
void TestEdgeCostModel::SetUp() { void TestEdgeCostModel::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 10; i++) { for (int32_t i = 0; i < 10; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(8); stage_map.push_back(8);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc
浏览文件 @ da447b8d
...@@ -53,13 +53,13 @@ class TestCostGraph : public UT::Common { ...@@ -53,13 +53,13 @@ class TestCostGraph : public UT::Common {
void TestCostGraph::SetUp() { void TestCostGraph::SetUp() {
cost_graph.SetDeviceMemoryAndCostParameter(); cost_graph.SetDeviceMemoryAndCostParameter();
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 10; i++) { for (int32_t i = 0; i < 10; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(8); stage_map.push_back(8);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc
浏览文件 @ da447b8d
...@@ -33,13 +33,13 @@ class TestMatMulCost : public UT::Common { ...@@ -33,13 +33,13 @@ class TestMatMulCost : public UT::Common {
void TestMatMulCost::SetUp() { void TestMatMulCost::SetUp() {
mmcost_ = MatMulCost(); mmcost_ = MatMulCost();
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
...@@ -90,13 +90,13 @@ class TestActivationCost : public UT::Common { ...@@ -90,13 +90,13 @@ class TestActivationCost : public UT::Common {
void TestActivationCost::SetUp() { void TestActivationCost::SetUp() {
ac_cost_ = ActivationCost(); ac_cost_ = ActivationCost();
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
...@@ -142,13 +142,13 @@ class TestPReLUCost : public UT::Common { ...@@ -142,13 +142,13 @@ class TestPReLUCost : public UT::Common {
void TestPReLUCost::SetUp() { void TestPReLUCost::SetUp() {
prelu_cost_ = PReLUCost(); prelu_cost_ = PReLUCost();
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
......
tests/ut/cpp/parallel/device_manager_test.cc
浏览文件 @ da447b8d
...@@ -69,8 +69,8 @@ void TestDeviceManager::TearDown() { ...@@ -69,8 +69,8 @@ void TestDeviceManager::TearDown() {
} }
TEST_F(TestDeviceManager, test_dm_init_AND_get_device_list) { TEST_F(TestDeviceManager, test_dm_init_AND_get_device_list) {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
int32_t local_dev = 0; int32_t local_dev = 0;
dev_list.push_back(5); dev_list.push_back(5);
...@@ -85,12 +85,12 @@ TEST_F(TestDeviceManager, test_dm_init_AND_get_device_list) { ...@@ -85,12 +85,12 @@ TEST_F(TestDeviceManager, test_dm_init_AND_get_device_list) {
ASSERT_EQ(dm_.DeviceNum(), 4); ASSERT_EQ(dm_.DeviceNum(), 4);
ASSERT_EQ(dm_.GetStageNum(), (int32_t)(2)); ASSERT_EQ(dm_.GetStageNum(), (int32_t)(2));
std::list<int32_t> dev_list_0 = dm_.GetDeviceListByStageId(0); std::vector<int32_t> dev_list_0 = dm_.GetDeviceListByStageId(0);
std::list<int32_t> dev_list_1 = dm_.GetDeviceListByStageId(1); std::vector<int32_t> dev_list_1 = dm_.GetDeviceListByStageId(1);
ASSERT_EQ(dev_list_0.size(), 2); ASSERT_EQ(dev_list_0.size(), 2);
ASSERT_EQ(dev_list_1.size(), 2); ASSERT_EQ(dev_list_1.size(), 2);
std::list<int32_t>::iterator it = dev_list_0.begin(); std::vector<int32_t>::iterator it = dev_list_0.begin();
ASSERT_EQ((*it), int32_t(5)); ASSERT_EQ((*it), int32_t(5));
it++; it++;
ASSERT_EQ((*it), int32_t(3)); ASSERT_EQ((*it), int32_t(3));
...@@ -111,13 +111,13 @@ TEST_F(TestDeviceManager, test_CreateNewDeviceByRank) { ...@@ -111,13 +111,13 @@ TEST_F(TestDeviceManager, test_CreateNewDeviceByRank) {
} }
TEST_F(TestDeviceManager, test_CreateDeviceListByRankList) { TEST_F(TestDeviceManager, test_CreateDeviceListByRankList) {
std::list<Device> dev_list; std::vector<Device> dev_list;
std::list<int32_t> rlist; std::vector<int32_t> rlist;
rlist.push_back(int32_t(2)); rlist.push_back(int32_t(2));
rlist.push_back(int32_t(1)); rlist.push_back(int32_t(1));
dev_list = dm_.CreateDeviceListByRankList(rlist); dev_list = dm_.CreateDeviceListByRankList(rlist);
std::list<Device>::iterator it = dev_list.begin(); std::vector<Device>::iterator it = dev_list.begin();
ASSERT_EQ(it->rank(), int32_t(2)); ASSERT_EQ(it->rank(), int32_t(2));
it++; it++;
ASSERT_EQ(it->rank(), int32_t(1)); ASSERT_EQ(it->rank(), int32_t(1));
......
tests/ut/cpp/parallel/device_matrix_test.cc
浏览文件 @ da447b8d
...@@ -35,9 +35,9 @@ TEST_F(TestDeviceMatrix, Test2Dgroup_list) { ...@@ -35,9 +35,9 @@ TEST_F(TestDeviceMatrix, Test2Dgroup_list) {
Shape shape = {2, 3}; Shape shape = {2, 3};
DeviceMatrix arr(0, dev_list, shape); DeviceMatrix arr(0, dev_list, shape);
std::list<RankList> group_list; std::vector<RankList> group_list;
if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list(); if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list();
std::list<RankList> group_list_expect = {{0, 3}, {0, 1, 2}}; std::vector<RankList> group_list_expect = {{0, 3}, {0, 1, 2}};
ASSERT_EQ(group_list, group_list_expect); ASSERT_EQ(group_list, group_list_expect);
} }
...@@ -46,9 +46,9 @@ TEST_F(TestDeviceMatrix, Test3Dgroup_list) { ...@@ -46,9 +46,9 @@ TEST_F(TestDeviceMatrix, Test3Dgroup_list) {
Shape shape = {2, 2, 3}; Shape shape = {2, 2, 3};
DeviceMatrix arr(5, dev_list, shape); DeviceMatrix arr(5, dev_list, shape);
std::list<RankList> group_list; std::vector<RankList> group_list;
if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list(); if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list();
std::list<RankList> group_list_expect = {{5, 11}, {2, 5}, {3, 4, 5}}; std::vector<RankList> group_list_expect = {{5, 11}, {2, 5}, {3, 4, 5}};
ASSERT_EQ(group_list, group_list_expect); ASSERT_EQ(group_list, group_list_expect);
} }
...@@ -57,9 +57,9 @@ TEST_F(TestDeviceMatrix, Test4DGetAlongDim) { ...@@ -57,9 +57,9 @@ TEST_F(TestDeviceMatrix, Test4DGetAlongDim) {
Shape shape = {2, 1, 4, 2}; Shape shape = {2, 1, 4, 2};
DeviceMatrix arr(5, dev_list, shape); DeviceMatrix arr(5, dev_list, shape);
std::list<RankList> group_list; std::vector<RankList> group_list;
if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list(); if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list();
std::list<RankList> group_list_expect = {{5, 13}, {5}, {1, 3, 5, 7}, {4, 5}}; std::vector<RankList> group_list_expect = {{5, 13}, {5}, {1, 3, 5, 7}, {4, 5}};
ASSERT_EQ(group_list, group_list_expect); ASSERT_EQ(group_list, group_list_expect);
} }
...@@ -69,9 +69,9 @@ TEST_F(TestDeviceMatrix, Test5DGetAlongDim) { ...@@ -69,9 +69,9 @@ TEST_F(TestDeviceMatrix, Test5DGetAlongDim) {
Shape shape = {3, 4, 2, 3, 2}; Shape shape = {3, 4, 2, 3, 2};
DeviceMatrix arr(5, dev_list, shape); DeviceMatrix arr(5, dev_list, shape);
std::list<RankList> group_list; std::vector<RankList> group_list;
if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list(); if (arr.CreateGroupList() == Status::SUCCESS) group_list = arr.group_list();
std::list<RankList> group_list_expect = {{5, 53, 101}, {5, 17, 29, 41}, {5, 11}, {1, 3, 5}, {4, 5}}; std::vector<RankList> group_list_expect = {{5, 53, 101}, {5, 17, 29, 41}, {5, 11}, {1, 3, 5}, {4, 5}};
ASSERT_EQ(group_list, group_list_expect); ASSERT_EQ(group_list, group_list_expect);
} }
......
tests/ut/cpp/parallel/group_manager_test.cc
浏览文件 @ da447b8d
...@@ -42,7 +42,7 @@ void TestGroup::TearDown() { ...@@ -42,7 +42,7 @@ void TestGroup::TearDown() {
Status TestGroup::Init() { Status TestGroup::Init() {
std::string gname = "1-2"; std::string gname = "1-2";
std::list<Device> dev_list; std::vector<Device> dev_list;
Device one = Device(int32_t(1)); Device one = Device(int32_t(1));
dev_list.push_back(one); dev_list.push_back(one);
Device two = Device(int32_t(2)); Device two = Device(int32_t(2));
...@@ -55,8 +55,8 @@ TEST_F(TestGroup, test_Init) { ASSERT_EQ(Init(), Status::SUCCESS); } ...@@ -55,8 +55,8 @@ TEST_F(TestGroup, test_Init) { ASSERT_EQ(Init(), Status::SUCCESS); }
TEST_F(TestGroup, test_GetDevicesList) { TEST_F(TestGroup, test_GetDevicesList) {
Init(); Init();
std::list<Device> res_dev_list = gp.GetDevicesList(); std::vector<Device> res_dev_list = gp.GetDevicesList();
std::list<Device>::iterator it = res_dev_list.begin(); std::vector<Device>::iterator it = res_dev_list.begin();
ASSERT_EQ(it->rank(), int32_t(1)); ASSERT_EQ(it->rank(), int32_t(1));
it++; it++;
ASSERT_EQ(it->rank(), int32_t(2)); ASSERT_EQ(it->rank(), int32_t(2));
...@@ -88,7 +88,7 @@ void TestGroupManager::TearDown() { ...@@ -88,7 +88,7 @@ void TestGroupManager::TearDown() {
Status TestGroupManager::Init(Group** gp_ptr) { Status TestGroupManager::Init(Group** gp_ptr) {
std::string gname = "1-2"; std::string gname = "1-2";
std::list<Device> dev_list; std::vector<Device> dev_list;
Device one = Device(int32_t(1)); Device one = Device(int32_t(1));
dev_list.push_back(one); dev_list.push_back(one);
Device two = Device(int32_t(2)); Device two = Device(int32_t(2));
...@@ -102,15 +102,15 @@ TEST_F(TestGroupManager, test_CreateGroup) { ...@@ -102,15 +102,15 @@ TEST_F(TestGroupManager, test_CreateGroup) {
Group* gp_ptr = new Group(); Group* gp_ptr = new Group();
ASSERT_EQ(Init(&gp_ptr), Status::SUCCESS); ASSERT_EQ(Init(&gp_ptr), Status::SUCCESS);
std::list<Device> res_dev_list = gp_ptr->GetDevicesList(); std::vector<Device> res_dev_list = gp_ptr->GetDevicesList();
std::list<Device>::iterator it = res_dev_list.begin(); std::vector<Device>::iterator it = res_dev_list.begin();
ASSERT_EQ(it->rank(), int32_t(1)); ASSERT_EQ(it->rank(), int32_t(1));
it++; it++;
ASSERT_EQ(it->rank(), int32_t(2)); ASSERT_EQ(it->rank(), int32_t(2));
delete gp_ptr; delete gp_ptr;
// testing for creating a group with an existing group name // testing for creating a group with an existing group name
std::list<Device> dev_list2; std::vector<Device> dev_list2;
Device three = Device(int32_t(3)); Device three = Device(int32_t(3));
dev_list2.push_back(three); dev_list2.push_back(three);
Device four = Device(int32_t(4)); Device four = Device(int32_t(4));
...@@ -119,8 +119,8 @@ TEST_F(TestGroupManager, test_CreateGroup) { ...@@ -119,8 +119,8 @@ TEST_F(TestGroupManager, test_CreateGroup) {
ASSERT_EQ(gm.CreateGroup("1-2", dev_list2, gp_ptr), Status::SUCCESS); ASSERT_EQ(gm.CreateGroup("1-2", dev_list2, gp_ptr), Status::SUCCESS);
ASSERT_STREQ(gp_ptr->name().data(), "1-2"); ASSERT_STREQ(gp_ptr->name().data(), "1-2");
std::list<Device> res_dev_list2 = gp_ptr->GetDevicesList(); std::vector<Device> res_dev_list2 = gp_ptr->GetDevicesList();
std::list<Device>::iterator it2 = res_dev_list2.begin(); std::vector<Device>::iterator it2 = res_dev_list2.begin();
ASSERT_EQ(it2->rank(), int32_t(1)); ASSERT_EQ(it2->rank(), int32_t(1));
it2++; it2++;
ASSERT_EQ(it2->rank(), int32_t(2)); ASSERT_EQ(it2->rank(), int32_t(2));
...@@ -136,8 +136,8 @@ TEST_F(TestGroupManager, test_FindGroup) { ...@@ -136,8 +136,8 @@ TEST_F(TestGroupManager, test_FindGroup) {
ASSERT_EQ(gm.FindGroup(gname, &gp_ptr2), Status::SUCCESS); ASSERT_EQ(gm.FindGroup(gname, &gp_ptr2), Status::SUCCESS);
std::list<Device> res_dev_list = gp_ptr2->GetDevicesList(); std::vector<Device> res_dev_list = gp_ptr2->GetDevicesList();
std::list<Device>::iterator it = res_dev_list.begin(); std::vector<Device>::iterator it = res_dev_list.begin();
ASSERT_EQ(it->rank(), int32_t(1)); ASSERT_EQ(it->rank(), int32_t(1));
it++; it++;
ASSERT_EQ(it->rank(), int32_t(2)); ASSERT_EQ(it->rank(), int32_t(2));
......
tests/ut/cpp/parallel/ops_info/activation_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestActivationInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestActivationInfo : public UT::Common {
}; };
void TestActivationInfo::SetUp() { void TestActivationInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
......
tests/ut/cpp/parallel/ops_info/activation_test.cc
浏览文件 @ da447b8d
...@@ -40,13 +40,13 @@ class TestActivation : public UT::Common { ...@@ -40,13 +40,13 @@ class TestActivation : public UT::Common {
}; };
void TestActivation::SetUp() { void TestActivation::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
......
tests/ut/cpp/parallel/ops_info/dropout_do_mask_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestDropoutDoMaskInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestDropoutDoMaskInfo : public UT::Common {
}; };
void TestDropoutDoMaskInfo::SetUp() { void TestDropoutDoMaskInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 34; i++) { for (int32_t i = 0; i < 34; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(32); stage_map.push_back(32);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/gelu_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestGeluInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestGeluInfo : public UT::Common {
}; };
void TestGeluInfo::SetUp() { void TestGeluInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 130; i++) { for (int32_t i = 0; i < 130; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(128); stage_map.push_back(128);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc
浏览文件 @ da447b8d
...@@ -34,13 +34,13 @@ class TestGenerateStrategy : public UT::Common { ...@@ -34,13 +34,13 @@ class TestGenerateStrategy : public UT::Common {
}; };
void TestGenerateStrategy::SetUp() { void TestGenerateStrategy::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 10; i++) { for (int32_t i = 0; i < 10; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(8); stage_map.push_back(8);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/generator_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestDropoutGenMaskInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestDropoutGenMaskInfo : public UT::Common {
}; };
void TestDropoutGenMaskInfo::SetUp() { void TestDropoutGenMaskInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 10; i++) { for (int32_t i = 0; i < 10; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(8); stage_map.push_back(8);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/get_next_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestGetNextInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestGetNextInfo : public UT::Common {
}; };
void TestGetNextInfo::SetUp() { void TestGetNextInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 8; i++) { for (int32_t i = 0; i < 8; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(8); stage_map.push_back(8);
int32_t local_dev = 0; int32_t local_dev = 0;
// create a new g_device_manager // create a new g_device_manager
......
tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestL2NormalizeInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestL2NormalizeInfo : public UT::Common {
}; };
void TestL2NormalizeInfo::SetUp() { void TestL2NormalizeInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 34; i++) { for (int32_t i = 0; i < 34; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(32); stage_map.push_back(32);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestLogSoftmaxInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestLogSoftmaxInfo : public UT::Common {
}; };
void TestLogSoftmaxInfo::SetUp() { void TestLogSoftmaxInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 130; i++) { for (int32_t i = 0; i < 130; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(128); stage_map.push_back(128);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/matmul_info_test.cc
浏览文件 @ da447b8d
...@@ -42,13 +42,13 @@ class TestMatmulInfo : public UT::Common { ...@@ -42,13 +42,13 @@ class TestMatmulInfo : public UT::Common {
}; };
void TestMatmulInfo::SetUp() { void TestMatmulInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
......
tests/ut/cpp/parallel/ops_info/onehot_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestOneHotInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestOneHotInfo : public UT::Common {
}; };
void TestOneHotInfo::SetUp() { void TestOneHotInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 10; i++) { for (int32_t i = 0; i < 10; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(8); stage_map.push_back(8);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestOneHotInfo2 : public UT::Common { ...@@ -38,13 +38,13 @@ class TestOneHotInfo2 : public UT::Common {
}; };
void TestOneHotInfo2::SetUp() { void TestOneHotInfo2::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 10; i++) { for (int32_t i = 0; i < 10; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(8); stage_map.push_back(8);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/pow_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestPowInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestPowInfo : public UT::Common {
}; };
void TestPowInfo::SetUp() { void TestPowInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 66; i++) { for (int32_t i = 0; i < 66; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(64); stage_map.push_back(64);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/prelu_test.cc
浏览文件 @ da447b8d
...@@ -39,13 +39,13 @@ class TestPReLUInfo : public UT::Common { ...@@ -39,13 +39,13 @@ class TestPReLUInfo : public UT::Common {
}; };
void TestPReLUInfo::SetUp() { void TestPReLUInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
int32_t local_dev = 0; int32_t local_dev = 0;
......
tests/ut/cpp/parallel/ops_info/reduce_method_test.cc
浏览文件 @ da447b8d
...@@ -39,13 +39,13 @@ class TestReduceSumInfo : public UT::Common { ...@@ -39,13 +39,13 @@ class TestReduceSumInfo : public UT::Common {
void TestReduceSumInfo::SetUp() { void TestReduceSumInfo::SetUp() {
UT::InitPythonPath(); UT::InitPythonPath();
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 34; i++) { for (int32_t i = 0; i < 34; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(32); stage_map.push_back(32);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/reshape_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestReshapeInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestReshapeInfo : public UT::Common {
}; };
void TestReshapeInfo::SetUp() { void TestReshapeInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 34; i++) { for (int32_t i = 0; i < 34; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(32); stage_map.push_back(32);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestSoftmaxLoss : public UT::Common { ...@@ -38,13 +38,13 @@ class TestSoftmaxLoss : public UT::Common {
}; };
void TestSoftmaxLoss::SetUp() { void TestSoftmaxLoss::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 65; i++) { for (int32_t i = 0; i < 65; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(64); stage_map.push_back(64);
stage_map.push_back(1); stage_map.push_back(1);
......
tests/ut/cpp/parallel/ops_info/softmax_info_test.cc
浏览文件 @ da447b8d
...@@ -39,13 +39,13 @@ class TestSoftmaxInfo : public UT::Common { ...@@ -39,13 +39,13 @@ class TestSoftmaxInfo : public UT::Common {
}; };
void TestSoftmaxInfo::SetUp() { void TestSoftmaxInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 130; i++) { for (int32_t i = 0; i < 130; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(128); stage_map.push_back(128);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/tanh_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestTanhInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestTanhInfo : public UT::Common {
}; };
void TestTanhInfo::SetUp() { void TestTanhInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 130; i++) { for (int32_t i = 0; i < 130; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(128); stage_map.push_back(128);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestTensorAddInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestTensorAddInfo : public UT::Common {
}; };
void TestTensorAddInfo::SetUp() { void TestTensorAddInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 34; i++) { for (int32_t i = 0; i < 34; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(32); stage_map.push_back(32);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestTmpIdentityInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestTmpIdentityInfo : public UT::Common {
}; };
void TestTmpIdentityInfo::SetUp() { void TestTmpIdentityInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
......
tests/ut/cpp/parallel/ops_info/transpose_test.cc
浏览文件 @ da447b8d
...@@ -38,13 +38,13 @@ class TestTransposeInfo : public UT::Common { ...@@ -38,13 +38,13 @@ class TestTransposeInfo : public UT::Common {
}; };
void TestTransposeInfo::SetUp() { void TestTransposeInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 34; i++) { for (int32_t i = 0; i < 34; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(32); stage_map.push_back(32);
stage_map.push_back(2); stage_map.push_back(2);
......
tests/ut/cpp/parallel/step_auto_parallel_test.cc
浏览文件 @ da447b8d
...@@ -32,13 +32,13 @@ class TestStepAutoParallel : public UT::Common { ...@@ -32,13 +32,13 @@ class TestStepAutoParallel : public UT::Common {
}; };
void TestStepAutoParallel::SetUp() { void TestStepAutoParallel::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 20; i++) { for (int32_t i = 0; i < 20; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(16); stage_map.push_back(16);
stage_map.push_back(4); stage_map.push_back(4);
......
tests/ut/cpp/parallel/step_parallel_test.cc
浏览文件 @ da447b8d
...@@ -34,13 +34,13 @@ class TestStepParallel : public UT::Common { ...@@ -34,13 +34,13 @@ class TestStepParallel : public UT::Common {
void TestStepParallel::SetUp() { UT::InitPythonPath(); } void TestStepParallel::SetUp() { UT::InitPythonPath(); }
void Init_Device_Manager() { void Init_Device_Manager() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 20; i++) { for (int32_t i = 0; i < 20; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(16); stage_map.push_back(16);
stage_map.push_back(4); stage_map.push_back(4);
......
tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc
浏览文件 @ da447b8d
...@@ -39,12 +39,12 @@ class TestConstructOperator : public UT::Common { ...@@ -39,12 +39,12 @@ class TestConstructOperator : public UT::Common {
}; };
void TestConstructOperator::SetUp() { void TestConstructOperator::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
......
tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc
浏览文件 @ da447b8d
...@@ -28,13 +28,13 @@ class TestRedistributionOperatorInfer : public UT::Common { ...@@ -28,13 +28,13 @@ class TestRedistributionOperatorInfer : public UT::Common {
TestRedistributionOperatorInfer() {} TestRedistributionOperatorInfer() {}
void SetUp() { void SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 1050; i++) { for (int32_t i = 0; i < 1050; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(1024); stage_map.push_back(1024);
stage_map.push_back(26); stage_map.push_back(26);
......
tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc
浏览文件 @ da447b8d
...@@ -33,7 +33,7 @@ class TestTensorRedistribution : public UT::Common { ...@@ -33,7 +33,7 @@ class TestTensorRedistribution : public UT::Common {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(16); stage_map.push_back(16);
stage_map.push_back(4); stage_map.push_back(4);
......
tests/ut/cpp/parallel/virtual_dataset_test.cc
浏览文件 @ da447b8d
...@@ -37,13 +37,13 @@ class TestVirtualDatasetInfo : public UT::Common { ...@@ -37,13 +37,13 @@ class TestVirtualDatasetInfo : public UT::Common {
}; };
void TestVirtualDatasetInfo::SetUp() { void TestVirtualDatasetInfo::SetUp() {
std::list<int32_t> dev_list; std::vector<int32_t> dev_list;
for (int32_t i = 0; i < 130; i++) { for (int32_t i = 0; i < 130; i++) {
dev_list.push_back(i); dev_list.push_back(i);
} }
std::list<int32_t> stage_map; std::vector<int32_t> stage_map;
stage_map.push_back(16); stage_map.push_back(16);
stage_map.push_back(114); stage_map.push_back(114);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或