Skip to content

Commit 8e91f8f

Browse files
committed
return empty string if accelerator is not available.
1 parent 63a0f70 commit 8e91f8f

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/lightning/pytorch/accelerators/mps.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ def register_accelerators(cls, accelerator_registry: _AcceleratorRegistry) -> No
9191
@override
9292
def device_name(cls, device: Optional[_DEVICE] = None) -> str:
9393
# todo: implement a better way to get the device name
94-
available = cls.is_available()
95-
gpu_type = " (mps)" if available else ""
96-
return f"{available}{gpu_type}"
94+
if not cls.is_available():
95+
return ""
96+
return "True (mps)"
9797

9898

9999
# device metrics

src/lightning/pytorch/accelerators/xla.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def register_accelerators(cls, accelerator_registry: _AcceleratorRegistry) -> No
6060
def device_name(cls, device: Optional[_DEVICE] = None) -> str:
6161
is_available = cls.is_available()
6262
if not is_available:
63-
return str(is_available)
63+
return ""
6464

6565
if _XLA_GREATER_EQUAL_2_1:
6666
from torch_xla._internal import tpu

src/lightning/pytorch/trainer/setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,10 @@ def _log_device_info(trainer: "pl.Trainer") -> None:
156156
rank_zero_info(f"GPU available: {device_name}, using: {gpu_used} devices.")
157157

158158
num_tpu_cores = trainer.num_devices if isinstance(trainer.accelerator, XLAAccelerator) else 0
159-
rank_zero_info(f"TPU available: {XLAAccelerator.device_name()}, using: {num_tpu_cores} TPU cores")
159+
rank_zero_info(
160+
f"TPU available: {XLAAccelerator.device_name() if XLAAccelerator.is_available() else str(False)}, "
161+
f"using: {num_tpu_cores} TPU cores"
162+
)
160163

161164
if _habana_available_and_importable():
162165
from lightning_habana import HPUAccelerator

0 commit comments

Comments
 (0)