Merge branch 'fix219' into fix224

PaddlePaddle · Jan 9, 2025 · 9e225a8 · 9e225a8
2 parents 076d918 + 6a0c53e
commit 9e225a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/test/collective/collective_global_gather.py b/test/collective/collective_global_gather.py
@@ -62,10 +62,8 @@ def run_trainer(self, args):
         endpoints = args["endpoints"].split(",")
         rank = args["trainerid"]
         current_endpoint = args["currentendpoint"]
-        if args["dynamic_static_unified_comm"]:
-            paddle.distributed.collective._init_parallel_env(args["backend"])
-        else:
-            paddle.distributed.init_parallel_env()
+
+        paddle.distributed.collective._init_parallel_env(args["backend"])
         nranks = 2
         if args['backend'] == 'nccl':
             device_id = int(os.getenv("FLAGS_selected_gpus", "0"))
@@ -112,11 +110,8 @@ def run_trainer(self, args):
         )
 
         if args['static_mode']:
-            result = (
-                self.get_model(train_prog, startup_prog, rank)
-                if args["dynamic_static_unified_comm"]
-                else self.get_model(train_prog, startup_prog, rank)
-            )
+            result = self.get_model(train_prog, startup_prog, rank)
+
             fetch_list = []
             for elem in result:
                 fetch_list.append(elem.name)

diff --git a/test/collective/collective_global_scatter.py b/test/collective/collective_global_scatter.py
@@ -63,10 +63,8 @@ def run_trainer(self, args):
         rank = args["trainerid"]
         current_endpoint = args["currentendpoint"]
         nranks = 2
-        if args["dynamic_static_unified_comm"]:
-            paddle.distributed.collective._init_parallel_env(args["backend"])
-        else:
-            paddle.distributed.init_parallel_env()
+
+        paddle.distributed.collective._init_parallel_env(args["backend"])
         if args['backend'] == 'nccl':
             device_id = int(os.getenv("FLAGS_selected_gpus", "0"))
             place = base.CUDAPlace(
@@ -90,11 +88,8 @@ def run_trainer(self, args):
             "float32"
         )
         if args['static_mode']:
-            result = (
-                self.get_model(train_prog, startup_prog, rank)
-                if args["dynamic_static_unified_comm"]
-                else self.get_model(train_prog, startup_prog, rank)
-            )
+            result = self.get_model(train_prog, startup_prog, rank)
+
             exe = base.Executor(place)
             exe.run(startup_prog)
             fetch_list = []