update, test=develop

Author: sandyhouse

python/paddle/distributed/fleet/base/role_maker.py

@@ -171,6 +171,7 @@ def init(rank, nodes, role):
 
     def _init_http(self, ip, port, prefix, start_http_server, http_server_d):
         def __start_kv_server(http_server_d, size_d):
+            print("start http_server: {}, {}".format(port, size_d))
             from paddle.distributed.fleet.utils.http_server import KVServer
             http_server = KVServer(port, size_d)
             http_server.start()
@@ -183,6 +184,7 @@ def __start_kv_server(http_server_d, size_d):
         def init_kv_server(http_server_d):
             worker_key = prefix + '_' + 'worker'
             size_d = {worker_key: self._worker_num, }
+            print("worker_key:{}, size: {}".format(worker_key, size_d))
 
             http_server_d["running"] = True
             # child process for http server
@@ -202,7 +204,7 @@ def init(rank, nodes, role):
             gloo.set_iface(self._iface)
             gloo.set_timeout_seconds(self._init_timeout_seconds,
                                      self._run_timeout_seconds)
-            gloo.set_http_store(ip, port, role)
+            gloo.set_http_store(ip, port, 'worker')
             ep = ":".join([ip, str(port)])
             wait_server_ready([ep])
             gloo.init()
@@ -211,6 +213,7 @@ def init(rank, nodes, role):
         port = int(port)
 
         if start_http_server:
+            print("to start http_server")
             http_server = init_kv_server(http_server_d)
 
         if self._role == Role.WORKER:

python/paddle/fluid/tests/unittests/test_fleet_rolemaker_new.py

@@ -274,7 +274,7 @@ def test_fs_gloo4(self):
             print("skip gloo UT on MacOS/Win")
             return
 
-        os.environ["TRAINING_ROLE"] = "PSERVER"
+        os.environ["TRAINING_ROLE"] = "WORKER"
         os.environ["PADDLE_PSERVERS_IP_PORT_LIST"] = "127.0.0.1:36001"
         os.environ["POD_IP"] = "127.0.0.1"
         os.environ["PADDLE_PORT"] = "36001"
@@ -284,7 +284,7 @@ def test_fs_gloo4(self):
         os.environ["PADDLE_GLOO_RENDEZVOUS"] = "3"
         os.environ["PADDLE_GLOO_HTTP_ENDPOINT"] = "127.0.0.1:30019"
 
-        role = role_maker.PaddleCloudRoleMaker()
+        role = role_maker.PaddleCloudRoleMaker(is_collecitve=True)
         role._generate_role()
         import time
         time.sleep(3)
@@ -532,7 +532,7 @@ def test_fs_gloo4(self):
             print("skip gloo UT on MacOS/Win")
             return
 
-        os.environ["TRAINING_ROLE"] = "PSERVER"
+        os.environ["TRAINING_ROLE"] = "WORKER"
         os.environ["PADDLE_PSERVERS_IP_PORT_LIST"] = "127.0.0.1:36001"
         os.environ["POD_IP"] = "127.0.0.1"
         os.environ["PADDLE_PORT"] = "36001"
@@ -542,7 +542,7 @@ def test_fs_gloo4(self):
         os.environ["PADDLE_GLOO_RENDEZVOUS"] = "3"
         os.environ["PADDLE_GLOO_HTTP_ENDPOINT"] = "127.0.0.1:30019"
 
-        role = role_maker.PaddleCloudRoleMaker()
+        role = role_maker.PaddleCloudRoleMaker(is_collective=True)
         role._generate_role()
         import time
         time.sleep(3)