Replace framework::ThreadPool to phi::ThreadPool [fluid_ops] (#67189)

co63oc · web-flow · commit ed5837b7ac48 · 2024-09-03T10:26:41.000+08:00
diff --git a/paddle/fluid/distributed/ps/service/ps_graph_client.cc b/paddle/fluid/distributed/ps/service/ps_graph_client.cc
@@ -54,7 +54,7 @@ int32_t PsGraphClient::Initialize() {
     }
   }
   for (uint32_t k = 0; k < max_shard_num; ++k) {
-    _thread_pools.push_back(std::make_shared<paddle::framework::ThreadPool>(1));
+    _thread_pools.push_back(std::make_shared<phi::ThreadPool>(1));
   }
   _local_shard_keys.resize(max_shard_num);
   _shard_ars.resize(max_shard_num);
diff --git a/paddle/fluid/distributed/ps/service/ps_graph_client.h b/paddle/fluid/distributed/ps/service/ps_graph_client.h
@@ -82,7 +82,7 @@ class PsGraphClient : public PsLocalClient {
   void *_partition_key_service = nullptr;
   int _rank_id = 0;
   int _rank_num = 0;
-  std::vector<std::shared_ptr<framework::ThreadPool>> _thread_pools;
+  std::vector<std::shared_ptr<phi::ThreadPool>> _thread_pools;
   std::vector<std::vector<uint64_t>> _local_shard_keys;
   std::vector<std::vector<paddle::framework::BinaryArchive>> _shard_ars;
 };
diff --git a/paddle/fluid/framework/data_set.cc b/paddle/fluid/framework/data_set.cc
@@ -472,16 +472,15 @@ void MultiSlotDataset::PrepareTrain() {
   return;
 }
 
-inline std::vector<std::shared_ptr<paddle::framework::ThreadPool>>&
-GetReadThreadPool(int thread_num) {
-  static std::vector<std::shared_ptr<paddle::framework::ThreadPool>>
-      thread_pools;
+inline std::vector<std::shared_ptr<phi::ThreadPool>>& GetReadThreadPool(
+    int thread_num) {
+  static std::vector<std::shared_ptr<phi::ThreadPool>> thread_pools;
   if (!thread_pools.empty()) {
     return thread_pools;
   }
   thread_pools.resize(thread_num);
   for (int i = 0; i < thread_num; ++i) {
-    thread_pools[i].reset(new paddle::framework::ThreadPool(1));
+    thread_pools[i].reset(new phi::ThreadPool(1));
   }
   return thread_pools;
 }
diff --git a/paddle/fluid/framework/dist_multi_trainer.cc b/paddle/fluid/framework/dist_multi_trainer.cc
@@ -94,16 +94,15 @@ void DistMultiTrainer::InitDumpEnv() {
   }
 }
 
-inline std::vector<std::shared_ptr<paddle::framework::ThreadPool>>
-    &GetThreadPool(int thread_num) {
-  static std::vector<std::shared_ptr<paddle::framework::ThreadPool>>
-      thread_pools;
+inline std::vector<std::shared_ptr<phi::ThreadPool>> &GetThreadPool(
+    int thread_num) {
+  static std::vector<std::shared_ptr<phi::ThreadPool>> thread_pools;
   if (!thread_pools.empty()) {
     return thread_pools;
   }
   thread_pools.resize(thread_num);
   for (int i = 0; i < thread_num; ++i) {
-    thread_pools[i].reset(new paddle::framework::ThreadPool(1));
+    thread_pools[i].reset(new phi::ThreadPool(1));
   }
   return thread_pools;
 }
diff --git a/paddle/fluid/framework/multi_trainer.cc b/paddle/fluid/framework/multi_trainer.cc
@@ -120,16 +120,15 @@ void MultiTrainer::InitDumpEnv() {
     dump_thread_.emplace_back([this, i] { DumpWork(i); });
   }
 }
