Merge branch 'master' into generic-weight-averaging

Author: Seppo Enarvi

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

@@ -23,18 +23,18 @@ on:
 jobs:
   cron-clear:
     if: github.event_name == 'schedule' || github.event_name == 'pull_request'
-    uses: Lightning-AI/utilities/.github/workflows/[email protected].1
+    uses: Lightning-AI/utilities/.github/workflows/[email protected].2
     with:
-      scripts-ref: v0.14.1
+      scripts-ref: v0.14.2
       dry-run: ${{ github.event_name == 'pull_request' }}
       pattern: "latest|docs"
       age-days: 7
 
   direct-clear:
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
-    uses: Lightning-AI/utilities/.github/workflows/[email protected].1
+    uses: Lightning-AI/utilities/.github/workflows/[email protected].2
     with:
-      scripts-ref: v0.14.1
+      scripts-ref: v0.14.2
       dry-run: ${{ github.event_name == 'pull_request' }}
       pattern: ${{ inputs.pattern || 'pypi_wheels' }} # setting str in case of PR / debugging
       age-days: ${{ fromJSON(inputs.age-days) || 0 }} # setting 0 in case of PR / debugging

.github/workflows/ci-check-md-links.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   check-md-links:
-    uses: Lightning-AI/utilities/.github/workflows/[email protected].1
+    uses: Lightning-AI/utilities/.github/workflows/[email protected].2
     with:
       config-file: ".github/markdown-links-config.json"
       base-branch: "master"

.github/workflows/ci-schema.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   check:
-    uses: Lightning-AI/utilities/.github/workflows/[email protected].1
+    uses: Lightning-AI/utilities/.github/workflows/[email protected].2
     with:
       # skip azure due to the wrong schema file by MSFT
       # https://github.com/Lightning-AI/lightning-flash/pull/1455#issuecomment-1244793607

docs/source-pytorch/debug/debugging_basic.rst

@@ -33,9 +33,7 @@ A breakpoint stops your code execution so you can inspect variables, etc... and
         x = 2
 
         # set breakpoint
-        import pdb
-
-        pdb.set_trace()
+        breakpoint()
         y = x**2
 
 In this example, the code will stop before executing the ``y = x**2`` line.

requirements/fabric/test.txt

@@ -7,4 +7,3 @@ pytest-rerunfailures ==12.0
 pytest-random-order ==1.1.0
 click ==8.1.7
 tensorboardX >=2.2, <2.7.0  # min version is set by torch.onnx missing attribute
-torchmetrics >=0.7.0, <1.5.0 # needed for using fixed compare_version

requirements/pytorch/base.txt

@@ -5,7 +5,7 @@ torch >=2.1.0, <2.6.0
 tqdm >=4.57.0, <4.67.0
 PyYAML >=5.4, <6.1.0
 fsspec[http] >=2022.5.0, <2024.4.0
-torchmetrics >=0.7.0, <1.5.0  # needed for using fixed compare_version
+torchmetrics >=0.7.0, <1.5.0
 packaging >=20.0, <=23.1
 typing-extensions >=4.4.0, <4.11.0
 lightning-utilities >=0.10.0, <0.12.0

src/lightning/fabric/accelerators/registry.py

@@ -107,9 +107,9 @@ def remove(self, name: str) -> None:
         """Removes the registered accelerator by name."""
         self.pop(name)
 
-    def available_accelerators(self) -> list[str]:
-        """Returns a list of registered accelerators."""
-        return list(self.keys())
+    def available_accelerators(self) -> set[str]:
+        """Returns a set of registered accelerators."""
+        return set(self.keys())
 
     def __str__(self) -> str:
         return "Registered Accelerators: {}".format(", ".join(self.available_accelerators()))

src/lightning/fabric/utilities/spike.py

@@ -52,7 +52,7 @@ def __init__(
             from torchmetrics.aggregation import MeanMetric
             from torchmetrics.wrappers import Running
         else:
-            raise RuntimeError("SpikeDetection requires torchmetrics>=1.0.0! Please upgrade your version!")
+            raise RuntimeError("SpikeDetection requires `torchmetrics>=1.0.0` Please upgrade your version.")
         super().__init__()
 
         self.last_val: Union[torch.Tensor, float] = 0.0

src/lightning/pytorch/loggers/mlflow.py

@@ -363,7 +363,7 @@ def _scan_and_log_checkpoints(self, checkpoint_callback: ModelCheckpoint) -> Non
             aliases = ["latest", "best"] if p == checkpoint_callback.best_model_path else ["latest"]
 
             # Artifact path on mlflow
-            artifact_path = Path(self._checkpoint_path_prefix) / Path(p).stem
+            artifact_path = Path(self._checkpoint_path_prefix, Path(p).stem).as_posix()
 
             # Log the checkpoint
             self.experiment.log_artifact(self._run_id, p, artifact_path)

tests/tests_fabric/accelerators/test_registry.py

@@ -70,4 +70,4 @@ def is_available():
 
 
 def test_available_accelerators_in_registry():
-    assert ACCELERATOR_REGISTRY.available_accelerators() == ["cpu", "cuda", "mps", "tpu"]
+    assert ACCELERATOR_REGISTRY.available_accelerators() == {"cpu", "cuda", "mps", "tpu"}