[clang-tidy][task 46] enable modernize-avoid-bind (#55895)

gouzil · web-flow · commit a172e6cc278f · 2023-08-03T19:38:11.000+08:00
* [clang-tidy] modernize-avoid-bind

* rollback
diff --git a/.clang-tidy b/.clang-tidy
@@ -165,7 +165,7 @@ bugprone-unused-raii,
 -hicpp-exception-baseclass,
 -misc-unused-alias-decls,
 -misc-unused-using-decls,
--modernize-avoid-bind,
+modernize-avoid-bind,
 -modernize-avoid-c-arrays,
 -modernize-deprecated-headers,
 -modernize-deprecated-ios-base-aliases,
diff --git a/paddle/fluid/framework/dist_multi_trainer.cc b/paddle/fluid/framework/dist_multi_trainer.cc
@@ -88,8 +88,7 @@ void DistMultiTrainer::InitDumpEnv() {
     }
   }
   for (int i = 0; i < dump_thread_num_; i++) {
-    dump_thread_.push_back(
-        std::thread(std::bind(&TrainerBase::DumpWork, this, i)));
+    dump_thread_.push_back(std::thread([this, i] { DumpWork(i); }));
   }
 }
 
diff --git a/paddle/fluid/framework/multi_trainer.cc b/paddle/fluid/framework/multi_trainer.cc
@@ -107,8 +107,7 @@ void MultiTrainer::InitDumpEnv() {
     }
   }
   for (int i = 0; i < dump_thread_num_; i++) {
-    dump_thread_.push_back(
-        std::thread(std::bind(&TrainerBase::DumpWork, this, i)));
+    dump_thread_.push_back(std::thread([this, i] { DumpWork(i); }));
   }
 }
 
diff --git a/paddle/fluid/framework/op_desc.cc b/paddle/fluid/framework/op_desc.cc
@@ -350,9 +350,10 @@ class CompileTimeInferShapeContext : public InferShapeContext {
         names.begin(),
         names.end(),
         retv.begin(),
-        std::bind(std::mem_fn(&CompileTimeInferShapeContext::GetVarType),
-                  this,
-                  std::placeholders::_1));
+        std::bind(
+            std::mem_fn(&CompileTimeInferShapeContext::GetVarType),  // NOLINT
+            this,
+            std::placeholders::_1));
     return retv;
   }
 
diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
@@ -710,12 +710,13 @@ std::vector<proto::VarType::Type> RuntimeInferShapeContext::GetVarTypes(
     const std::vector<Variable*>& vars) const {
   std::vector<proto::VarType::Type> retv;
   retv.resize(vars.size());
-  std::transform(vars.begin(),
-                 vars.end(),
-                 retv.begin(),
-                 std::bind(std::mem_fn(&RuntimeInferShapeContext::GetVarType),
-                           this,
-                           std::placeholders::_1));
+  std::transform(
+      vars.begin(),
+      vars.end(),
+      retv.begin(),
+      std::bind(std::mem_fn(&RuntimeInferShapeContext::GetVarType),  // NOLINT
+                this,
+                std::placeholders::_1));
   return retv;
 }
 
diff --git a/paddle/phi/core/threadpool.cc b/paddle/phi/core/threadpool.cc
@@ -55,8 +55,7 @@ ThreadPool::ThreadPool(int num_threads) : running_(true) {
   threads_.resize(num_threads);
   for (auto& thread : threads_) {
     // TODO(Yancey1989): binding the thread on the specify CPU numberw
-    thread =
-        std::make_unique<std::thread>(std::bind(&ThreadPool::TaskLoop, this));
+    thread = std::make_unique<std::thread>([this] { ThreadPool::TaskLoop(); });
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,7 @@ void DistMultiTrainer::InitDumpEnv() {`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`for (int i = 0; i < dump_thread_num_; i++) {`
`91`		`- dump_thread_.push_back(`
`92`		`- std::thread(std::bind(&TrainerBase::DumpWork, this, i)));`
	`91`	`+ dump_thread_.push_back(std::thread([this, i] { DumpWork(i); }));`
`93`	`92`	`}`
`94`	`93`	`}`
`95`	`94`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,7 @@ void MultiTrainer::InitDumpEnv() {`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`for (int i = 0; i < dump_thread_num_; i++) {`
`110`		`- dump_thread_.push_back(`
`111`		`- std::thread(std::bind(&TrainerBase::DumpWork, this, i)));`
	`110`	`+ dump_thread_.push_back(std::thread([this, i] { DumpWork(i); }));`
`112`	`111`	`}`
`113`	`112`	`}`
`114`	`113`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@ ThreadPool::ThreadPool(int num_threads) : running_(true) {`
`55`	`55`	`threads_.resize(num_threads);`
`56`	`56`	`for (auto& thread : threads_) {`
`57`	`57`	`// TODO(Yancey1989): binding the thread on the specify CPU numberw`
`58`		`- thread =`
`59`		`- std::make_unique<std::thread>(std::bind(&ThreadPool::TaskLoop, this));`
	`58`	`+ thread = std::make_unique<std::thread>([this] { ThreadPool::TaskLoop(); });`
`60`	`59`	`}`
`61`	`60`	`}`
`62`	`61`