avoid calling xm.xla_device() on multi-tpu

Author: DuYicong515

pytorch_lightning/trainer/trainer.py

@@ -59,7 +59,7 @@
     SimpleProfiler,
     XLAProfiler,
 )
-from pytorch_lightning.strategies import ParallelStrategy, Strategy
+from pytorch_lightning.strategies import ParallelStrategy, SingleDeviceStrategy, Strategy
 from pytorch_lightning.strategies.ddp_spawn import DDPSpawnStrategy
 from pytorch_lightning.trainer.callback_hook import TrainerCallbackHookMixin
 from pytorch_lightning.trainer.configuration_validator import verify_loop_configurations
@@ -2056,7 +2056,11 @@ def num_nodes(self) -> int:
     @property
     def device_ids(self) -> List[int]:
         """List of device indexes per node."""
-        devices = getattr(self.strategy, "parallel_devices", [self.strategy.root_device])
+        devices = (
+            [self.strategy.root_device]
+            if isinstance(self.strategy, SingleDeviceStrategy)
+            else self.strategy.parallel_devices
+        )
         device_ids = []
         for idx, device in enumerate(devices):
             if isinstance(device, torch.device):
@@ -2068,7 +2072,7 @@ def device_ids(self) -> List[int]:
     @property
     def num_devices(self) -> int:
         """Number of devices the trainer uses per node."""
-        return len(self.device_ids)
+        return 1 if isinstance(self.strategy, SingleDeviceStrategy) else len(self.device_ids)
 
     @property
     def num_processes(self) -> int:

tests/accelerators/test_tpu.py

@@ -94,7 +94,6 @@ def test_accelerator_cpu_with_tpu_cores_flag():
 
 
 @RunIf(tpu=True)
-@pl_multi_process_test
 @pytest.mark.parametrize(["accelerator", "devices"], [("auto", 8), ("auto", "auto"), ("tpu", None)])
 def test_accelerator_tpu(accelerator, devices):
     assert TPUAccelerator.is_available()
@@ -104,13 +103,12 @@ def test_accelerator_tpu(accelerator, devices):
     assert isinstance(trainer.strategy, TPUSpawnStrategy)
     assert trainer.num_devices == 8
     with pytest.deprecated_call(
-        match= "`Trainer.tpu_cores` is deprecated in v1.6 and will be removed in v1.8. "
+        match="`Trainer.tpu_cores` is deprecated in v1.6 and will be removed in v1.8. "
         "Please use `Trainer.devices` instead."
     ):
         trainer.tpu_cores == 8
 
 
-
 @RunIf(tpu=True)
 def test_accelerator_tpu_with_tpu_cores_priority():
     """Test for checking `tpu_cores` flag takes priority over `devices`."""
@@ -124,7 +122,6 @@ def test_accelerator_tpu_with_tpu_cores_priority():
 
 
 @RunIf(tpu=True)
-@pl_multi_process_test
 def test_set_devices_if_none_tpu():
     trainer = Trainer(accelerator="tpu", tpu_cores=8)
     assert trainer.num_devices == 8