update

Chao1Han · Sep 20, 2024 · 4bf448d · 4bf448d
1 parent a1c2d6b
commit 4bf448d
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/torch/distributed/distributed_c10d.py b/torch/distributed/distributed_c10d.py
@@ -1819,17 +1819,10 @@ def _new_process_group_helper(
         elif backend_str == Backend.XCCL:
             if not is_xccl_available():
                 raise RuntimeError("Distributed package doesn't have XCCL built in")
-<<<<<<< HEAD
-            if pg_options is not None:
-                assert isinstance(
-                    pg_options, ProcessGroupXCCL.Options
-                ), "Expected pg_options argument to be of type ProcessGroupXCCL.Options"
-=======
             if backend_options is not None:
                 assert isinstance(
                     backend_options, ProcessGroupXCCL.Options
                 ), "Expected backend_options argument to be of type ProcessGroupXCCL.Options"
->>>>>>> xccl-bak
             backend_class = ProcessGroupXCCL(
                 backend_prefix_store, group_rank, group_size
             )