Remove AcceleratorConnector.tpu_id (#12387)

Co-authored-by: Jirka Borovec <[email protected]>

Author: DuYicong515

CHANGELOG.md

@@ -729,6 +729,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Removed `AcceleratorConnector.root_gpu` property ([#12262](https://github.com/PyTorchLightning/pytorch-lightning/pull/12262))
 
 
+- Removed `AcceleratorConnector.tpu_id` property ([#12387](https://github.com/PyTorchLightning/pytorch-lightning/pull/12387))
+
+
 - Removed `AcceleratorConnector.num_gpus` property ([#12384](https://github.com/PyTorchLightning/pytorch-lightning/pull/12384))
 
 

pytorch_lightning/trainer/connectors/accelerator_connector.py

@@ -798,13 +798,6 @@ def tpu_cores(self) -> Optional[Union[List[int], int]]:
             return self._tpu_cores  # type: ignore
         return 0
 
-    @property
-    def tpu_id(self) -> Optional[int]:
-        if isinstance(self.accelerator, TPUAccelerator):
-            if isinstance(self._tpu_cores, list):
-                return self._tpu_cores[0]
-        return None
-
     @property
     def num_ipus(self) -> int:
         if isinstance(self.accelerator, IPUAccelerator):

tests/models/test_tpu.py

@@ -242,20 +242,11 @@ def test_dataloaders_passed_to_fit(tmpdir):
     assert trainer.state.finished, f"Training failed with {trainer.state}"
 
 
-@pytest.mark.parametrize(
-    ["tpu_cores", "expected_tpu_id"],
-    [(1, None), (8, None), ([1], 1), ([8], 8)],
-)
 @RunIf(tpu=True)
-def test_tpu_id_to_be_as_expected(tpu_cores, expected_tpu_id):
-    """Test if trainer.tpu_id is set as expected."""
-    assert Trainer(tpu_cores=tpu_cores)._accelerator_connector.tpu_id == expected_tpu_id
-
-
-def test_tpu_misconfiguration():
-    """Test if trainer.tpu_id is set as expected."""
+@pytest.mark.parametrize("tpu_cores", [[1, 8], "9, ", [9], [0], 2, 10])
+def test_tpu_misconfiguration(tpu_cores):
     with pytest.raises(MisconfigurationException, match="`tpu_cores` can only be"):
-        Trainer(tpu_cores=[1, 8])
+        Trainer(tpu_cores=tpu_cores)
 
 
 @pytest.mark.skipif(_TPU_AVAILABLE, reason="test requires missing TPU")
@@ -289,33 +280,6 @@ def test_broadcast(rank):
     xmp.spawn(test_broadcast, nprocs=8, start_method="fork")
 
 
-@pytest.mark.parametrize(
-    ["tpu_cores", "expected_tpu_id", "error_expected"],
-    [
-        (1, None, False),
-        (8, None, False),
-        ([1], 1, False),
-        ([8], 8, False),
-        ("1,", 1, False),
-        ("1", None, False),
-        ("9, ", 9, True),
-        ([9], 9, True),
-        ([0], 0, True),
-        (2, None, True),
-        (10, None, True),
-    ],
-)
-@RunIf(tpu=True)
-@pl_multi_process_test
-def test_tpu_choice(tmpdir, tpu_cores, expected_tpu_id, error_expected):
-    if error_expected:
-        with pytest.raises(MisconfigurationException, match=r".*tpu_cores` can only be 1, 8 or [<1-8>]*"):
-            Trainer(default_root_dir=tmpdir, tpu_cores=tpu_cores)
-    else:
-        trainer = Trainer(default_root_dir=tmpdir, tpu_cores=tpu_cores)
-        assert trainer._accelerator_connector.tpu_id == expected_tpu_id
-
-
 @pytest.mark.parametrize(
     ["cli_args", "expected"],
     [("--tpu_cores=8", {"tpu_cores": 8}), ("--tpu_cores=1,", {"tpu_cores": "1,"})],