Merge branch 'master' into patch-2

Borda · web-flow · commit bf16bd7dc066 · 2025-04-16T09:15:50.000+02:00
diff --git a/.github/workflows/call-clear-cache.yml b/.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/cleanup-caches.yml@v0.14.1
+    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.14.3
     with:
-      scripts-ref: v0.14.1
+      scripts-ref: v0.14.3
       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/cleanup-caches.yml@v0.14.1
+    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.14.3
     with:
-      scripts-ref: v0.14.1
+      scripts-ref: v0.14.3
       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
diff --git a/.github/workflows/ci-check-md-links.yml b/.github/workflows/ci-check-md-links.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   check-md-links:
-    uses: Lightning-AI/utilities/.github/workflows/check-md-links.yml@v0.14.1
+    uses: Lightning-AI/utilities/.github/workflows/check-md-links.yml@v0.14.3
     with:
       config-file: ".github/markdown-links-config.json"
       base-branch: "master"
diff --git a/.github/workflows/ci-schema.yml b/.github/workflows/ci-schema.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   check:
-    uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.14.1
+    uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.14.3
     with:
       # skip azure due to the wrong schema file by MSFT
       # https://github.com/Lightning-AI/lightning-flash/pull/1455#issuecomment-1244793607
diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml
@@ -159,7 +159,8 @@ jobs:
         run: |
           echo $GITHUB_RUN_ID
           python -m coverage run --source ${{ env.COVERAGE_SCOPE }} \
-            -m pytest -v --timeout=30 --durations=50 --random-order-seed=$GITHUB_RUN_ID
+            -m pytest -v --timeout=30 --durations=50 --random-order-seed=$GITHUB_RUN_ID \
+            --junitxml=junit.xml -o junit_family=legacy  # NOTE: for Codecov's test results
 
       - name: Statistics
         if: success()
diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml
@@ -196,7 +196,8 @@ jobs:
         run: |
           echo $GITHUB_RUN_ID
           python -m coverage run --source ${{ env.COVERAGE_SCOPE }} \
-            -m pytest . -v --timeout=60 --durations=50 --random-order-seed=$GITHUB_RUN_ID
+            -m pytest . -v --timeout=60 --durations=50 --random-order-seed=$GITHUB_RUN_ID \
+            --junitxml=junit.xml -o junit_family=legacy  # NOTE: for Codecov's test results
 
       - name: Statistics
         if: success()
@@ -205,6 +206,12 @@ jobs:
           coverage report
           coverage xml
 
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }} # Run even if tests fail
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         # see: https://github.com/actions/toolkit/issues/399
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -51,7 +51,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         additional_dependencies: [tomli]
@@ -70,7 +70,7 @@ repos:
       - id: sphinx-lint
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.11.4
     hooks:
       # try to fix what is possible
       - id: ruff
@@ -81,7 +81,7 @@ repos:
       - id: ruff
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.21
+    rev: 0.7.22
     hooks:
       - id: mdformat
         additional_dependencies:
