新增hcg判断方法

Author: zty-king

python/paddle/distributed/auto_parallel/process_mesh.py

@@ -392,21 +392,24 @@ def get_group(
                     f"{dim_name} not in the dimension names {self._dim_names}"
                 )
             else:
-                hcg = fleet.get_hybrid_communicate_group()
-                if hcg is not None:
-
-                    parallel_group_map = {
-                        "pp": hcg.get_pipe_parallel_group,
-                        "dp": hcg.get_data_parallel_group,
-                        "mp": hcg.get_model_parallel_group,
-                        "sep": hcg.get_sep_parallel_group,
-                        "sharding": hcg.get_sharding_parallel_group,
-                    }
-
-                    if dim_name not in parallel_group_map:
-                        raise ValueError(f"{dim_name} is not a valid dim name.")
-
-                    return parallel_group_map[dim_name]()
+                if not fleet._hybrid_communicate_group_is_None():
+                    hcg = fleet.get_hybrid_communicate_group()
+                    if hcg is not None:
+
+                        parallel_group_map = {
+                            "pp": hcg.get_pipe_parallel_group,
+                            "dp": hcg.get_data_parallel_group,
+                            "mp": hcg.get_model_parallel_group,
+                            "sep": hcg.get_sep_parallel_group,
+                            "sharding": hcg.get_sharding_parallel_group,
+                        }
+
+                        if dim_name not in parallel_group_map:
+                            raise ValueError(
+                                f"{dim_name} is not a valid dim name."
+                            )
+
+                        return parallel_group_map[dim_name]()
                 existing_group = None
                 group_map = _get_group_map()
                 for group in group_map.values():

python/paddle/distributed/fleet/__init__.py

@@ -53,6 +53,7 @@
 ]
 
 fleet = Fleet()
+_hybrid_communicate_group_is_None = fleet._hybrid_communicate_group_is_None
 _final_strategy = fleet._final_strategy
 _get_applied_meta_list = fleet._get_applied_meta_list
 _get_applied_graph_list = fleet._get_applied_graph_list

python/paddle/distributed/fleet/fleet.py

@@ -741,6 +741,9 @@ def get_hybrid_communicate_group(self) -> HybridCommunicateGroup:
         assert self._hcg is not None
         return self._hcg
 
+    def _hybrid_communicate_group_is_None(self) -> bool:
+        return self._hcg is None
+
     def get_hybrid_parallel_topology(self) -> CommunicateTopology:
         assert self._topology is not None
         return self._topology

test/auto_parallel/hybrid_strategy/process_mesh_demo_unittest.py

@@ -99,7 +99,7 @@ def test_get_group(self):
             assert isinstance(
                 group_1d_with_name, dist.communication.group.Group
             )
-
+            assert group_1d_with_name.id == group_1d.id
             # Test case 3: Single dimension mesh with wrong dim_name
             try:
                 mesh_1d.get_group(dim_name="wrong_name")