Merge branch 'master' into bugfix/20852_add-support-for-xla2.7-which-deprecated-methods

Author: bhimrazy

.github/workflows/call-clear-cache.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   cron-clear:
     if: github.event_name == 'schedule' || github.event_name == 'pull_request'
-    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.14.3
+    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.0
     with:
       scripts-ref: v0.14.3
       dry-run: ${{ github.event_name == 'pull_request' }}
@@ -32,7 +32,7 @@ jobs:
 
   direct-clear:
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
-    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.14.3
+    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.0
     with:
       scripts-ref: v0.14.3
       dry-run: ${{ github.event_name == 'pull_request' }}

.github/workflows/ci-schema.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   check:
-    uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.14.3
+    uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.15.0
     with:
       # skip azure due to the wrong schema file by MSFT
       # https://github.com/Lightning-AI/lightning-flash/pull/1455#issuecomment-1244793607

requirements/docs.txt

@@ -17,7 +17,7 @@ sphinx-rtd-dark-mode
 sphinxcontrib-video ==0.4.1
 jinja2 <3.2.0
 
-lightning-utilities >=0.11.1, <0.15.0
+lightning-utilities >=0.11.1, <0.16.0
 
 # installed from S3 location and fetched in advance
 lai-sphinx-theme

requirements/fabric/base.txt

@@ -5,4 +5,4 @@ torch >=2.1.0, <2.8.0
 fsspec[http] >=2022.5.0, <2025.8.0
 packaging >=20.0, <=25.0
 typing-extensions >=4.5.0, <4.15.0
-lightning-utilities >=0.10.0, <0.15.0
+lightning-utilities >=0.10.0, <0.16.0

requirements/fabric/examples.txt

@@ -2,4 +2,4 @@
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
 torchvision >=0.16.0, <0.23.0
-torchmetrics >=0.10.0, <1.8.0
+torchmetrics >=0.10.0, <1.9.0

requirements/pytorch/base.txt

@@ -5,7 +5,7 @@ torch >=2.1.0, <=2.8.0
 tqdm >=4.57.0, <4.68.0
 PyYAML >5.4, <6.1.0
 fsspec[http] >=2022.5.0, <2025.8.0
-torchmetrics >0.7.0, <1.8.0
+torchmetrics >0.7.0, <1.9.0
 packaging >=20.0, <=25.0
 typing-extensions >=4.5.0, <4.15.0
-lightning-utilities >=0.10.0, <0.15.0
+lightning-utilities >=0.10.0, <0.16.0

requirements/pytorch/examples.txt

@@ -4,4 +4,4 @@
 requests <2.33.0
 torchvision >=0.16.0, <0.23.0
 ipython[all] <8.19.0
-torchmetrics >=0.10.0, <1.8.0
+torchmetrics >=0.10.0, <1.9.0

requirements/pytorch/extra.txt

@@ -6,6 +6,6 @@ matplotlib>3.1, <3.10.0
 omegaconf >=2.2.3, <2.4.0
 hydra-core >=1.2.0, <1.4.0
 jsonargparse[signatures,jsonnet] >=4.39.0, <4.41.0
-rich >=12.3.0, <14.1.0
+rich >=12.3.0, <14.2.0
 tensorboardX >=2.2, <2.7.0  # min version is set by torch.onnx missing attribute
 bitsandbytes >=0.45.2,<0.47.0; platform_system != "Darwin"

src/lightning/pytorch/CHANGELOG.md

@@ -25,7 +25,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 
--
+- fix progress bar console clearing for Rich `14.1+` ([#21016](https://github.com/Lightning-AI/pytorch-lightning/pull/21016))
 
 
 ---

src/lightning/pytorch/callbacks/progress/rich_progress.py

@@ -331,7 +331,19 @@ def _init_progress(self, trainer: "pl.Trainer") -> None:
             self._reset_progress_bar_ids()
             reconfigure(**self._console_kwargs)
             self._console = get_console()
-            self._console.clear_live()
+
+            # Compatibility shim for Rich >= 14.1.0:
+            if hasattr(self._console, "_live_stack"):
+                # In recent Rich releases, the internal `_live` variable was replaced with `_live_stack` (a list)
+                # to support nested Live displays. This broke our original call to `clear_live()`,
+                # because it now only pops one Live instance instead of clearing them all.
+                # We check for `_live_stack` and clear it manually for compatibility across
+                # both old and new Rich versions.
+                if len(self._console._live_stack) > 0:
+                    self._console.clear_live()
+            else:
+                self._console.clear_live()
+
             self._metric_component = MetricsTextColumn(
                 trainer,
                 self.theme.metrics,