diff --git a/_notebooks b/_notebooks
@@ -1 +1 @@
-Subproject commit 1e0e80732921606b641a4ab0e2eeebc93a60308f
+Subproject commit 1c1160e543bb56760886a45dcb7e1e03a22f634c
diff --git a/docs/source-pytorch/debug/debugging_basic.rst b/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.
diff --git a/requirements/fabric/test.txt b/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
diff --git a/requirements/pytorch/base.txt b/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
diff --git a/src/lightning/fabric/accelerators/registry.py b/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()))
diff --git a/src/lightning/fabric/utilities/spike.py b/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
diff --git a/src/lightning/pytorch/callbacks/timer.py b/src/lightning/pytorch/callbacks/timer.py
@@ -111,8 +111,8 @@ def __init__(
         self._duration = duration.total_seconds() if duration is not None else None
         self._interval = interval
         self._verbose = verbose
-        self._start_time: dict[RunningStage, Optional[float]] = {stage: None for stage in RunningStage}
-        self._end_time: dict[RunningStage, Optional[float]] = {stage: None for stage in RunningStage}
+        self._start_time: dict[RunningStage, Optional[float]] = dict.fromkeys(RunningStage)
+        self._end_time: dict[RunningStage, Optional[float]] = dict.fromkeys(RunningStage)
         self._offset = 0
 
     def start_time(self, stage: str = RunningStage.TRAINING) -> Optional[float]:
diff --git a/src/lightning/pytorch/loggers/mlflow.py b/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)
diff --git a/src/lightning/pytorch/trainer/connectors/callback_connector.py b/src/lightning/pytorch/trainer/connectors/callback_connector.py
@@ -106,8 +106,9 @@ def _configure_checkpoint_callbacks(self, enable_checkpointing: bool) -> None:
                 model_checkpoint = LitModelCheckpoint(model_name=self.trainer._model_registry)
             else:
                 rank_zero_info(
-                    "You are using the plain ModelCheckpoint callback."
-                    " Consider using LitModelCheckpoint which with seamless uploading to Model registry."
+                    "You are using the default ModelCheckpoint callback."
+                    " Install `litmodels` package to use the `LitModelCheckpoint` instead"
+                    " for seamless uploading to the Lightning model registry."
                 )
                 model_checkpoint = ModelCheckpoint()
             self.trainer.callbacks.append(model_checkpoint)
diff --git a/tests/tests_fabric/accelerators/test_registry.py b/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"}
diff --git a/tests/tests_pytorch/accelerators/test_registry.py b/tests/tests_pytorch/accelerators/test_registry.py
@@ -16,7 +16,7 @@
 
 def test_available_accelerators_in_registry():
     """Tests the accelerators available by default, not including external, third-party accelerators."""
-    available = set(AcceleratorRegistry.available_accelerators())
+    available = AcceleratorRegistry.available_accelerators()
     expected = {"cpu", "cuda", "mps", "tpu"}
     # Note: the registry is global, other tests may register new strategies as a side effect
     assert expected.issubset(available)
diff --git a/tests/tests_pytorch/helpers/datasets.py b/tests/tests_pytorch/helpers/datasets.py
@@ -148,7 +148,7 @@ def __init__(self, root: str, num_samples: int = 100, digits: Optional[Sequence]
 
     @staticmethod
     def _prepare_subset(full_data: Tensor, full_targets: Tensor, num_samples: int, digits: Sequence):
-        classes = {d: 0 for d in digits}
+        classes = dict.fromkeys(digits, 0)
         indexes = []
         for idx, target in enumerate(full_targets):
             label = target.item()
diff --git a/tests/tests_pytorch/trainer/connectors/test_data_connector.py b/tests/tests_pytorch/trainer/connectors/test_data_connector.py
@@ -497,7 +497,7 @@ def test_dataloader_source_request_from_module():
 
 
 @pytest.mark.parametrize(
-    "hook_name", ("on_before_batch_transfer", "transfer_batch_to_device", "on_after_batch_transfer")
+    "hook_name", ["on_before_batch_transfer", "transfer_batch_to_device", "on_after_batch_transfer"]
 )
 class TestDataHookSelector:
     def overridden_func(self, batch, *args, **kwargs):
diff --git a/tests/tests_pytorch/trainer/logging_/test_logger_connector.py b/tests/tests_pytorch/trainer/logging_/test_logger_connector.py
@@ -246,7 +246,7 @@ def test_fx_validator_integration(tmp_path):
     })
     trainer.test(model, verbose=False)
 
-    not_supported.update({k: "result collection is not registered yet" for k in not_supported})
+    not_supported.update(dict.fromkeys(not_supported, "result collection is not registered yet"))
     not_supported.update({
         "predict_dataloader": "result collection is not registered yet",
         "on_predict_model_eval": "result collection is not registered yet",

-Original file line number
+Diff line change
 jobs:
   check-md-links:
 -    uses: Lightning-AI/utilities/.github/workflows/[email protected].1
 +    uses: Lightning-AI/utilities/.github/workflows/[email protected].3
     with:
       config-file: ".github/markdown-links-config.json"
       base-branch: "master"