-inline std::vector<std::shared_ptr<paddle::framework::ThreadPool>>&
-GetThreadPool(int thread_num) {
-  static std::vector<std::shared_ptr<paddle::framework::ThreadPool>>
-      thread_pools;
+inline std::vector<std::shared_ptr<phi::ThreadPool>>& GetThreadPool(
+    int thread_num) {
+  static std::vector<std::shared_ptr<phi::ThreadPool>> thread_pools;
   if (!thread_pools.empty()) {
     return thread_pools;
   }
   thread_pools.resize(thread_num);
   for (int i = 0; i < thread_num; ++i) {
-    thread_pools[i].reset(new paddle::framework::ThreadPool(1));
+    thread_pools[i].reset(new phi::ThreadPool(1));
   }
   return thread_pools;
 }
diff --git a/test/cpp/fluid/framework/threadpool_test.cc b/test/cpp/fluid/framework/threadpool_test.cc
@@ -31,11 +31,11 @@ void do_sum(std::vector<std::future<void>>* fs,
 }
 
 TEST(ThreadPool, ConcurrentInit) {
-  framework::ThreadPool* pool;
+  phi::ThreadPool* pool;
   int n = 50;
   std::vector<std::thread> threads;
   for (int i = 0; i < n; ++i) {
-    std::thread t([&pool]() { pool = framework::ThreadPool::GetInstance(); });
+    std::thread t([&pool]() { pool = phi::ThreadPool::GetInstance(); });
     threads.push_back(std::move(t));
   }
   for (auto& t : threads) {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ int32_t PsGraphClient::Initialize() {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`for (uint32_t k = 0; k < max_shard_num; ++k) {`
`57`		`- _thread_pools.push_back(std::make_shared<paddle::framework::ThreadPool>(1));`
	`57`	`+ _thread_pools.push_back(std::make_shared<phi::ThreadPool>(1));`
`58`	`58`	`}`
`59`	`59`	`_local_shard_keys.resize(max_shard_num);`
`60`	`60`	`_shard_ars.resize(max_shard_num);`
Original file line number	Diff line number	Diff line change
`@@ -472,16 +472,15 @@ void MultiSlotDataset::PrepareTrain() {`
`472`	`472`	`return;`
`473`	`473`	`}`
`474`	`474`
`475`		`-inline std::vector<std::shared_ptr<paddle::framework::ThreadPool>>&`
`476`		`-GetReadThreadPool(int thread_num) {`
`477`		`- static std::vector<std::shared_ptr<paddle::framework::ThreadPool>>`
`478`		`- thread_pools;`
	`475`	`+inline std::vector<std::shared_ptr<phi::ThreadPool>>& GetReadThreadPool(`
	`476`	`+ int thread_num) {`
	`477`	`+ static std::vector<std::shared_ptr<phi::ThreadPool>> thread_pools;`
`479`	`478`	`if (!thread_pools.empty()) {`
`480`	`479`	`return thread_pools;`
`481`	`480`	`}`
`482`	`481`	`thread_pools.resize(thread_num);`
`483`	`482`	`for (int i = 0; i < thread_num; ++i) {`
`484`		`- thread_pools[i].reset(new paddle::framework::ThreadPool(1));`
	`483`	`+ thread_pools[i].reset(new phi::ThreadPool(1));`
`485`	`484`	`}`
`486`	`485`	`return thread_pools;`
`487`	`486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,16 +94,15 @@ void DistMultiTrainer::InitDumpEnv() {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`-inline std::vector<std::shared_ptr<paddle::framework::ThreadPool>>`
`98`		`- &GetThreadPool(int thread_num) {`
`99`		`- static std::vector<std::shared_ptr<paddle::framework::ThreadPool>>`
`100`		`- thread_pools;`
	`97`	`+inline std::vector<std::shared_ptr<phi::ThreadPool>> &GetThreadPool(`
	`98`	`+ int thread_num) {`
	`99`	`+ static std::vector<std::shared_ptr<phi::ThreadPool>> thread_pools;`
`101`	`100`	`if (!thread_pools.empty()) {`
`102`	`101`	`return thread_pools;`
`103`	`102`	`}`
`104`	`103`	`thread_pools.resize(thread_num);`
`105`	`104`	`for (int i = 0; i < thread_num; ++i) {`
`106`		`- thread_pools[i].reset(new paddle::framework::ThreadPool(1));`
	`105`	`+ thread_pools[i].reset(new phi::ThreadPool(1));`
`107`	`106`	`}`
`108`	`107`	`return thread_pools;`
`109`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,16 +120,15 @@ void MultiTrainer::InitDumpEnv() {`
`120`	`120`	`dump_thread_.emplace_back([this, i] { DumpWork(i); });`
`121`	`121`	`}`
`122`	`122`	`}`
`123`		`-inline std::vector<std::shared_ptr<paddle::framework::ThreadPool>>&`
`124`		`-GetThreadPool(int thread_num) {`
`125`		`- static std::vector<std::shared_ptr<paddle::framework::ThreadPool>>`
`126`		`- thread_pools;`
	`123`	`+inline std::vector<std::shared_ptr<phi::ThreadPool>>& GetThreadPool(`
	`124`	`+ int thread_num) {`
	`125`	`+ static std::vector<std::shared_ptr<phi::ThreadPool>> thread_pools;`
`127`	`126`	`if (!thread_pools.empty()) {`
`128`	`127`	`return thread_pools;`
`129`	`128`	`}`
`130`	`129`	`thread_pools.resize(thread_num);`
`131`	`130`	`for (int i = 0; i < thread_num; ++i) {`
`132`		`- thread_pools[i].reset(new paddle::framework::ThreadPool(1));`
	`131`	`+ thread_pools[i].reset(new phi::ThreadPool(1));`
`133`	`132`	`}`
`134`	`133`	`return thread_pools;`
`135`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ void do_sum(std::vector<std::future<void>>* fs,`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`TEST(ThreadPool, ConcurrentInit) {`
`34`		`- framework::ThreadPool* pool;`
	`34`	`+ phi::ThreadPool* pool;`
`35`	`35`	`int n = 50;`
`36`	`36`	`std::vector<std::thread> threads;`
`37`	`37`	`for (int i = 0; i < n; ++i) {`
`38`		`- std::thread t([&pool]() { pool = framework::ThreadPool::GetInstance(); });`
	`38`	`+ std::thread t([&pool]() { pool = phi::ThreadPool::GetInstance(); });`
`39`	`39`	`threads.push_back(std::move(t));`
`40`	`40`	`}`
`41`	`41`	`for (auto& t : threads) {`