[ptd] Fix test config in destroy_pg (pytorch#166463)

fduwjj · pytorchmergebot · commit 774abb018eb1 · 2025-10-29T04:35:04.000Z
Summary: When device_type is CPU we will not use device id from CUDA which is enabled in pytorch#161015. However, we should not exclude the case when the accelerator itself is CPU. This PR fixes it. Test Plan: UT Differential Revision: D85714901 Pull Request resolved: pytorch#166463 Approved by: https://github.com/mori360, https://github.com/fegin
diff --git a/torch/testing/_internal/distributed/_tensor/common_dtensor.py b/torch/testing/_internal/distributed/_tensor/common_dtensor.py
@@ -447,7 +447,7 @@ def destroy_pg(self, device_id: Optional[int] = None) -> None:
                 torch.cuda.current_device() if self.device_type == "cuda" else self.rank
             )
 
-        if self.device_type == "cpu" and torch._C._get_accelerator().type != "cpu":
+        if self.device_type == "cpu":
             # NOTE: when `device_id` is not None, barrier() will choose the accelerator
             # of the most pripority, which means if the test specifies to use CPU for
             # testing while CUDA is available on the host, the barrier() will use CUDA.

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ def destroy_pg(self, device_id: Optional[int] = None) -> None:`
`447`	`447`	`torch.cuda.current_device() if self.device_type == "cuda" else self.rank`
`448`	`448`	`)`
`449`	`449`
`450`		`- if self.device_type == "cpu" and torch._C._get_accelerator().type != "cpu":`
	`450`	`+ if self.device_type == "cpu":`
`451`	`451`	# NOTE: when `device_id` is not None, barrier() will choose the accelerator
`452`	`452`	`# of the most pripority, which means if the test specifies to use CPU for`
`453`	`453`	`# testing while CUDA is available on the host, the barrier() will use CUDA.`