未验证 提交 469a0392 编写于 作者: R Ruibin Cheung 提交者: GitHub

[clang-tidy] enable modernize-use-emplace (#55799)

* [clang-tidy] enable modernize-use-emplace

* Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into modernize_use_emplace
上级 1e4f627d
...@@ -180,7 +180,7 @@ modernize-redundant-void-arg, ...@@ -180,7 +180,7 @@ modernize-redundant-void-arg,
-modernize-shrink-to-fit, -modernize-shrink-to-fit,
-modernize-unary-static-assert, -modernize-unary-static-assert,
-modernize-use-bool-literals, -modernize-use-bool-literals,
-modernize-use-emplace, modernize-use-emplace,
-modernize-use-equals-default, -modernize-use-equals-default,
-modernize-use-equals-delete, -modernize-use-equals-delete,
-modernize-use-noexcept, -modernize-use-noexcept,
......
...@@ -203,8 +203,7 @@ GetAxesDimsMappingPair(const std::vector<std::string>& tensor_axes, ...@@ -203,8 +203,7 @@ GetAxesDimsMappingPair(const std::vector<std::string>& tensor_axes,
std::vector<std::pair<std::string, std::vector<int64_t>>> res; std::vector<std::pair<std::string, std::vector<int64_t>>> res;
size_t ntensor = specs.size(); size_t ntensor = specs.size();
for (size_t i = 0; i < ntensor; ++i) { for (size_t i = 0; i < ntensor; ++i) {
res.emplace_back(std::pair<std::string, std::vector<int64_t>>( res.emplace_back(tensor_axes[i], specs[i].dims_mapping());
tensor_axes[i], specs[i].dims_mapping()));
} }
return res; return res;
} }
......
...@@ -609,8 +609,8 @@ void EagerReducer::InitializeDenseGroups( ...@@ -609,8 +609,8 @@ void EagerReducer::InitializeDenseGroups(
p_group->length_.push_back(size); p_group->length_.push_back(size);
// for concat operator // for concat operator
p_group->origin_shapes_.push_back(IntArray(tensor.shape())); p_group->origin_shapes_.emplace_back(tensor.shape());
p_group->dense_tensors_.push_back(phi::DenseTensor()); p_group->dense_tensors_.emplace_back();
const auto &dtype = tensor.dtype(); const auto &dtype = tensor.dtype();
const auto &inner_place = tensor.impl()->place(); const auto &inner_place = tensor.impl()->place();
......
...@@ -114,7 +114,7 @@ void FeatureNode::recover_from_buffer(char* buffer) { ...@@ -114,7 +114,7 @@ void FeatureNode::recover_from_buffer(char* buffer) {
memcpy(str, buffer, feat_len); memcpy(str, buffer, feat_len);
buffer += feat_len; buffer += feat_len;
str[feat_len] = '\0'; str[feat_len] = '\0';
feature.push_back(std::string(str)); feature.push_back(str); // NOLINT
} }
} }
} // namespace distributed } // namespace distributed
......
...@@ -88,7 +88,7 @@ int32_t SSDSparseTable::PullSparse(float* pull_values, ...@@ -88,7 +88,7 @@ int32_t SSDSparseTable::PullSparse(float* pull_values,
_real_local_shard_num); _real_local_shard_num);
for (size_t i = 0; i < num; ++i) { for (size_t i = 0; i < num; ++i) {
int shard_id = (keys[i] % _sparse_table_shard_num) % _avg_local_shard_num; int shard_id = (keys[i] % _sparse_table_shard_num) % _avg_local_shard_num;
task_keys[shard_id].push_back({keys[i], i}); task_keys[shard_id].emplace_back(keys[i], i);
} }
std::atomic<uint32_t> missed_keys{0}; std::atomic<uint32_t> missed_keys{0};
...@@ -202,8 +202,8 @@ int32_t SSDSparseTable::PullSparsePtr(int shard_id, ...@@ -202,8 +202,8 @@ int32_t SSDSparseTable::PullSparsePtr(int shard_id,
auto itr = local_shard.find(key); auto itr = local_shard.find(key);
if (itr == local_shard.end()) { if (itr == local_shard.end()) {
cur_ctx->batch_index.push_back(i); cur_ctx->batch_index.push_back(i);
cur_ctx->batch_keys.push_back(rocksdb::Slice( cur_ctx->batch_keys.emplace_back(
(char*)&(pull_keys[i]), sizeof(uint64_t))); // NOLINT reinterpret_cast<const char*>(&(pull_keys[i])), sizeof(uint64_t));
if (cur_ctx->batch_keys.size() == 1024) { if (cur_ctx->batch_keys.size() == 1024) {
cur_ctx->batch_values.resize(cur_ctx->batch_keys.size()); cur_ctx->batch_values.resize(cur_ctx->batch_keys.size());
cur_ctx->status.resize(cur_ctx->batch_keys.size()); cur_ctx->status.resize(cur_ctx->batch_keys.size());
...@@ -334,7 +334,7 @@ int32_t SSDSparseTable::PushSparse(const uint64_t* keys, ...@@ -334,7 +334,7 @@ int32_t SSDSparseTable::PushSparse(const uint64_t* keys,
_real_local_shard_num); _real_local_shard_num);
for (size_t i = 0; i < num; ++i) { for (size_t i = 0; i < num; ++i) {
int shard_id = (keys[i] % _sparse_table_shard_num) % _avg_local_shard_num; int shard_id = (keys[i] % _sparse_table_shard_num) % _avg_local_shard_num;
task_keys[shard_id].push_back({keys[i], i}); task_keys[shard_id].emplace_back(keys[i], i);
} }
for (int shard_id = 0; shard_id < _real_local_shard_num; ++shard_id) { for (int shard_id = 0; shard_id < _real_local_shard_num; ++shard_id) {
tasks[shard_id] = tasks[shard_id] =
...@@ -440,7 +440,7 @@ int32_t SSDSparseTable::PushSparse(const uint64_t* keys, ...@@ -440,7 +440,7 @@ int32_t SSDSparseTable::PushSparse(const uint64_t* keys,
_real_local_shard_num); _real_local_shard_num);
for (size_t i = 0; i < num; ++i) { for (size_t i = 0; i < num; ++i) {
int shard_id = (keys[i] % _sparse_table_shard_num) % _avg_local_shard_num; int shard_id = (keys[i] % _sparse_table_shard_num) % _avg_local_shard_num;
task_keys[shard_id].push_back({keys[i], i}); task_keys[shard_id].emplace_back(keys[i], i);
} }
for (int shard_id = 0; shard_id < _real_local_shard_num; ++shard_id) { for (int shard_id = 0; shard_id < _real_local_shard_num; ++shard_id) {
tasks[shard_id] = tasks[shard_id] =
...@@ -1658,11 +1658,10 @@ int32_t SSDSparseTable::LoadWithString( ...@@ -1658,11 +1658,10 @@ int32_t SSDSparseTable::LoadWithString(
// ssd or mem // ssd or mem
if (_value_accesor->SaveSSD(data_buffer_ptr)) { if (_value_accesor->SaveSSD(data_buffer_ptr)) {
tmp_key.emplace_back(key); tmp_key.emplace_back(key);
ssd_keys.emplace_back(std::make_pair( ssd_keys.emplace_back(reinterpret_cast<char*>(&tmp_key.back()),
reinterpret_cast<char*>(&tmp_key.back()), sizeof(uint64_t))); sizeof(uint64_t));
ssd_values.emplace_back( ssd_values.emplace_back(reinterpret_cast<char*>(data_buffer_ptr),
std::make_pair(reinterpret_cast<char*>(data_buffer_ptr), value_size * sizeof(float));
value_size * sizeof(float)));
data_buffer_ptr += feature_value_size; data_buffer_ptr += feature_value_size;
if (static_cast<int>(ssd_keys.size()) == if (static_cast<int>(ssd_keys.size()) ==
FLAGS_pserver_load_batch_size) { FLAGS_pserver_load_batch_size) {
......
...@@ -297,7 +297,7 @@ TEST(Attribute, ProtoAttrToAttribute_scalars) { ...@@ -297,7 +297,7 @@ TEST(Attribute, ProtoAttrToAttribute_scalars) {
std::vector<paddle::experimental::Scalar> scalars; std::vector<paddle::experimental::Scalar> scalars;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
scalars.push_back(paddle::experimental::Scalar(i)); scalars.emplace_back(i);
} }
std::vector<paddle::framework::proto::Scalar> proto_scalars; std::vector<paddle::framework::proto::Scalar> proto_scalars;
proto_scalars.reserve(scalars.size()); proto_scalars.reserve(scalars.size());
......
...@@ -1084,13 +1084,13 @@ void MultiSlotInMemoryDataFeed::Init( ...@@ -1084,13 +1084,13 @@ void MultiSlotInMemoryDataFeed::Init(
feed_vec_.resize(use_slots_.size()); feed_vec_.resize(use_slots_.size());
const int kEstimatedFeasignNumPerSlot = 5; // Magic Number const int kEstimatedFeasignNumPerSlot = 5; // Magic Number
for (size_t i = 0; i < all_slot_num; i++) { for (size_t i = 0; i < all_slot_num; i++) {
batch_float_feasigns_.push_back(std::vector<float>()); batch_float_feasigns_.emplace_back();
batch_uint64_feasigns_.push_back(std::vector<uint64_t>()); batch_uint64_feasigns_.emplace_back();
batch_float_feasigns_[i].reserve(default_batch_size_ * batch_float_feasigns_[i].reserve(default_batch_size_ *
kEstimatedFeasignNumPerSlot); kEstimatedFeasignNumPerSlot);
batch_uint64_feasigns_[i].reserve(default_batch_size_ * batch_uint64_feasigns_[i].reserve(default_batch_size_ *
kEstimatedFeasignNumPerSlot); kEstimatedFeasignNumPerSlot);
offset_.push_back(std::vector<size_t>()); offset_.emplace_back();
offset_[i].reserve(default_batch_size_ + offset_[i].reserve(default_batch_size_ +
1); // Each lod info will prepend a zero 1); // Each lod info will prepend a zero
} }
...@@ -1224,7 +1224,7 @@ bool MultiSlotInMemoryDataFeed::ParseOneInstanceFromPipe(Record* instance) { ...@@ -1224,7 +1224,7 @@ bool MultiSlotInMemoryDataFeed::ParseOneInstanceFromPipe(Record* instance) {
} }
FeatureFeasign f; FeatureFeasign f;
f.float_feasign_ = feasign; f.float_feasign_ = feasign;
instance->float_feasigns_.push_back(FeatureItem(f, idx)); instance->float_feasigns_.emplace_back(f, idx);
} }
} else if (all_slots_type_[i][0] == 'u') { // uint64 } else if (all_slots_type_[i][0] == 'u') { // uint64
for (int j = 0; j < num; ++j) { for (int j = 0; j < num; ++j) {
...@@ -1236,7 +1236,7 @@ bool MultiSlotInMemoryDataFeed::ParseOneInstanceFromPipe(Record* instance) { ...@@ -1236,7 +1236,7 @@ bool MultiSlotInMemoryDataFeed::ParseOneInstanceFromPipe(Record* instance) {
} }
FeatureFeasign f; FeatureFeasign f;
f.uint64_feasign_ = feasign; f.uint64_feasign_ = feasign;
instance->uint64_feasigns_.push_back(FeatureItem(f, idx)); instance->uint64_feasigns_.emplace_back(f, idx);
} }
} }
pos = endptr - str; pos = endptr - str;
...@@ -1297,7 +1297,7 @@ bool MultiSlotInMemoryDataFeed::ParseOneInstance(Record* instance) { ...@@ -1297,7 +1297,7 @@ bool MultiSlotInMemoryDataFeed::ParseOneInstance(Record* instance) {
} }
FeatureFeasign f; FeatureFeasign f;
f.float_feasign_ = feasign; f.float_feasign_ = feasign;
instance->float_feasigns_.push_back(FeatureItem(f, idx)); instance->float_feasigns_.emplace_back(f, idx);
} }
} else if (all_slots_type_[i][0] == 'u') { // uint64 } else if (all_slots_type_[i][0] == 'u') { // uint64
for (int j = 0; j < num; ++j) { for (int j = 0; j < num; ++j) {
...@@ -1307,7 +1307,7 @@ bool MultiSlotInMemoryDataFeed::ParseOneInstance(Record* instance) { ...@@ -1307,7 +1307,7 @@ bool MultiSlotInMemoryDataFeed::ParseOneInstance(Record* instance) {
} }
FeatureFeasign f; FeatureFeasign f;
f.uint64_feasign_ = feasign; f.uint64_feasign_ = feasign;
instance->uint64_feasigns_.push_back(FeatureItem(f, idx)); instance->uint64_feasigns_.emplace_back(f, idx);
} }
} }
pos = endptr - str; pos = endptr - str;
...@@ -2093,13 +2093,13 @@ void SlotRecordInMemoryDataFeed::Init(const DataFeedDesc& data_feed_desc) { ...@@ -2093,13 +2093,13 @@ void SlotRecordInMemoryDataFeed::Init(const DataFeedDesc& data_feed_desc) {
feed_vec_.resize(used_slots_info_.size()); feed_vec_.resize(used_slots_info_.size());
const int kEstimatedFeasignNumPerSlot = 5; // Magic Number const int kEstimatedFeasignNumPerSlot = 5; // Magic Number
for (size_t i = 0; i < all_slot_num; i++) { for (size_t i = 0; i < all_slot_num; i++) {
batch_float_feasigns_.push_back(std::vector<float>()); batch_float_feasigns_.emplace_back();
batch_uint64_feasigns_.push_back(std::vector<uint64_t>()); batch_uint64_feasigns_.emplace_back();
batch_float_feasigns_[i].reserve(default_batch_size_ * batch_float_feasigns_[i].reserve(default_batch_size_ *
kEstimatedFeasignNumPerSlot); kEstimatedFeasignNumPerSlot);
batch_uint64_feasigns_[i].reserve(default_batch_size_ * batch_uint64_feasigns_[i].reserve(default_batch_size_ *
kEstimatedFeasignNumPerSlot); kEstimatedFeasignNumPerSlot);
offset_.push_back(std::vector<size_t>()); offset_.emplace_back();
offset_[i].reserve(default_batch_size_ + offset_[i].reserve(default_batch_size_ +
1); // Each lod info will prepend a zero 1); // Each lod info will prepend a zero
} }
......
...@@ -510,8 +510,8 @@ void DatasetImpl<T>::LoadIntoMemory() { ...@@ -510,8 +510,8 @@ void DatasetImpl<T>::LoadIntoMemory() {
#endif #endif
} else { } else {
for (int64_t i = 0; i < thread_num_; ++i) { for (int64_t i = 0; i < thread_num_; ++i) {
load_threads.push_back(std::thread( load_threads.emplace_back(&paddle::framework::DataFeed::LoadIntoMemory,
&paddle::framework::DataFeed::LoadIntoMemory, readers_[i].get())); readers_[i].get());
} }
for (std::thread& t : load_threads) { for (std::thread& t : load_threads) {
t.join(); t.join();
...@@ -534,16 +534,16 @@ void DatasetImpl<T>::PreLoadIntoMemory() { ...@@ -534,16 +534,16 @@ void DatasetImpl<T>::PreLoadIntoMemory() {
CHECK(static_cast<size_t>(preload_thread_num_) == preload_readers_.size()); CHECK(static_cast<size_t>(preload_thread_num_) == preload_readers_.size());
preload_threads_.clear(); preload_threads_.clear();
for (int64_t i = 0; i < preload_thread_num_; ++i) { for (int64_t i = 0; i < preload_thread_num_; ++i) {
preload_threads_.push_back( preload_threads_.emplace_back(
std::thread(&paddle::framework::DataFeed::LoadIntoMemory, &paddle::framework::DataFeed::LoadIntoMemory,
preload_readers_[i].get())); preload_readers_[i].get());
} }
} else { } else {
CHECK(static_cast<size_t>(thread_num_) == readers_.size()); CHECK(static_cast<size_t>(thread_num_) == readers_.size());
preload_threads_.clear(); preload_threads_.clear();
for (int64_t i = 0; i < thread_num_; ++i) { for (int64_t i = 0; i < thread_num_; ++i) {
preload_threads_.push_back(std::thread( preload_threads_.emplace_back(
&paddle::framework::DataFeed::LoadIntoMemory, readers_[i].get())); &paddle::framework::DataFeed::LoadIntoMemory, readers_[i].get());
} }
} }
VLOG(3) << "DatasetImpl<T>::PreLoadIntoMemory() end"; VLOG(3) << "DatasetImpl<T>::PreLoadIntoMemory() end";
...@@ -849,7 +849,7 @@ void MultiSlotDataset::GlobalShuffle(int thread_num) { ...@@ -849,7 +849,7 @@ void MultiSlotDataset::GlobalShuffle(int thread_num) {
} }
VLOG(3) << "start global shuffle threads, num = " << thread_num; VLOG(3) << "start global shuffle threads, num = " << thread_num;
for (int i = 0; i < thread_num; ++i) { for (int i = 0; i < thread_num; ++i) {
global_shuffle_threads.push_back(std::thread(global_shuffle_func)); global_shuffle_threads.emplace_back(global_shuffle_func);
} }
for (std::thread& t : global_shuffle_threads) { for (std::thread& t : global_shuffle_threads) {
t.join(); t.join();
...@@ -1618,7 +1618,7 @@ void MultiSlotDataset::GetRandomData( ...@@ -1618,7 +1618,7 @@ void MultiSlotDataset::GetRandomData(
for (auto slot : slots_to_replace) { for (auto slot : slots_to_replace) {
auto range = rand_rec.feas_.equal_range(slot); auto range = rand_rec.feas_.equal_range(slot);
for (auto it = range.first; it != range.second; ++it) { for (auto it = range.first; it != range.second; ++it) {
new_rec.uint64_feasigns_.push_back({it->second, it->first}); new_rec.uint64_feasigns_.emplace_back(it->second, it->first);
debug_push_cnt += 1; debug_push_cnt += 1;
} }
} }
......
...@@ -88,7 +88,7 @@ void DistMultiTrainer::InitDumpEnv() { ...@@ -88,7 +88,7 @@ void DistMultiTrainer::InitDumpEnv() {
} }
} }
for (int i = 0; i < dump_thread_num_; i++) { for (int i = 0; i < dump_thread_num_; i++) {
dump_thread_.push_back(std::thread([this, i] { DumpWork(i); })); dump_thread_.emplace_back([this, i] { DumpWork(i); });
} }
} }
...@@ -131,11 +131,10 @@ void DistMultiTrainer::InitOtherEnv(const ProgramDesc &main_program) { ...@@ -131,11 +131,10 @@ void DistMultiTrainer::InitOtherEnv(const ProgramDesc &main_program) {
void DistMultiTrainer::Run() { void DistMultiTrainer::Run() {
for (int thidx = 0; thidx < thread_num_; ++thidx) { for (int thidx = 0; thidx < thread_num_; ++thidx) {
if (!debug_) { if (!debug_) {
threads_.push_back( threads_.emplace_back(&DeviceWorker::TrainFiles, workers_[thidx].get());
std::thread(&DeviceWorker::TrainFiles, workers_[thidx].get()));
} else { } else {
threads_.push_back(std::thread(&DeviceWorker::TrainFilesWithProfiler, threads_.emplace_back(&DeviceWorker::TrainFilesWithProfiler,
workers_[thidx].get())); workers_[thidx].get());
} }
} }
} }
......
...@@ -107,14 +107,14 @@ void DownpourWorker::Initialize(const TrainerDesc& desc) { ...@@ -107,14 +107,14 @@ void DownpourWorker::Initialize(const TrainerDesc& desc) {
uint64_t dest_table = copy_table_config_.dest_sparse_tables(i); uint64_t dest_table = copy_table_config_.dest_sparse_tables(i);
VLOG(3) << "copy_sparse_tables_ push back " << src_table << "->" VLOG(3) << "copy_sparse_tables_ push back " << src_table << "->"
<< dest_table; << dest_table;
copy_sparse_tables_.push_back(std::make_pair(src_table, dest_table)); copy_sparse_tables_.emplace_back(src_table, dest_table);
} }
for (int i = 0; i < copy_table_config_.src_dense_tables_size(); ++i) { for (int i = 0; i < copy_table_config_.src_dense_tables_size(); ++i) {
uint64_t src_table = copy_table_config_.src_dense_tables(i); uint64_t src_table = copy_table_config_.src_dense_tables(i);
uint64_t dest_table = copy_table_config_.dest_dense_tables(i); uint64_t dest_table = copy_table_config_.dest_dense_tables(i);
VLOG(3) << "copy_dense_tables_ push back " << src_table << "->" VLOG(3) << "copy_dense_tables_ push back " << src_table << "->"
<< dest_table; << dest_table;
copy_dense_tables_.push_back(std::make_pair(src_table, dest_table)); copy_dense_tables_.emplace_back(src_table, dest_table);
} }
for (auto& m : copy_table_config_.table_denpendency_map()) { for (auto& m : copy_table_config_.table_denpendency_map()) {
if (sparse_key_names_.find(m.key()) != sparse_key_names_.end()) { if (sparse_key_names_.find(m.key()) != sparse_key_names_.end()) {
......
...@@ -168,14 +168,14 @@ void DownpourWorkerOpt::Initialize(const TrainerDesc& desc) { ...@@ -168,14 +168,14 @@ void DownpourWorkerOpt::Initialize(const TrainerDesc& desc) {
uint64_t dest_table = copy_table_config_.dest_sparse_tables(i); uint64_t dest_table = copy_table_config_.dest_sparse_tables(i);
VLOG(3) << "copy_sparse_tables_ push back " << src_table << "->" VLOG(3) << "copy_sparse_tables_ push back " << src_table << "->"
<< dest_table; << dest_table;
copy_sparse_tables_.push_back(std::make_pair(src_table, dest_table)); copy_sparse_tables_.emplace_back(src_table, dest_table);
} }
for (int i = 0; i < copy_table_config_.src_dense_tables_size(); ++i) { for (int i = 0; i < copy_table_config_.src_dense_tables_size(); ++i) {
uint64_t src_table = copy_table_config_.src_dense_tables(i); uint64_t src_table = copy_table_config_.src_dense_tables(i);
uint64_t dest_table = copy_table_config_.dest_dense_tables(i); uint64_t dest_table = copy_table_config_.dest_dense_tables(i);
VLOG(3) << "copy_dense_tables_ push back " << src_table << "->" VLOG(3) << "copy_dense_tables_ push back " << src_table << "->"
<< dest_table; << dest_table;
copy_dense_tables_.push_back(std::make_pair(src_table, dest_table)); copy_dense_tables_.emplace_back(src_table, dest_table);
} }
for (auto& m : copy_table_config_.table_denpendency_map()) { for (auto& m : copy_table_config_.table_denpendency_map()) {
if (sparse_key_names_.find(m.key()) != sparse_key_names_.end()) { if (sparse_key_names_.find(m.key()) != sparse_key_names_.end()) {
......
...@@ -179,7 +179,7 @@ std::vector<std::string> localfs_list(const std::string& path) { ...@@ -179,7 +179,7 @@ std::vector<std::string> localfs_list(const std::string& path) {
std::vector<std::string> list; std::vector<std::string> list;
while (reader.getline(&*pipe)) { while (reader.getline(&*pipe)) {
list.push_back(reader.get()); list.emplace_back(reader.get());
} }
return list; return list;
......
...@@ -174,8 +174,8 @@ int EmbeddingEltwiseLayerNormFusePass::BuildFusion( ...@@ -174,8 +174,8 @@ int EmbeddingEltwiseLayerNormFusePass::BuildFusion(
return; return;
} }
std::vector<std::pair<Node*, Node*>> ins; std::vector<std::pair<Node*, Node*>> ins;
ins.push_back(std::make_pair(lookup_table1_x, lookup_table1_w)); ins.emplace_back(lookup_table1_x, lookup_table1_w);
ins.push_back(std::make_pair(lookup_table2_x, lookup_table2_w)); ins.emplace_back(lookup_table2_x, lookup_table2_w);
start_pattern_in_nodes.push_back(ins); start_pattern_in_nodes.push_back(ins);
start_pattern_out_node.push_back(eltwise_add_out); start_pattern_out_node.push_back(eltwise_add_out);
...@@ -294,7 +294,7 @@ int EmbeddingEltwiseLayerNormFusePass::BuildFusion( ...@@ -294,7 +294,7 @@ int EmbeddingEltwiseLayerNormFusePass::BuildFusion(
for (size_t k = 0; k < end_pattern_elt_out.size(); ++k) { for (size_t k = 0; k < end_pattern_elt_out.size(); ++k) {
if (tmp == end_pattern_elt_out[k]) { if (tmp == end_pattern_elt_out[k]) {
fusion_ids.push_back(std::make_pair(i, std::make_pair(k, js))); fusion_ids.emplace_back(i, std::make_pair(k, js));
break; break;
} }
} }
......
...@@ -107,7 +107,7 @@ void MultiTrainer::InitDumpEnv() { ...@@ -107,7 +107,7 @@ void MultiTrainer::InitDumpEnv() {
} }
} }
for (int i = 0; i < dump_thread_num_; i++) { for (int i = 0; i < dump_thread_num_; i++) {
dump_thread_.push_back(std::thread([this, i] { DumpWork(i); })); dump_thread_.emplace_back([this, i] { DumpWork(i); });
} }
} }
......
...@@ -174,31 +174,31 @@ int StatisticsEngine::Init(const platform::NodeTrees& trees) { ...@@ -174,31 +174,31 @@ int StatisticsEngine::Init(const platform::NodeTrees& trees) {
void StatisticsEngine::InitStdEvents() { void StatisticsEngine::InitStdEvents() {
name2idx_["Total"] = names_.size(); name2idx_["Total"] = names_.size();
names_.push_back("Total"); names_.emplace_back("Total");
name2idx_["PythonEnd"] = names_.size(); name2idx_["PythonEnd"] = names_.size();
names_.push_back("PythonEnd"); names_.emplace_back("PythonEnd");
name2idx_["CplusplusEnd"] = names_.size(); name2idx_["CplusplusEnd"] = names_.size();
names_.push_back("CplusplusEnd"); names_.emplace_back("CplusplusEnd");
name2idx_["RunOp"] = names_.size(); name2idx_["RunOp"] = names_.size();
names_.push_back("RunOp"); names_.emplace_back("RunOp");
name2idx_["LaunchKernel"] = names_.size(); name2idx_["LaunchKernel"] = names_.size();
names_.push_back("LaunchKernel"); names_.emplace_back("LaunchKernel");
name2idx_["OpCompute"] = names_.size(); name2idx_["OpCompute"] = names_.size();
names_.push_back("OpCompute"); names_.emplace_back("OpCompute");
name2idx_["OpInfershape"] = names_.size(); name2idx_["OpInfershape"] = names_.size();
names_.push_back("OpInfershape"); names_.emplace_back("OpInfershape");
name2idx_["DataTransform"] = names_.size(); name2idx_["DataTransform"] = names_.size();
names_.push_back("DataTransform"); names_.emplace_back("DataTransform");
name2idx_["GarbageCollect"] = names_.size(); name2idx_["GarbageCollect"] = names_.size();
names_.push_back("GarbageCollect"); names_.emplace_back("GarbageCollect");
name2idx_["CalcNextOp"] = names_.size(); name2idx_["CalcNextOp"] = names_.size();
names_.push_back("CalcNextOp"); names_.emplace_back("CalcNextOp");
name2idx_["AllocateDeviceMem"] = names_.size(); name2idx_["AllocateDeviceMem"] = names_.size();
names_.push_back("AllocateDeviceMem"); names_.emplace_back("AllocateDeviceMem");
name2idx_["FreeDeviceMem"] = names_.size(); name2idx_["FreeDeviceMem"] = names_.size();
names_.push_back("FreeDeviceMem"); names_.emplace_back("FreeDeviceMem");
name2idx_["ThreadpoolAddTask"] = names_.size(); name2idx_["ThreadpoolAddTask"] = names_.size();
names_.push_back("ThreadpoolAddTask"); names_.emplace_back("ThreadpoolAddTask");
size_t n = names_.size(); size_t n = names_.size();
filters_.resize(n); filters_.resize(n);
......
...@@ -299,8 +299,8 @@ std::shared_ptr<OperatorBase> TransferLayout(const std::string& var_name, ...@@ -299,8 +299,8 @@ std::shared_ptr<OperatorBase> TransferLayout(const std::string& var_name,
VLOG(3) << "Create Variable " << *new_var_name VLOG(3) << "Create Variable " << *new_var_name
<< " locally, which pointer is " << ptr << "Variable Type " << " locally, which pointer is " << ptr << "Variable Type "
<< var_type; << var_type;
var_scope->MutableDataTransferAddedVars().push_back( var_scope->MutableDataTransferAddedVars().emplace_back(*new_var_name,
std::make_pair(*new_var_name, var_type)); var_type);
var_scope->AddVar(*new_var_name, nullptr); var_scope->AddVar(*new_var_name, nullptr);
// 2. Construct VariableNameMap // 2. Construct VariableNameMap
...@@ -347,8 +347,8 @@ std::shared_ptr<OperatorBase> TransferDtype(const std::string& var_name, ...@@ -347,8 +347,8 @@ std::shared_ptr<OperatorBase> TransferDtype(const std::string& var_name,
VLOG(3) << "Create Variable " << *new_var_name VLOG(3) << "Create Variable " << *new_var_name
<< " locally, which pointer is " << ptr << "Variable Type " << " locally, which pointer is " << ptr << "Variable Type "
<< var_type; << var_type;
var_scope->MutableDataTransferAddedVars().push_back( var_scope->MutableDataTransferAddedVars().emplace_back(*new_var_name,
std::make_pair(*new_var_name, var_type)); var_type);
var_scope->AddVar(*new_var_name, nullptr); var_scope->AddVar(*new_var_name, nullptr);
// 2. Construct VariableNameMap // 2. Construct VariableNameMap
...@@ -398,8 +398,8 @@ std::shared_ptr<OperatorBase> TransferDevice(const std::string& var_name, ...@@ -398,8 +398,8 @@ std::shared_ptr<OperatorBase> TransferDevice(const std::string& var_name,
VLOG(3) << "Create Variable " << *new_var_name VLOG(3) << "Create Variable " << *new_var_name
<< " locally, which pointer is " << ptr << "Variable Type " << " locally, which pointer is " << ptr << "Variable Type "
<< var_type; << var_type;
var_scope->MutableDataTransferAddedVars().push_back( var_scope->MutableDataTransferAddedVars().emplace_back(*new_var_name,
std::make_pair(*new_var_name, var_type)); var_type);
var_scope->AddVar(*new_var_name, nullptr); var_scope->AddVar(*new_var_name, nullptr);
// 2. Construct VariableNameMap // 2. Construct VariableNameMap
......
...@@ -61,9 +61,9 @@ const proto::OpDef& GetOpDef(const std::string& op_name) { ...@@ -61,9 +61,9 @@ const proto::OpDef& GetOpDef(const std::string& op_name) {
} }
if (op_def.type() != op_name) { if (op_def.type() != op_name) {
LOG(WARNING) << op_name << ".pbtxt has error type :" << op_def.type(); LOG(WARNING) << op_name << ".pbtxt has error type :" << op_def.type();
ops_definition.emplace(std::make_pair(op_name, proto::OpDef())); ops_definition.emplace(op_name, proto::OpDef());
} else { } else {
ops_definition.emplace(std::make_pair(op_name, std::move(op_def))); ops_definition.emplace(op_name, std::move(op_def));
} }
} }
} }
......
...@@ -30,7 +30,7 @@ TEST(OpDesc, SetScalarsAttr) { ...@@ -30,7 +30,7 @@ TEST(OpDesc, SetScalarsAttr) {
std::vector<paddle::experimental::Scalar> scalars; std::vector<paddle::experimental::Scalar> scalars;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
scalars.push_back(paddle::experimental::Scalar(i)); scalars.emplace_back(i);
} }
opdesc.SetPlainAttr("scalars", scalars); opdesc.SetPlainAttr("scalars", scalars);
ASSERT_EQ(opdesc.GetAttrType("scalars"), paddle::framework::proto::SCALARS); ASSERT_EQ(opdesc.GetAttrType("scalars"), paddle::framework::proto::SCALARS);
......
...@@ -64,8 +64,7 @@ void PipelineTrainer::InitDumpEnv() { ...@@ -64,8 +64,7 @@ void PipelineTrainer::InitDumpEnv() {
// TODO(sandyhouse): should make it as a config // TODO(sandyhouse): should make it as a config
dump_thread_num_ = 1; dump_thread_num_ = 1;
for (int i = 0; i < dump_thread_num_; i++) { for (int i = 0; i < dump_thread_num_; i++) {
dump_thread_.push_back( dump_thread_.emplace_back(std::bind(&TrainerBase::DumpWork, this, i));
std::thread(std::bind(&TrainerBase::DumpWork, this, i)));
} }
} }
......
...@@ -377,7 +377,7 @@ void Reducer::InitializeDenseGroups( ...@@ -377,7 +377,7 @@ void Reducer::InitializeDenseGroups(
p_group->length_.push_back(size); p_group->length_.push_back(size);
// for concat operator // for concat operator
p_group->dense_tensors_.push_back(phi::DenseTensor()); p_group->dense_tensors_.emplace_back();
// check the dtype and place, it must be same. // check the dtype and place, it must be same.
const auto &dtype = var->DataType(); const auto &dtype = var->DataType();
......
...@@ -2338,7 +2338,7 @@ void AnalysisPredictor::StatisticShapeRangeInfo() { ...@@ -2338,7 +2338,7 @@ void AnalysisPredictor::StatisticShapeRangeInfo() {
auto ShapeMaxFreq = auto ShapeMaxFreq =
[](const std::map<int32_t, int32_t> &m) -> int32_t { [](const std::map<int32_t, int32_t> &m) -> int32_t {
std::vector<std::pair<int32_t, int32_t>> counter; std::vector<std::pair<int32_t, int32_t>> counter;
for (auto &it : m) counter.push_back(it); for (auto &it : m) counter.emplace_back(it);
std::sort(counter.begin(), std::sort(counter.begin(),
counter.end(), counter.end(),
[](std::pair<int32_t, int32_t> &a, [](std::pair<int32_t, int32_t> &a,
......
...@@ -373,7 +373,7 @@ CreatePaddlePredictor<NativeConfig, PaddleEngineKind::kNative>( ...@@ -373,7 +373,7 @@ CreatePaddlePredictor<NativeConfig, PaddleEngineKind::kNative>(
std::vector<std::string> flags; std::vector<std::string> flags;
if (config.fraction_of_gpu_memory >= 0.0f || if (config.fraction_of_gpu_memory >= 0.0f ||
config.fraction_of_gpu_memory <= 0.95f) { config.fraction_of_gpu_memory <= 0.95f) {
flags.push_back("dummpy"); flags.emplace_back("dummpy");
std::string flag = "--fraction_of_gpu_memory_to_use=" + std::string flag = "--fraction_of_gpu_memory_to_use=" +
num2str<float>(config.fraction_of_gpu_memory); num2str<float>(config.fraction_of_gpu_memory);
flags.push_back(flag); flags.push_back(flag);
......
...@@ -393,7 +393,7 @@ void CpuPassStrategy::EnableMKLDNN() { ...@@ -393,7 +393,7 @@ void CpuPassStrategy::EnableMKLDNN() {
void CpuPassStrategy::EnableMkldnnQuantizer() { void CpuPassStrategy::EnableMkldnnQuantizer() {
#ifdef PADDLE_WITH_MKLDNN #ifdef PADDLE_WITH_MKLDNN
if (!use_mkldnn_quantizer_) { if (!use_mkldnn_quantizer_) {
passes_.push_back("cpu_quantize_placement_pass"); passes_.emplace_back("cpu_quantize_placement_pass");
} }
use_mkldnn_quantizer_ = true; use_mkldnn_quantizer_ = true;
#else #else
...@@ -404,12 +404,12 @@ void CpuPassStrategy::EnableMkldnnQuantizer() { ...@@ -404,12 +404,12 @@ void CpuPassStrategy::EnableMkldnnQuantizer() {
void CpuPassStrategy::EnableMkldnnBfloat16() { void CpuPassStrategy::EnableMkldnnBfloat16() {
#ifdef PADDLE_WITH_MKLDNN #ifdef PADDLE_WITH_MKLDNN
if (!use_mkldnn_bfloat16_) { if (!use_mkldnn_bfloat16_) {
passes_.push_back("fc_mkldnn_pass"); passes_.emplace_back("fc_mkldnn_pass");
passes_.push_back("fc_act_mkldnn_fuse_pass"); passes_.emplace_back("fc_act_mkldnn_fuse_pass");
passes_.push_back("cpu_bfloat16_placement_pass"); passes_.emplace_back("cpu_bfloat16_placement_pass");
passes_.push_back("cpu_bfloat16_pass"); passes_.emplace_back("cpu_bfloat16_pass");
passes_.push_back("cpu_quantize_squash_pass"); passes_.emplace_back("cpu_quantize_squash_pass");
} }
use_mkldnn_bfloat16_ = true; use_mkldnn_bfloat16_ = true;
#else #else
...@@ -421,60 +421,60 @@ void CpuPassStrategy::EnableMkldnnInt8() { ...@@ -421,60 +421,60 @@ void CpuPassStrategy::EnableMkldnnInt8() {
#ifdef PADDLE_WITH_MKLDNN #ifdef PADDLE_WITH_MKLDNN
if (!use_mkldnn_int8_) { if (!use_mkldnn_int8_) {
passes_.clear(); passes_.clear();
passes_.push_back("simplify_with_basic_ops_pass"); passes_.emplace_back("simplify_with_basic_ops_pass");
passes_.push_back("quant_dequant_mkldnn_pass"); passes_.emplace_back("quant_dequant_mkldnn_pass");
passes_.push_back("mkldnn_placement_pass"); passes_.emplace_back("mkldnn_placement_pass");
passes_.push_back("constant_folding_pass"); passes_.emplace_back("constant_folding_pass");
passes_.push_back("squeeze2_transpose2_onednn_fuse_pass"); passes_.emplace_back("squeeze2_transpose2_onednn_fuse_pass");
passes_.push_back("layer_norm_fuse_pass"); passes_.emplace_back("layer_norm_fuse_pass");
passes_.push_back("attention_lstm_fuse_pass"); passes_.emplace_back("attention_lstm_fuse_pass");
passes_.push_back("seqconv_eltadd_relu_fuse_pass"); passes_.emplace_back("seqconv_eltadd_relu_fuse_pass");
passes_.push_back("fc_lstm_fuse_pass"); passes_.emplace_back("fc_lstm_fuse_pass");
passes_.push_back("mul_lstm_fuse_pass"); passes_.emplace_back("mul_lstm_fuse_pass");
passes_.push_back("fc_gru_fuse_pass"); passes_.emplace_back("fc_gru_fuse_pass");
passes_.push_back("mul_gru_fuse_pass"); passes_.emplace_back("mul_gru_fuse_pass");
passes_.push_back("multi_gru_fuse_pass"); passes_.emplace_back("multi_gru_fuse_pass");
passes_.push_back("multi_gru_seq_fuse_pass"); passes_.emplace_back("multi_gru_seq_fuse_pass");
passes_.push_back("seq_concat_fc_fuse_pass"); passes_.emplace_back("seq_concat_fc_fuse_pass");
passes_.push_back("gpu_cpu_squeeze2_matmul_fuse_pass"); passes_.emplace_back("gpu_cpu_squeeze2_matmul_fuse_pass");
passes_.push_back("gpu_cpu_reshape2_matmul_fuse_pass"); passes_.emplace_back("gpu_cpu_reshape2_matmul_fuse_pass");
passes_.push_back("gpu_cpu_flatten2_matmul_fuse_pass"); passes_.emplace_back("gpu_cpu_flatten2_matmul_fuse_pass");
passes_.push_back("matmul_v2_scale_fuse_pass"); passes_.emplace_back("matmul_v2_scale_fuse_pass");
passes_.push_back("squared_mat_sub_fuse_pass"); passes_.emplace_back("squared_mat_sub_fuse_pass");
passes_.push_back("is_test_pass"); passes_.emplace_back("is_test_pass");
passes_.push_back("gpu_cpu_map_matmul_v2_to_mul_pass"); passes_.emplace_back("gpu_cpu_map_matmul_v2_to_mul_pass");
passes_.push_back("gpu_cpu_map_matmul_v2_to_matmul_pass"); passes_.emplace_back("gpu_cpu_map_matmul_v2_to_matmul_pass");
passes_.push_back("matmul_scale_fuse_pass"); passes_.emplace_back("matmul_scale_fuse_pass");
passes_.push_back("gpu_cpu_map_matmul_to_mul_pass"); passes_.emplace_back("gpu_cpu_map_matmul_to_mul_pass");
passes_.push_back("repeated_fc_relu_fuse_pass"); passes_.emplace_back("repeated_fc_relu_fuse_pass");
passes_.push_back("depthwise_conv_mkldnn_pass"); passes_.emplace_back("depthwise_conv_mkldnn_pass");
passes_.push_back("conv_bn_fuse_pass"); passes_.emplace_back("conv_bn_fuse_pass");
passes_.push_back("conv_eltwiseadd_bn_fuse_pass"); passes_.emplace_back("conv_eltwiseadd_bn_fuse_pass");
passes_.push_back("conv_affine_channel_mkldnn_fuse_pass"); passes_.emplace_back("conv_affine_channel_mkldnn_fuse_pass");
passes_.push_back("conv_transpose_bn_fuse_pass"); passes_.emplace_back("conv_transpose_bn_fuse_pass");
passes_.push_back("conv_transpose_eltwiseadd_bn_fuse_pass"); passes_.emplace_back("conv_transpose_eltwiseadd_bn_fuse_pass");
passes_.push_back("conv_bias_mkldnn_fuse_pass"); passes_.emplace_back("conv_bias_mkldnn_fuse_pass");
passes_.push_back("conv_transpose_bias_mkldnn_fuse_pass"); passes_.emplace_back("conv_transpose_bias_mkldnn_fuse_pass");
passes_.push_back("conv_elementwise_add_mkldnn_fuse_pass"); passes_.emplace_back("conv_elementwise_add_mkldnn_fuse_pass");
passes_.push_back("conv_activation_mkldnn_fuse_pass"); passes_.emplace_back("conv_activation_mkldnn_fuse_pass");
passes_.push_back("fc_fuse_pass"); passes_.emplace_back("fc_fuse_pass");
passes_.push_back("repeated_fc_relu_fuse_pass"); passes_.emplace_back("repeated_fc_relu_fuse_pass");
passes_.push_back("fc_mkldnn_pass"); passes_.emplace_back("fc_mkldnn_pass");
passes_.push_back("fc_act_mkldnn_fuse_pass"); passes_.emplace_back("fc_act_mkldnn_fuse_pass");
passes_.push_back("matmul_transpose_reshape_mkldnn_fuse_pass"); passes_.emplace_back("matmul_transpose_reshape_mkldnn_fuse_pass");
passes_.push_back("batch_norm_act_fuse_pass"); passes_.emplace_back("batch_norm_act_fuse_pass");
passes_.push_back("softplus_activation_onednn_fuse_pass"); passes_.emplace_back("softplus_activation_onednn_fuse_pass");
passes_.push_back("compute_propagate_scales_mkldnn_pass"); passes_.emplace_back("compute_propagate_scales_mkldnn_pass");
passes_.push_back("scale_matmul_fuse_pass"); passes_.emplace_back("scale_matmul_fuse_pass");
passes_.push_back("reshape_transpose_matmul_mkldnn_fuse_pass"); passes_.emplace_back("reshape_transpose_matmul_mkldnn_fuse_pass");
passes_.push_back("matmul_elementwise_add_mkldnn_fuse_pass"); passes_.emplace_back("matmul_elementwise_add_mkldnn_fuse_pass");
passes_.push_back("operator_scale_onednn_fuse_pass"); passes_.emplace_back("operator_scale_onednn_fuse_pass");
passes_.push_back("operator_unsqueeze2_onednn_fuse_pass"); passes_.emplace_back("operator_unsqueeze2_onednn_fuse_pass");
passes_.push_back("operator_reshape2_onednn_fuse_pass"); passes_.emplace_back("operator_reshape2_onednn_fuse_pass");
passes_.push_back("cpu_quantize_placement_pass"); passes_.emplace_back("cpu_quantize_placement_pass");
passes_.push_back("cpu_quantize_pass"); passes_.emplace_back("cpu_quantize_pass");
passes_.push_back("cpu_quantize_squash_pass"); passes_.emplace_back("cpu_quantize_squash_pass");
passes_.push_back("quant_transpose2_dequant_onednn_fuse_pass"); passes_.emplace_back("quant_transpose2_dequant_onednn_fuse_pass");
} }
use_mkldnn_int8_ = true; use_mkldnn_int8_ = true;
#else #else
......
...@@ -122,7 +122,7 @@ static std::vector<ExprWrapper> DimsExprs2VecExprWrapper( ...@@ -122,7 +122,7 @@ static std::vector<ExprWrapper> DimsExprs2VecExprWrapper(
) { ) {
std::vector<ExprWrapper> x_dims_wrap; std::vector<ExprWrapper> x_dims_wrap;
for (int i = 0; i < x_dims.nbDims; i++) { for (int i = 0; i < x_dims.nbDims; i++) {
x_dims_wrap.push_back(ExprWrapper(x_dims.d[i], &expr_builder)); x_dims_wrap.emplace_back(x_dims.d[i], &expr_builder);
} }
return x_dims_wrap; return x_dims_wrap;
} }
...@@ -643,7 +643,7 @@ nvinfer1::DimsExprs Conv2dFusionInferMeta( ...@@ -643,7 +643,7 @@ nvinfer1::DimsExprs Conv2dFusionInferMeta(
std::vector<ExprWrapper> paddings_wrap; std::vector<ExprWrapper> paddings_wrap;
for (size_t i = 0; i < paddings.size(); ++i) { for (size_t i = 0; i < paddings.size(); ++i) {
paddings_wrap.emplace_back(ExprWrapper(paddings[i], &expr_builder)); paddings_wrap.emplace_back(paddings[i], &expr_builder);
} }
UpdatePaddingAndDilation(&paddings_wrap, UpdatePaddingAndDilation(&paddings_wrap,
......
...@@ -92,7 +92,7 @@ void TablePrinter::InsertRow(const std::vector<std::string>& row) { ...@@ -92,7 +92,7 @@ void TablePrinter::InsertRow(const std::vector<std::string>& row) {
size_t max_height = 0; size_t max_height = 0;
for (size_t i = 0; i < row.size(); ++i) { for (size_t i = 0; i < row.size(); ++i) {
table_row.emplace_back(std::vector<std::string>()); table_row.emplace_back();
std::stringstream ss(row[i]); std::stringstream ss(row[i]);
std::string line; std::string line;
size_t max_width = 0; size_t max_width = 0;
...@@ -113,7 +113,7 @@ void TablePrinter::InsertRow(const std::vector<std::string>& row) { ...@@ -113,7 +113,7 @@ void TablePrinter::InsertRow(const std::vector<std::string>& row) {
void TablePrinter::InsetDivider() { void TablePrinter::InsetDivider() {
heights_.emplace_back(1); heights_.emplace_back(1);
data_.emplace_back(std::vector<std::vector<std::string>>()); data_.emplace_back();
} }
void TablePrinter::CalcLayout() { void TablePrinter::CalcLayout() {
......
...@@ -260,7 +260,8 @@ std::unique_ptr<ir::Program> PdOpLowerToKernelPass(ir::Program* prog, ...@@ -260,7 +260,8 @@ std::unique_ptr<ir::Program> PdOpLowerToKernelPass(ir::Program* prog,
op_item->dyn_cast<paddle::dialect::OpYamlInfoInterface>(); op_item->dyn_cast<paddle::dialect::OpYamlInfoInterface>();
std::unique_ptr<OpYamlInfoParser> op_info_parser; std::unique_ptr<OpYamlInfoParser> op_info_parser;
if (op_info_interface) { if (op_info_interface) {
op_info_parser.reset(new OpYamlInfoParser(op_info_interface.GetOpInfo())); op_info_parser =
std::make_unique<OpYamlInfoParser>(op_info_interface.GetOpInfo());
} }
std::string kernel_fn_str; std::string kernel_fn_str;
...@@ -328,7 +329,7 @@ std::unique_ptr<ir::Program> PdOpLowerToKernelPass(ir::Program* prog, ...@@ -328,7 +329,7 @@ std::unique_ptr<ir::Program> PdOpLowerToKernelPass(ir::Program* prog,
ctx, ctx,
phi::TransToPhiPlace(kernel_key.backend()), phi::TransToPhiPlace(kernel_key.backend()),
result_type.dyn_cast<dialect::SelectedRowsType>()); result_type.dyn_cast<dialect::SelectedRowsType>());
op_output_types.push_back(allocated_selected_rows_dtype); op_output_types.emplace_back(allocated_selected_rows_dtype);
} else { } else {
PADDLE_THROW(phi::errors::Unimplemented( PADDLE_THROW(phi::errors::Unimplemented(
"Result type only support DenseTensorType and VectorType")); "Result type only support DenseTensorType and VectorType"));
...@@ -343,7 +344,7 @@ std::unique_ptr<ir::Program> PdOpLowerToKernelPass(ir::Program* prog, ...@@ -343,7 +344,7 @@ std::unique_ptr<ir::Program> PdOpLowerToKernelPass(ir::Program* prog,
for (size_t i = 0; i < op_item->num_operands(); ++i) { for (size_t i = 0; i < op_item->num_operands(); ++i) {
auto cur_in = op_item->operand_source(i); auto cur_in = op_item->operand_source(i);
if (!cur_in) { if (!cur_in) {
vec_inputs.push_back(ir::OpResult()); vec_inputs.emplace_back();
continue; continue;
} }
PADDLE_ENFORCE_EQ(map_value_pair.count(cur_in), PADDLE_ENFORCE_EQ(map_value_pair.count(cur_in),
......
...@@ -388,7 +388,7 @@ std::vector<ir::OpResult> OpTranscriber::GenerateOperationInput( ...@@ -388,7 +388,7 @@ std::vector<ir::OpResult> OpTranscriber::GenerateOperationInput(
if (legacy_input_vars.empty()) { if (legacy_input_vars.empty()) {
if (info.optional) { if (info.optional) {
op_inputs.push_back(ir::OpResult(nullptr)); op_inputs.emplace_back(nullptr);
continue; continue;
} }
} }
...@@ -484,7 +484,7 @@ OpTranscriber::GenerateOperationOutput(ir::IrContext* ctx, ...@@ -484,7 +484,7 @@ OpTranscriber::GenerateOperationOutput(ir::IrContext* ctx,
"Op %s arg %s should be optional if it can be empty", "Op %s arg %s should be optional if it can be empty",
op_desc.Type(), op_desc.Type(),
legacy_output_name); legacy_output_name);
op_output_types.push_back(ir::Type(nullptr)); op_output_types.emplace_back(nullptr);
continue; continue;
} }
...@@ -521,7 +521,7 @@ OpTranscriber::GenerateOperationOutput(ir::IrContext* ctx, ...@@ -521,7 +521,7 @@ OpTranscriber::GenerateOperationOutput(ir::IrContext* ctx,
<< info.type_name << " " << legacy_output_name << " " << info.type_name << " " << legacy_output_name << " "
<< legacy_output_vars.size(); << legacy_output_vars.size();
if (legacy_output_vars.empty()) { if (legacy_output_vars.empty()) {
op_output_types.push_back(ir::Type(nullptr)); op_output_types.emplace_back(nullptr);
continue; continue;
} }
...@@ -548,7 +548,7 @@ OpTranscriber::GenerateOperationOutput(ir::IrContext* ctx, ...@@ -548,7 +548,7 @@ OpTranscriber::GenerateOperationOutput(ir::IrContext* ctx,
std::vector<ir::Type> types; std::vector<ir::Type> types;
for (const auto& var_name : legacy_output_vars) { for (const auto& var_name : legacy_output_vars) {
if (var_name == kEmptyVarName) { if (var_name == kEmptyVarName) {
types.push_back(ir::Type(nullptr)); types.emplace_back(nullptr);
arg_to_idx[var_name] = cur_output_idx; arg_to_idx[var_name] = cur_output_idx;
continue; continue;
} }
......
...@@ -146,7 +146,7 @@ void VirtualMemoryAutoGrowthBestFitAllocator::ExtendAndMerge(size_t size) { ...@@ -146,7 +146,7 @@ void VirtualMemoryAutoGrowthBestFitAllocator::ExtendAndMerge(size_t size) {
allocations_.push_back(std::move(allocateptr)); // hold allocation allocations_.push_back(std::move(allocateptr)); // hold allocation
if (all_blocks_.empty()) { if (all_blocks_.empty()) {
all_blocks_.push_back(Block(ptr, size, true)); all_blocks_.emplace_back(ptr, size, true);
free_blocks_.emplace(std::make_pair(size, ptr), all_blocks_.begin()); free_blocks_.emplace(std::make_pair(size, ptr), all_blocks_.begin());
return; return;
} }
...@@ -165,7 +165,7 @@ void VirtualMemoryAutoGrowthBestFitAllocator::ExtendAndMerge(size_t size) { ...@@ -165,7 +165,7 @@ void VirtualMemoryAutoGrowthBestFitAllocator::ExtendAndMerge(size_t size) {
block_it); block_it);
} else { } else {
// do not merge // do not merge
all_blocks_.push_front(Block(ptr, size, true)); all_blocks_.emplace_back(ptr, size, true);
free_blocks_.emplace(std::make_pair(size, ptr), all_blocks_.begin()); free_blocks_.emplace(std::make_pair(size, ptr), all_blocks_.begin());
} }
} else { } else {
...@@ -222,7 +222,7 @@ void VirtualMemoryAutoGrowthBestFitAllocator::ExtendAndMerge(size_t size) { ...@@ -222,7 +222,7 @@ void VirtualMemoryAutoGrowthBestFitAllocator::ExtendAndMerge(size_t size) {
block_it); block_it);
} else { } else {
// do not merge // do not merge
all_blocks_.push_back(Block(ptr, size, true)); all_blocks_.emplace_back(ptr, size, true);
auto block_it = all_blocks_.end(); auto block_it = all_blocks_.end();
block_it--; block_it--;
free_blocks_.emplace(std::make_pair(size, ptr), block_it); free_blocks_.emplace(std::make_pair(size, ptr), block_it);
......
...@@ -193,8 +193,8 @@ TEST(Malloc, GPUContextMultiThreadMultiStream) { ...@@ -193,8 +193,8 @@ TEST(Malloc, GPUContextMultiThreadMultiStream) {
.get()); .get());
ctx->PartialInitWithAllocator(); ctx->PartialInitWithAllocator();
dev_ctx.emplace_back(std::move(ctx)); dev_ctx.emplace_back(std::move(ctx));
threads.push_back(std::thread( threads.emplace_back(
MultiStreamCompute, &data[i], &second_data[i], std::cref(*dev_ctx[i]))); MultiStreamCompute, &data[i], &second_data[i], std::cref(*dev_ctx[i]));
} }
for (int i = 0; i < NUM_STREAMS; ++i) { for (int i = 0; i < NUM_STREAMS; ++i) {
......
...@@ -289,8 +289,7 @@ class StreamSafeCUDAAllocTest : public ::testing::Test { ...@@ -289,8 +289,7 @@ class StreamSafeCUDAAllocTest : public ::testing::Test {
void MultiThreadMultiStreamRun() { void MultiThreadMultiStreamRun() {
std::vector<std::thread> threads; std::vector<std::thread> threads;
for (size_t i = 0; i < stream_num_; ++i) { for (size_t i = 0; i < stream_num_; ++i) {
threads.push_back( threads.emplace_back(&StreamSafeCUDAAllocTest::SingleStreamRun, this, i);
std::thread(&StreamSafeCUDAAllocTest::SingleStreamRun, this, i));
} }
for (size_t i = 0; i < stream_num_; ++i) { for (size_t i = 0; i < stream_num_; ++i) {
threads[i].join(); threads[i].join();
......
...@@ -124,7 +124,7 @@ class MultiGRUHandler { ...@@ -124,7 +124,7 @@ class MultiGRUHandler {
// Create attributes for each oneDNN gru // Create attributes for each oneDNN gru
for (int i = 0; i < 2 * layers_; ++i) { for (int i = 0; i < 2 * layers_; ++i) {
attrs_.push_back(dnnl::primitive_attr()); attrs_.emplace_back();
} }
if (is_int8) { if (is_int8) {
......
...@@ -26,8 +26,8 @@ std::vector<TreeNode> Tree2ColUtil::construct_patch( ...@@ -26,8 +26,8 @@ std::vector<TreeNode> Tree2ColUtil::construct_patch(
std::unordered_map<int, bool> visited; std::unordered_map<int, bool> visited;
std::vector<TreeNode> patch; std::vector<TreeNode> patch;
stack.push(TreeNode(root, 1, 1, 0)); stack.emplace(root, 1, 1, 0);
patch.emplace_back(TreeNode(root, 1, 1, 0)); patch.emplace_back(root, 1, 1, 0);
visited[root] = true; visited[root] = true;
while (!stack.empty()) { while (!stack.empty()) {
...@@ -39,8 +39,8 @@ std::vector<TreeNode> Tree2ColUtil::construct_patch( ...@@ -39,8 +39,8 @@ std::vector<TreeNode> Tree2ColUtil::construct_patch(
size_t v = tr[node][i]; size_t v = tr[node][i];
if (!visited[v] && static_cast<int>(u.get_depth()) + 1 < max_depth) { if (!visited[v] && static_cast<int>(u.get_depth()) + 1 < max_depth) {
visited[v] = true; visited[v] = true;
stack.push(TreeNode(v, i, sz, u.get_depth() + 1)); stack.emplace(v, i, sz, u.get_depth() + 1);
patch.push_back(TreeNode(v, i + 1, sz, u.get_depth() + 1)); patch.emplace_back(v, i + 1, sz, u.get_depth() + 1);
end = false; end = false;
} }
} }
......
...@@ -44,19 +44,19 @@ TEST(SerializationLoggerTest, dump_case0) { ...@@ -44,19 +44,19 @@ TEST(SerializationLoggerTest, dump_case0) {
std::list<DeviceTraceEvent> device_events; std::list<DeviceTraceEvent> device_events;
std::list<MemTraceEvent> mem_events; std::list<MemTraceEvent> mem_events;
std::list<OperatorSupplementEvent> op_supplement_events; std::list<OperatorSupplementEvent> op_supplement_events;
host_events.push_back(HostTraceEvent(std::string("dataloader#1"), host_events.emplace_back(std::string("dataloader#1"),
TracerEventType::Dataloader, TracerEventType::Dataloader,
1000, 1000,
10000, 10000,
10, 10,
10)); 10);
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op1"), TracerEventType::Operator, 11000, 20000, 10, 10)); std::string("op1"), TracerEventType::Operator, 11000, 20000, 10, 10);
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op2"), TracerEventType::Operator, 21000, 30000, 10, 10)); std::string("op2"), TracerEventType::Operator, 21000, 30000, 10, 10);
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op3"), TracerEventType::Operator, 31000, 40000, 10, 11)); std::string("op3"), TracerEventType::Operator, 31000, 40000, 10, 11);
mem_events.push_back(MemTraceEvent(11500, mem_events.emplace_back(11500,
0x1000, 0x1000,
TracerMemEventType::Allocate, TracerMemEventType::Allocate,
10, 10,
...@@ -66,8 +66,8 @@ TEST(SerializationLoggerTest, dump_case0) { ...@@ -66,8 +66,8 @@ TEST(SerializationLoggerTest, dump_case0) {
50, 50,
50, 50,
100, 100,
100)); 100);
mem_events.push_back(MemTraceEvent(11900, mem_events.emplace_back(11900,
0x1000, 0x1000,
TracerMemEventType::Free, TracerMemEventType::Free,
10, 10,
...@@ -77,27 +77,27 @@ TEST(SerializationLoggerTest, dump_case0) { ...@@ -77,27 +77,27 @@ TEST(SerializationLoggerTest, dump_case0) {
0, 0,
50, 50,
100, 100,
100)); 100);
std::map<std::string, std::vector<std::vector<int64_t>>> input_shapes; std::map<std::string, std::vector<std::vector<int64_t>>> input_shapes;
std::map<std::string, std::vector<std::string>> dtypes; std::map<std::string, std::vector<std::string>> dtypes;
input_shapes[std::string("X")].push_back(std::vector<int64_t>{1, 2, 3}); input_shapes[std::string("X")].push_back(std::vector<int64_t>{1, 2, 3});
input_shapes[std::string("X")].push_back(std::vector<int64_t>{4, 5, 6, 7}); input_shapes[std::string("X")].push_back(std::vector<int64_t>{4, 5, 6, 7});
dtypes[std::string("X")].push_back(std::string("int8")); dtypes[std::string("X")].emplace_back("int8");
dtypes[std::string("X")].push_back(std::string("float32")); dtypes[std::string("X")].emplace_back("float32");
AttributeMap attrs; AttributeMap attrs;
op_supplement_events.push_back(OperatorSupplementEvent( op_supplement_events.emplace_back(
11600, "op1", input_shapes, dtypes, "op1()", attrs, 0, 10, 10)); 11600, "op1", input_shapes, dtypes, "op1()", attrs, 0, 10, 10);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch1"), 15000, 17000, 10, 10, 1, 0)); std::string("cudalaunch1"), 15000, 17000, 10, 10, 1, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch2"), 25000, 35000, 10, 10, 2, 0)); std::string("cudalaunch2"), 25000, 35000, 10, 10, 2, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch3"), 33000, 37000, 10, 11, 3, 0)); std::string("cudalaunch3"), 33000, 37000, 10, 11, 3, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudaMemcpy1"), 18000, 19000, 10, 10, 4, 0)); std::string("cudaMemcpy1"), 18000, 19000, 10, 10, 4, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudaMemset1"), 38000, 39000, 10, 11, 5, 0)); std::string("cudaMemset1"), 38000, 39000, 10, 11, 5, 0);
device_events.push_back(DeviceTraceEvent(std::string("kernel1"), device_events.emplace_back(std::string("kernel1"),
TracerEventType::Kernel, TracerEventType::Kernel,
40000, 40000,
55000, 55000,
...@@ -105,8 +105,8 @@ TEST(SerializationLoggerTest, dump_case0) { ...@@ -105,8 +105,8 @@ TEST(SerializationLoggerTest, dump_case0) {
10, 10,
10, 10,
1, 1,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel2"), device_events.emplace_back(std::string("kernel2"),
TracerEventType::Kernel, TracerEventType::Kernel,
70000, 70000,
95000, 95000,
...@@ -114,8 +114,8 @@ TEST(SerializationLoggerTest, dump_case0) { ...@@ -114,8 +114,8 @@ TEST(SerializationLoggerTest, dump_case0) {
10, 10,
10, 10,
2, 2,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel3"), device_events.emplace_back(std::string("kernel3"),
TracerEventType::Kernel, TracerEventType::Kernel,
60000, 60000,
65000, 65000,
...@@ -123,8 +123,8 @@ TEST(SerializationLoggerTest, dump_case0) { ...@@ -123,8 +123,8 @@ TEST(SerializationLoggerTest, dump_case0) {
10, 10,
11, 11,
3, 3,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("memcpy1"), device_events.emplace_back(std::string("memcpy1"),
TracerEventType::Memcpy, TracerEventType::Memcpy,
56000, 56000,
59000, 59000,
...@@ -132,8 +132,8 @@ TEST(SerializationLoggerTest, dump_case0) { ...@@ -132,8 +132,8 @@ TEST(SerializationLoggerTest, dump_case0) {
10, 10,
10, 10,
4, 4,
MemcpyEventInfo())); MemcpyEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("memset1"), device_events.emplace_back(std::string("memset1"),
TracerEventType::Memset, TracerEventType::Memset,
66000, 66000,
69000, 69000,
...@@ -141,7 +141,7 @@ TEST(SerializationLoggerTest, dump_case0) { ...@@ -141,7 +141,7 @@ TEST(SerializationLoggerTest, dump_case0) {
10, 10,
11, 11,
5, 5,
MemsetEventInfo())); MemsetEventInfo());
SerializationLogger logger("test_serialization_logger_case0.pb"); SerializationLogger logger("test_serialization_logger_case0.pb");
logger.LogMetaInfo(std::string("1.0.2"), 0); logger.LogMetaInfo(std::string("1.0.2"), 0);
NodeTrees tree(host_events, NodeTrees tree(host_events,
...@@ -182,17 +182,17 @@ TEST(SerializationLoggerTest, dump_case1) { ...@@ -182,17 +182,17 @@ TEST(SerializationLoggerTest, dump_case1) {
std::list<DeviceTraceEvent> device_events; std::list<DeviceTraceEvent> device_events;
std::list<MemTraceEvent> mem_events; std::list<MemTraceEvent> mem_events;
std::list<OperatorSupplementEvent> op_supplement_events; std::list<OperatorSupplementEvent> op_supplement_events;
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch1"), 15000, 17000, 10, 10, 1, 0)); std::string("cudalaunch1"), 15000, 17000, 10, 10, 1, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch2"), 25000, 35000, 10, 10, 2, 0)); std::string("cudalaunch2"), 25000, 35000, 10, 10, 2, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch3"), 33000, 37000, 10, 11, 3, 0)); std::string("cudalaunch3"), 33000, 37000, 10, 11, 3, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudaMemcpy1"), 18000, 19000, 10, 10, 4, 0)); std::string("cudaMemcpy1"), 18000, 19000, 10, 10, 4, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudaMemset1"), 38000, 39000, 10, 11, 5, 0)); std::string("cudaMemset1"), 38000, 39000, 10, 11, 5, 0);
device_events.push_back(DeviceTraceEvent(std::string("kernel1"), device_events.emplace_back(std::string("kernel1"),
TracerEventType::Kernel, TracerEventType::Kernel,
40000, 40000,
55000, 55000,
...@@ -200,8 +200,8 @@ TEST(SerializationLoggerTest, dump_case1) { ...@@ -200,8 +200,8 @@ TEST(SerializationLoggerTest, dump_case1) {
10, 10,
10, 10,
1, 1,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel2"), device_events.emplace_back(std::string("kernel2"),
TracerEventType::Kernel, TracerEventType::Kernel,
70000, 70000,
95000, 95000,
...@@ -209,8 +209,8 @@ TEST(SerializationLoggerTest, dump_case1) { ...@@ -209,8 +209,8 @@ TEST(SerializationLoggerTest, dump_case1) {
10, 10,
10, 10,
2, 2,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel3"), device_events.emplace_back(std::string("kernel3"),
TracerEventType::Kernel, TracerEventType::Kernel,
60000, 60000,
65000, 65000,
...@@ -218,8 +218,8 @@ TEST(SerializationLoggerTest, dump_case1) { ...@@ -218,8 +218,8 @@ TEST(SerializationLoggerTest, dump_case1) {
10, 10,
11, 11,
3, 3,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("memcpy1"), device_events.emplace_back(std::string("memcpy1"),
TracerEventType::Memcpy, TracerEventType::Memcpy,
56000, 56000,
59000, 59000,
...@@ -227,8 +227,8 @@ TEST(SerializationLoggerTest, dump_case1) { ...@@ -227,8 +227,8 @@ TEST(SerializationLoggerTest, dump_case1) {
10, 10,
10, 10,
4, 4,
MemcpyEventInfo())); MemcpyEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("memset1"), device_events.emplace_back(std::string("memset1"),
TracerEventType::Memset, TracerEventType::Memset,
66000, 66000,
69000, 69000,
...@@ -236,7 +236,7 @@ TEST(SerializationLoggerTest, dump_case1) { ...@@ -236,7 +236,7 @@ TEST(SerializationLoggerTest, dump_case1) {
10, 10,
11, 11,
5, 5,
MemsetEventInfo())); MemsetEventInfo());
SerializationLogger logger("test_serialization_logger_case1.pb"); SerializationLogger logger("test_serialization_logger_case1.pb");
logger.LogMetaInfo(std::string("1.0.2"), 0); logger.LogMetaInfo(std::string("1.0.2"), 0);
NodeTrees tree(host_events, NodeTrees tree(host_events,
......
...@@ -42,19 +42,19 @@ TEST(NodeTreesTest, LogMe_case0) { ...@@ -42,19 +42,19 @@ TEST(NodeTreesTest, LogMe_case0) {
std::list<DeviceTraceEvent> device_events; std::list<DeviceTraceEvent> device_events;
std::list<MemTraceEvent> mem_events; std::list<MemTraceEvent> mem_events;
std::list<OperatorSupplementEvent> op_supplement_events; std::list<OperatorSupplementEvent> op_supplement_events;
host_events.push_back(HostTraceEvent(std::string("dataloader#1"), host_events.emplace_back(std::string("dataloader#1"),
TracerEventType::Dataloader, TracerEventType::Dataloader,
1000, 1000,
10000, 10000,
10, 10,
10)); 10);
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op1"), TracerEventType::Operator, 11000, 20000, 10, 10)); std::string("op1"), TracerEventType::Operator, 11000, 20000, 10, 10);
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op2"), TracerEventType::Operator, 21000, 30000, 10, 10)); std::string("op2"), TracerEventType::Operator, 21000, 30000, 10, 10);
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op3"), TracerEventType::Operator, 31000, 40000, 10, 11)); std::string("op3"), TracerEventType::Operator, 31000, 40000, 10, 11);
mem_events.push_back(MemTraceEvent(11500, mem_events.emplace_back(11500,
0x1000, 0x1000,
TracerMemEventType::Allocate, TracerMemEventType::Allocate,
10, 10,
...@@ -64,8 +64,8 @@ TEST(NodeTreesTest, LogMe_case0) { ...@@ -64,8 +64,8 @@ TEST(NodeTreesTest, LogMe_case0) {
50, 50,
50, 50,
100, 100,
100)); 100);
mem_events.push_back(MemTraceEvent(11900, mem_events.emplace_back(11900,
0x1000, 0x1000,
TracerMemEventType::Free, TracerMemEventType::Free,
10, 10,
...@@ -75,27 +75,27 @@ TEST(NodeTreesTest, LogMe_case0) { ...@@ -75,27 +75,27 @@ TEST(NodeTreesTest, LogMe_case0) {
0, 0,
50, 50,
100, 100,
100)); 100);
std::map<std::string, std::vector<std::vector<int64_t>>> input_shapes; std::map<std::string, std::vector<std::vector<int64_t>>> input_shapes;
std::map<std::string, std::vector<std::string>> dtypes; std::map<std::string, std::vector<std::string>> dtypes;
input_shapes[std::string("X")].push_back(std::vector<int64_t>{1, 2, 3}); input_shapes[std::string("X")].push_back(std::vector<int64_t>{1, 2, 3});
input_shapes[std::string("X")].push_back(std::vector<int64_t>{4, 5, 6, 7}); input_shapes[std::string("X")].push_back(std::vector<int64_t>{4, 5, 6, 7});
dtypes[std::string("X")].push_back(std::string("int8")); dtypes[std::string("X")].emplace_back("int8");
dtypes[std::string("X")].push_back(std::string("float32")); dtypes[std::string("X")].emplace_back("float32");
AttributeMap attrs; AttributeMap attrs;
op_supplement_events.push_back(OperatorSupplementEvent( op_supplement_events.emplace_back(
11600, "op1", input_shapes, dtypes, "op1()", attrs, 0, 10, 10)); 11600, "op1", input_shapes, dtypes, "op1()", attrs, 0, 10, 10);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch1"), 15000, 17000, 10, 10, 1, 0)); std::string("cudalaunch1"), 15000, 17000, 10, 10, 1, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch2"), 25000, 35000, 10, 10, 2, 0)); std::string("cudalaunch2"), 25000, 35000, 10, 10, 2, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch3"), 33000, 37000, 10, 11, 3, 0)); std::string("cudalaunch3"), 33000, 37000, 10, 11, 3, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudaMemcpy1"), 18000, 19000, 10, 10, 4, 0)); std::string("cudaMemcpy1"), 18000, 19000, 10, 10, 4, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudaMemset1"), 38000, 39000, 10, 11, 5, 0)); std::string("cudaMemset1"), 38000, 39000, 10, 11, 5, 0);
device_events.push_back(DeviceTraceEvent(std::string("kernel1"), device_events.emplace_back(std::string("kernel1"),
TracerEventType::Kernel, TracerEventType::Kernel,
40000, 40000,
55000, 55000,
...@@ -103,8 +103,8 @@ TEST(NodeTreesTest, LogMe_case0) { ...@@ -103,8 +103,8 @@ TEST(NodeTreesTest, LogMe_case0) {
10, 10,
10, 10,
1, 1,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel2"), device_events.emplace_back(std::string("kernel2"),
TracerEventType::Kernel, TracerEventType::Kernel,
70000, 70000,
95000, 95000,
...@@ -112,8 +112,8 @@ TEST(NodeTreesTest, LogMe_case0) { ...@@ -112,8 +112,8 @@ TEST(NodeTreesTest, LogMe_case0) {
10, 10,
10, 10,
2, 2,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel3"), device_events.emplace_back(std::string("kernel3"),
TracerEventType::Kernel, TracerEventType::Kernel,
60000, 60000,
65000, 65000,
...@@ -121,8 +121,8 @@ TEST(NodeTreesTest, LogMe_case0) { ...@@ -121,8 +121,8 @@ TEST(NodeTreesTest, LogMe_case0) {
10, 10,
11, 11,
3, 3,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("memcpy1"), device_events.emplace_back(std::string("memcpy1"),
TracerEventType::Memcpy, TracerEventType::Memcpy,
56000, 56000,
59000, 59000,
...@@ -130,8 +130,8 @@ TEST(NodeTreesTest, LogMe_case0) { ...@@ -130,8 +130,8 @@ TEST(NodeTreesTest, LogMe_case0) {
10, 10,
10, 10,
4, 4,
MemcpyEventInfo())); MemcpyEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("memset1"), device_events.emplace_back(std::string("memset1"),
TracerEventType::Memset, TracerEventType::Memset,
66000, 66000,
69000, 69000,
...@@ -139,7 +139,7 @@ TEST(NodeTreesTest, LogMe_case0) { ...@@ -139,7 +139,7 @@ TEST(NodeTreesTest, LogMe_case0) {
10, 10,
11, 11,
5, 5,
MemsetEventInfo())); MemsetEventInfo());
ChromeTracingLogger logger("test_nodetrees_logme_case0.json"); ChromeTracingLogger logger("test_nodetrees_logme_case0.json");
logger.LogMetaInfo(std::string("1.0.2"), 0); logger.LogMetaInfo(std::string("1.0.2"), 0);
NodeTrees tree(host_events, NodeTrees tree(host_events,
...@@ -180,17 +180,17 @@ TEST(NodeTreesTest, LogMe_case1) { ...@@ -180,17 +180,17 @@ TEST(NodeTreesTest, LogMe_case1) {
std::list<DeviceTraceEvent> device_events; std::list<DeviceTraceEvent> device_events;
std::list<MemTraceEvent> mem_events; std::list<MemTraceEvent> mem_events;
std::list<OperatorSupplementEvent> op_supplement_events; std::list<OperatorSupplementEvent> op_supplement_events;
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch1"), 15000, 17000, 10, 10, 1, 0)); std::string("cudalaunch1"), 15000, 17000, 10, 10, 1, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch2"), 25000, 35000, 10, 10, 2, 0)); std::string("cudalaunch2"), 25000, 35000, 10, 10, 2, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch3"), 33000, 37000, 10, 11, 3, 0)); std::string("cudalaunch3"), 33000, 37000, 10, 11, 3, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudaMemcpy1"), 18000, 19000, 10, 10, 4, 0)); std::string("cudaMemcpy1"), 18000, 19000, 10, 10, 4, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudaMemset1"), 38000, 39000, 10, 11, 5, 0)); std::string("cudaMemset1"), 38000, 39000, 10, 11, 5, 0);
device_events.push_back(DeviceTraceEvent(std::string("kernel1"), device_events.emplace_back(std::string("kernel1"),
TracerEventType::Kernel, TracerEventType::Kernel,
40000, 40000,
55000, 55000,
...@@ -198,8 +198,8 @@ TEST(NodeTreesTest, LogMe_case1) { ...@@ -198,8 +198,8 @@ TEST(NodeTreesTest, LogMe_case1) {
10, 10,
10, 10,
1, 1,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel2"), device_events.emplace_back(std::string("kernel2"),
TracerEventType::Kernel, TracerEventType::Kernel,
70000, 70000,
95000, 95000,
...@@ -207,8 +207,8 @@ TEST(NodeTreesTest, LogMe_case1) { ...@@ -207,8 +207,8 @@ TEST(NodeTreesTest, LogMe_case1) {
10, 10,
10, 10,
2, 2,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel3"), device_events.emplace_back(std::string("kernel3"),
TracerEventType::Kernel, TracerEventType::Kernel,
60000, 60000,
65000, 65000,
...@@ -216,8 +216,8 @@ TEST(NodeTreesTest, LogMe_case1) { ...@@ -216,8 +216,8 @@ TEST(NodeTreesTest, LogMe_case1) {
10, 10,
11, 11,
3, 3,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("memcpy1"), device_events.emplace_back(std::string("memcpy1"),
TracerEventType::Memcpy, TracerEventType::Memcpy,
56000, 56000,
59000, 59000,
...@@ -225,8 +225,8 @@ TEST(NodeTreesTest, LogMe_case1) { ...@@ -225,8 +225,8 @@ TEST(NodeTreesTest, LogMe_case1) {
10, 10,
10, 10,
4, 4,
MemcpyEventInfo())); MemcpyEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("memset1"), device_events.emplace_back(std::string("memset1"),
TracerEventType::Memset, TracerEventType::Memset,
66000, 66000,
69000, 69000,
...@@ -234,7 +234,7 @@ TEST(NodeTreesTest, LogMe_case1) { ...@@ -234,7 +234,7 @@ TEST(NodeTreesTest, LogMe_case1) {
10, 10,
11, 11,
5, 5,
MemsetEventInfo())); MemsetEventInfo());
ChromeTracingLogger logger("test_nodetrees_logme_case1.json"); ChromeTracingLogger logger("test_nodetrees_logme_case1.json");
logger.LogMetaInfo(std::string("1.0.2"), 0); logger.LogMetaInfo(std::string("1.0.2"), 0);
NodeTrees tree(host_events, NodeTrees tree(host_events,
...@@ -269,13 +269,13 @@ TEST(NodeTreesTest, HandleTrees_case0) { ...@@ -269,13 +269,13 @@ TEST(NodeTreesTest, HandleTrees_case0) {
std::list<DeviceTraceEvent> device_events; std::list<DeviceTraceEvent> device_events;
std::list<MemTraceEvent> mem_events; std::list<MemTraceEvent> mem_events;
std::list<OperatorSupplementEvent> op_supplement_events; std::list<OperatorSupplementEvent> op_supplement_events;
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op1"), TracerEventType::Operator, 10000, 100000, 10, 10)); std::string("op1"), TracerEventType::Operator, 10000, 100000, 10, 10);
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op2"), TracerEventType::Operator, 30000, 70000, 10, 10)); std::string("op2"), TracerEventType::Operator, 30000, 70000, 10, 10);
host_events.push_back(HostTraceEvent( host_events.emplace_back(
std::string("op3"), TracerEventType::Operator, 2000, 120000, 10, 11)); std::string("op3"), TracerEventType::Operator, 2000, 120000, 10, 11);
mem_events.push_back(MemTraceEvent(11500, mem_events.emplace_back(11500,
0x1000, 0x1000,
TracerMemEventType::Allocate, TracerMemEventType::Allocate,
10, 10,
...@@ -285,8 +285,8 @@ TEST(NodeTreesTest, HandleTrees_case0) { ...@@ -285,8 +285,8 @@ TEST(NodeTreesTest, HandleTrees_case0) {
50, 50,
50, 50,
100, 100,
100)); 100);
mem_events.push_back(MemTraceEvent(11900, mem_events.emplace_back(11900,
0x1000, 0x1000,
TracerMemEventType::Free, TracerMemEventType::Free,
10, 10,
...@@ -296,9 +296,9 @@ TEST(NodeTreesTest, HandleTrees_case0) { ...@@ -296,9 +296,9 @@ TEST(NodeTreesTest, HandleTrees_case0) {
0, 0,
50, 50,
100, 100,
100)); 100);
AttributeMap attrs; AttributeMap attrs;
op_supplement_events.push_back(OperatorSupplementEvent( op_supplement_events.emplace_back(
11600, 11600,
"op1", "op1",
std::map<std::string, std::vector<std::vector<int64_t>>>(), std::map<std::string, std::vector<std::vector<int64_t>>>(),
...@@ -307,14 +307,14 @@ TEST(NodeTreesTest, HandleTrees_case0) { ...@@ -307,14 +307,14 @@ TEST(NodeTreesTest, HandleTrees_case0) {
attrs, attrs,
0, 0,
10, 10,
10)); 10);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch1"), 15000, 25000, 10, 10, 1, 0)); std::string("cudalaunch1"), 15000, 25000, 10, 10, 1, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch2"), 35000, 45000, 10, 10, 2, 0)); std::string("cudalaunch2"), 35000, 45000, 10, 10, 2, 0);
runtime_events.push_back(RuntimeTraceEvent( runtime_events.emplace_back(
std::string("cudalaunch3"), 10000, 55000, 10, 11, 3, 0)); std::string("cudalaunch3"), 10000, 55000, 10, 11, 3, 0);
device_events.push_back(DeviceTraceEvent(std::string("kernel1"), device_events.emplace_back(std::string("kernel1"),
TracerEventType::Kernel, TracerEventType::Kernel,
40000, 40000,
55000, 55000,
...@@ -322,8 +322,8 @@ TEST(NodeTreesTest, HandleTrees_case0) { ...@@ -322,8 +322,8 @@ TEST(NodeTreesTest, HandleTrees_case0) {
10, 10,
10, 10,
1, 1,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel2"), device_events.emplace_back(std::string("kernel2"),
TracerEventType::Kernel, TracerEventType::Kernel,
70000, 70000,
95000, 95000,
...@@ -331,8 +331,8 @@ TEST(NodeTreesTest, HandleTrees_case0) { ...@@ -331,8 +331,8 @@ TEST(NodeTreesTest, HandleTrees_case0) {
10, 10,
10, 10,
2, 2,
KernelEventInfo())); KernelEventInfo());
device_events.push_back(DeviceTraceEvent(std::string("kernel3"), device_events.emplace_back(std::string("kernel3"),
TracerEventType::Kernel, TracerEventType::Kernel,
60000, 60000,
75000, 75000,
...@@ -340,7 +340,7 @@ TEST(NodeTreesTest, HandleTrees_case0) { ...@@ -340,7 +340,7 @@ TEST(NodeTreesTest, HandleTrees_case0) {
10, 10,
11, 11,
3, 3,
KernelEventInfo())); KernelEventInfo());
ChromeTracingLogger logger("test_nodetrees_handletrees_case0.json"); ChromeTracingLogger logger("test_nodetrees_handletrees_case0.json");
logger.LogMetaInfo(std::string("1.0.2"), 0); logger.LogMetaInfo(std::string("1.0.2"), 0);
NodeTrees tree(host_events, NodeTrees tree(host_events,
......
...@@ -257,7 +257,7 @@ void IrPrinter::PrintOperandsType(const Operation* op) { ...@@ -257,7 +257,7 @@ void IrPrinter::PrintOperandsType(const Operation* op) {
if (op_operand) { if (op_operand) {
op_operand_types.push_back(op_operand.type()); op_operand_types.push_back(op_operand.type());
} else { } else {
op_operand_types.push_back(Type()); op_operand_types.emplace_back();
} }
} }
os << " ("; os << " (";
...@@ -278,7 +278,7 @@ void IrPrinter::PrintOpReturnType(const Operation* op) { ...@@ -278,7 +278,7 @@ void IrPrinter::PrintOpReturnType(const Operation* op) {
if (op_result) { if (op_result) {
op_result_types.push_back(op_result.type()); op_result_types.push_back(op_result.type());
} else { } else {
op_result_types.push_back(Type(nullptr)); op_result_types.emplace_back(nullptr);
} }
} }
PrintInterleave( PrintInterleave(
......
...@@ -86,13 +86,13 @@ PADDLE_API void AssignTensorImpl(const Tensor& src, Tensor* dst) { ...@@ -86,13 +86,13 @@ PADDLE_API void AssignTensorImpl(const Tensor& src, Tensor* dst) {
void CustomOpKernelContext::EmplaceBackInput(Tensor&& input) { void CustomOpKernelContext::EmplaceBackInput(Tensor&& input) {
size_t index = inputs_.size(); size_t index = inputs_.size();
inputs_.emplace_back(input); inputs_.emplace_back(input);
input_range_.emplace_back(std::make_pair(index, index + 1)); input_range_.emplace_back(index, index + 1);
} }
void CustomOpKernelContext::EmplaceBackInputs( void CustomOpKernelContext::EmplaceBackInputs(
const std::vector<Tensor>& inputs) { const std::vector<Tensor>& inputs) {
size_t index = inputs_.size(); size_t index = inputs_.size();
input_range_.emplace_back(std::make_pair(index, index + inputs.size())); input_range_.emplace_back(index, index + inputs.size());
inputs_.insert(inputs_.end(), inputs_.insert(inputs_.end(),
std::make_move_iterator(inputs.begin()), std::make_move_iterator(inputs.begin()),
std::make_move_iterator(inputs.end())); std::make_move_iterator(inputs.end()));
...@@ -101,13 +101,13 @@ void CustomOpKernelContext::EmplaceBackInputs( ...@@ -101,13 +101,13 @@ void CustomOpKernelContext::EmplaceBackInputs(
void CustomOpKernelContext::EmplaceBackOutput(Tensor&& output) { void CustomOpKernelContext::EmplaceBackOutput(Tensor&& output) {
size_t index = outputs_.size(); size_t index = outputs_.size();
outputs_.emplace_back(output); outputs_.emplace_back(output);
output_range_.emplace_back(std::make_pair(index, index + 1)); output_range_.emplace_back(index, index + 1);
} }
void CustomOpKernelContext::EmplaceBackOutputs( void CustomOpKernelContext::EmplaceBackOutputs(
const std::vector<Tensor>& outputs) { const std::vector<Tensor>& outputs) {
size_t index = outputs_.size(); size_t index = outputs_.size();
output_range_.emplace_back(std::make_pair(index, index + outputs.size())); output_range_.emplace_back(index, index + outputs.size());
outputs_.insert(outputs_.end(), outputs_.insert(outputs_.end(),
std::make_move_iterator(outputs.begin()), std::make_move_iterator(outputs.begin()),
std::make_move_iterator(outputs.end())); std::make_move_iterator(outputs.end()));
......
...@@ -41,8 +41,8 @@ TEST(StringHelper, FormatStringAppend) { ...@@ -41,8 +41,8 @@ TEST(StringHelper, FormatStringAppend) {
TEST(StringHelper, JoinStrings) { TEST(StringHelper, JoinStrings) {
std::vector<std::string> v; std::vector<std::string> v;
v.push_back("hello"); v.emplace_back("hello");
v.push_back("world"); v.emplace_back("world");
std::string result = paddle::string::join_strings(v, ' '); std::string result = paddle::string::join_strings(v, ' ');
EXPECT_EQ(result, "hello world"); EXPECT_EQ(result, "hello world");
......
...@@ -146,18 +146,18 @@ void MultiSenderMultiReceiver(const size_t queue_cap, ...@@ -146,18 +146,18 @@ void MultiSenderMultiReceiver(const size_t queue_cap,
size_t sender_num = to_send.size(); size_t sender_num = to_send.size();
std::vector<std::thread> senders; std::vector<std::thread> senders;
for (size_t s_idx = 0; s_idx < sender_num; ++s_idx) { for (size_t s_idx = 0; s_idx < sender_num; ++s_idx) {
senders.emplace_back(std::thread([&, s_idx] { senders.emplace_back([&, s_idx] {
for (size_t elem : to_send[s_idx]) { for (size_t elem : to_send[s_idx]) {
std::this_thread::sleep_for(std::chrono::milliseconds(send_time_gap)); std::this_thread::sleep_for(std::chrono::milliseconds(send_time_gap));
EXPECT_TRUE(q.Send(elem)); EXPECT_TRUE(q.Send(elem));
} }
})); });
} }
std::vector<std::thread> receivers; std::vector<std::thread> receivers;
std::mutex mu; std::mutex mu;
std::vector<std::vector<size_t>> res; std::vector<std::vector<size_t>> res;
for (size_t r_idx = 0; r_idx < receiver_num; ++r_idx) { for (size_t r_idx = 0; r_idx < receiver_num; ++r_idx) {
receivers.emplace_back(std::thread([&] { receivers.emplace_back([&] {
std::vector<size_t> receiver_res; std::vector<size_t> receiver_res;
while (true) { while (true) {
std::this_thread::sleep_for( std::this_thread::sleep_for(
...@@ -170,7 +170,7 @@ void MultiSenderMultiReceiver(const size_t queue_cap, ...@@ -170,7 +170,7 @@ void MultiSenderMultiReceiver(const size_t queue_cap,
} }
std::lock_guard<std::mutex> lock(mu); std::lock_guard<std::mutex> lock(mu);
res.push_back(receiver_res); res.push_back(receiver_res);
})); });
} }
for (auto& t : senders) { for (auto& t : senders) {
t.join(); t.join();
......
...@@ -89,7 +89,7 @@ static auto ToMutableTensorPtrVector( ...@@ -89,7 +89,7 @@ static auto ToMutableTensorPtrVector(
static auto ToMetaTensorVector(const std::vector<DenseTensor> &tensors) { static auto ToMetaTensorVector(const std::vector<DenseTensor> &tensors) {
std::vector<MetaTensor> results; std::vector<MetaTensor> results;
for (auto &t : tensors) { for (auto &t : tensors) {
results.push_back(t); results.emplace_back(t);
} }
return results; return results;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册