From b7d44eb963858ccbf10c5f68a94333eb8d3d3b6e Mon Sep 17 00:00:00 2001
From: wangxiaoning <71813629+wangxn12138@users.noreply.github.com>
Date: Mon, 16 Jan 2023 15:29:01 +0800
Subject: [PATCH] [fix code style]fix cpplint code style (#49811)

---
 paddle/fluid/distributed/ps/service/ps_client.h       |  2 +-
 paddle/fluid/distributed/ps/service/ps_local_server.h |  2 +-
 .../fluid/distributed/ps/service/ps_service/service.h |  2 +-
 .../fluid/distributed/ps/table/depends/sparse_utils.h |  2 +-
 .../ps/table/graph/graph_weighted_sampler.h           | 10 ++++++----
 .../fluid/distributed/test/graph_node_split_test.cc   | 11 ++++++-----
 paddle/fluid/distributed/test/table_test.cc           |  2 +-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/paddle/fluid/distributed/ps/service/ps_client.h b/paddle/fluid/distributed/ps/service/ps_client.h
index 74f946b225..6acf431a6f 100644
--- a/paddle/fluid/distributed/ps/service/ps_client.h
+++ b/paddle/fluid/distributed/ps/service/ps_client.h
@@ -67,7 +67,7 @@ class PSClient {
   PSClient(PSClient &&) = delete;
   PSClient(const PSClient &) = delete;
 
-  virtual int32_t Configure(
+  virtual int32_t Configure(  // NOLINT
       const PSParameter &config,
       const std::map<uint64_t, std::vector<paddle::distributed::Region>>
           &regions,
diff --git a/paddle/fluid/distributed/ps/service/ps_local_server.h b/paddle/fluid/distributed/ps/service/ps_local_server.h
index a295818c63..4209c39a81 100644
--- a/paddle/fluid/distributed/ps/service/ps_local_server.h
+++ b/paddle/fluid/distributed/ps/service/ps_local_server.h
@@ -31,7 +31,7 @@ class PsLocalServer : public PSServer {
   virtual int32_t Stop() { return 0; }
   virtual int32_t Configure(
       const PSParameter &config,
-      PSEnvironment &env,
+      PSEnvironment &env,  // NOLINT
       size_t server_rank,
       const std::vector<framework::ProgramDesc> &server_sub_program = {}) {
     return 0;
diff --git a/paddle/fluid/distributed/ps/service/ps_service/service.h b/paddle/fluid/distributed/ps/service/ps_service/service.h
index 1b9f9249c3..eb190073fb 100644
--- a/paddle/fluid/distributed/ps/service/ps_service/service.h
+++ b/paddle/fluid/distributed/ps/service/ps_service/service.h
@@ -39,7 +39,7 @@ using paddle::distributed::PsService;
 
 class PSCore {
  public:
-  explicit PSCore() {}
+  PSCore() {}
   virtual ~PSCore() {}
 
   virtual int InitServer(
diff --git a/paddle/fluid/distributed/ps/table/depends/sparse_utils.h b/paddle/fluid/distributed/ps/table/depends/sparse_utils.h
index 06adcf0b18..1b3825ca73 100644
--- a/paddle/fluid/distributed/ps/table/depends/sparse_utils.h
+++ b/paddle/fluid/distributed/ps/table/depends/sparse_utils.h
@@ -60,7 +60,7 @@ struct PullSparseValue {
                std::vector<int>* offset_shard) const {
     offset_shard->reserve(numel_ / shard_num + 1);
     for (int x = 0; x < numel_; ++x) {
-      if (int(feasigns_[x] % shard_num) == shard_id) {
+      if (static_cast<int>(feasigns_[x] % shard_num) == shard_id) {
         offset_shard->push_back(x);
       }
     }
diff --git a/paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h b/paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h
index cf83d27d7a..9b6f0290a9 100644
--- a/paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h
+++ b/paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h
@@ -55,10 +55,12 @@ class WeightedSampler : public Sampler {
                                     const std::shared_ptr<std::mt19937_64> rng);
 
  private:
-  int sample(float query_weight,
-             std::unordered_map<WeightedSampler *, float> &subtract_weight_map,
-             std::unordered_map<WeightedSampler *, int> &subtract_count_map,
-             float &subtract);
+  int sample(
+      float query_weight,
+      std::unordered_map<WeightedSampler *, float>
+          &subtract_weight_map,                                        // NOLINT
+      std::unordered_map<WeightedSampler *, int> &subtract_count_map,  // NOLINT
+      float &subtract);                                                // NOLINT
 };
 }  // namespace distributed
 }  // namespace paddle
diff --git a/paddle/fluid/distributed/test/graph_node_split_test.cc b/paddle/fluid/distributed/test/graph_node_split_test.cc
index 96769cff83..2ec5469afe 100644
--- a/paddle/fluid/distributed/test/graph_node_split_test.cc
+++ b/paddle/fluid/distributed/test/graph_node_split_test.cc
@@ -157,7 +157,8 @@ void GetDownpourSparseTableProto(
 
 /*-------------------------------------------------------------------------*/
 
-std::string ip_ = "127.0.0.1", ip2 = "127.0.0.1";
+const char* ip_ = "127.0.0.1";
+const char* ip2 = "127.0.0.1";
 uint32_t port_ = 5209, port2 = 5210;
 
 std::vector<std::string> host_sign_list_;
@@ -203,10 +204,10 @@ void RunServer2() {
   pserver_ptr2->build_peer2peer_connection(1);
 }
 
-void RunClient(
-    std::map<uint64_t, std::vector<paddle::distributed::Region>>& dense_regions,
-    int index,
-    paddle::distributed::PsBaseService* service) {
+void RunClient(std::map<uint64_t, std::vector<paddle::distributed::Region>>&
+                   dense_regions,  // NOLINT
+               int index,
+               paddle::distributed::PsBaseService* service) {
   ::paddle::distributed::PSParameter worker_proto = GetWorkerProto();
   paddle::distributed::PaddlePSEnvironment _ps_env;
   auto servers_ = host_sign_list_.size();
diff --git a/paddle/fluid/distributed/test/table_test.cc b/paddle/fluid/distributed/test/table_test.cc
index afeaf27317..8908891d9f 100644
--- a/paddle/fluid/distributed/test/table_test.cc
+++ b/paddle/fluid/distributed/test/table_test.cc
@@ -15,7 +15,7 @@ limitations under the License. */
 #include "gtest/gtest.h"
 #include "paddle/fluid/distributed/ps/table/memory_dense_table.h"
 #include "paddle/fluid/distributed/the_one_ps.pb.h"
-//#include "paddle/fluid/distributed/ps/table/sparse_geo_table.h"
+// #include "paddle/fluid/distributed/ps/table/sparse_geo_table.h"
 
 namespace paddle {
 namespace distributed {
-- 
GitLab