remove redundent threads

seemingwang · Mar 31, 2021 · bd6b545 · bd6b545
1 parent 1a3013a
commit bd6b545
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/paddle/fluid/distributed/service/graph_py_service.cc b/paddle/fluid/distributed/service/graph_py_service.cc
@@ -72,9 +72,6 @@ void GraphPyService::set_up(std::string ips_str, int shard_num,
     host_sign_list.push_back(ph_host.serialize_to_string());
     index++;
   }
-  // VLOG(0) << "IN set up rank = " << rank;
-  // start_client();
-  // start_server(server_list[rank], std::stoul(port_list[rank]));
 }
 void GraphPyClient::start_client() {
   std::map<uint64_t, std::vector<paddle::distributed::Region>> dense_regions;
@@ -96,25 +93,22 @@ void GraphPyServer::start_server() {
   std::string ip = server_list[rank];
   uint32_t port = std::stoul(port_list[rank]);
   server_thread = new std::thread([this, &ip, &port]() {
-    std::function<void()> func = [this, &ip, &port]() {
-      ::paddle::distributed::PSParameter server_proto = this->GetServerProto();
+    ::paddle::distributed::PSParameter server_proto = this->GetServerProto();
 
-      auto _ps_env = paddle::distributed::PaddlePSEnvironment();
-      _ps_env.set_ps_servers(&this->host_sign_list,
-                             this->host_sign_list.size());  // test
-      pserver_ptr = std::shared_ptr<paddle::distributed::GraphBrpcServer>(
-          (paddle::distributed::GraphBrpcServer*)
-              paddle::distributed::PSServerFactory::create(server_proto));
-      VLOG(0) << "pserver-ptr created ";
-      std::vector<framework::ProgramDesc> empty_vec;
-      framework::ProgramDesc empty_prog;
-      empty_vec.push_back(empty_prog);
-      pserver_ptr->configure(server_proto, _ps_env, rank, empty_vec);
-      pserver_ptr->start(ip, port);
-    };
-    std::thread t1(func);
-    t1.join();
+    auto _ps_env = paddle::distributed::PaddlePSEnvironment();
+    _ps_env.set_ps_servers(&this->host_sign_list,
+                           this->host_sign_list.size());  // test
+    pserver_ptr = std::shared_ptr<paddle::distributed::GraphBrpcServer>(
+        (paddle::distributed::GraphBrpcServer*)
+            paddle::distributed::PSServerFactory::create(server_proto));
+    VLOG(0) << "pserver-ptr created ";
+    std::vector<framework::ProgramDesc> empty_vec;
+    framework::ProgramDesc empty_prog;
+    empty_vec.push_back(empty_prog);
+    pserver_ptr->configure(server_proto, _ps_env, rank, empty_vec);
+    pserver_ptr->start(ip, port);
   });
+  server_thread->detach();
   sleep(3);
 }
 ::paddle::distributed::PSParameter GraphPyServer::GetServerProto() {

diff --git a/paddle/fluid/distributed/service/graph_py_service.h b/paddle/fluid/distributed/service/graph_py_service.h
@@ -151,9 +151,7 @@ class GraphPyClient : public GraphPyService {
         (paddle::distributed::GraphBrpcService*)server.get_ps_server()
             ->get_service());
   }
-  // void set_local_graph_service(GraphBrpcService *service){
-  //   worker_ptr->set_local_graph_service(service);
-  // }
+
   void load_edge_file(std::string name, std::string filepath, bool reverse);
   void load_node_file(std::string name, std::string filepath);
   int get_client_id() { return client_id; }