Merge branch 'master' into fix/20919-checkpoint-step-val-metric

Author: Borda

docs/source-fabric/advanced/compile.rst

@@ -417,7 +417,7 @@ Additional Resources
 
 Here are a few resources for further reading after you complete this tutorial:
 
-- `PyTorch 2.0 Paper <https://pytorch.org/blog/pytorch-2-paper-tutorial/>`_
+- `PyTorch 2.0 Paper <https://pytorch.org/get-started/pytorch-2-x/>`_
 - `GenAI with PyTorch 2.0 blog post series <https://pytorch.org/blog/accelerating-generative-ai-4/>`_
 - `Training Production AI Models with PyTorch 2.0 <https://pytorch.org/blog/training-production-ai-models/>`_
 - `Empowering Models with Performance: The Art of Generalized Model Transformation Approach <https://pytorch.org/blog/empowering-models-performance/>`_

docs/source-pytorch/advanced/compile.rst

@@ -396,7 +396,7 @@ Additional Resources
 
 Here are a few resources for further reading after you complete this tutorial:
 
-- `PyTorch 2.0 Paper <https://pytorch.org/blog/pytorch-2-paper-tutorial/>`_
+- `PyTorch 2.0 Paper <https://pytorch.org/get-started/pytorch-2-x/>`_
 - `GenAI with PyTorch 2.0 blog post series <https://pytorch.org/blog/accelerating-generative-ai-4/>`_
 - `Training Production AI Models with PyTorch 2.0 <https://pytorch.org/blog/training-production-ai-models/>`_
 - `Empowering Models with Performance: The Art of Generalized Model Transformation Approach <https://pytorch.org/blog/empowering-models-performance/>`_

requirements/docs.txt

@@ -1,5 +1,5 @@
 sphinx >5.0, <6.0
-myst-parser >=0.18.1, <4.0.0
+myst-parser >=0.18.1, <5.0.0
 nbsphinx >=0.8.5, <=0.9.7
 nbconvert >7.14, <7.17
 pandoc >=1.0, <=2.4

requirements/fabric/test.txt

@@ -1,4 +1,4 @@
-coverage ==7.10.4
+coverage ==7.10.5
 numpy >=1.21.0, <1.27.0
 pytest ==8.4.1
 pytest-cov ==6.2.1

requirements/pytorch/docs.txt

@@ -4,6 +4,6 @@ nbformat  # used for generate empty notebook
 ipython[notebook] <9.5.0
 setuptools<81.0  # workaround for `error in ipython setup command: use_2to3 is invalid.`
 
-onnxscript >= 0.2.2, <0.4.0
+onnxscript >= 0.2.2, < 0.5.0
 
 #-r ../../_notebooks/.actions/requires.txt

requirements/pytorch/test.txt

@@ -1,4 +1,4 @@
-coverage ==7.10.4
+coverage ==7.10.5
 pytest ==8.4.1
 pytest-cov ==6.2.1
 pytest-timeout ==2.4.0
@@ -11,7 +11,7 @@ scikit-learn >0.22.1, <1.8.0
 numpy >1.20.0, <1.27.0
 onnx >1.12.0, <1.19.0
 onnxruntime >=1.12.0, <1.23.0
-onnxscript >= 0.1.0, <0.4.0
+onnxscript >= 0.1.0, < 0.5.0
 psutil <7.0.1 # for `DeviceStatsMonitor`
 pandas >2.0, <2.4.0  # needed in benchmarks
 fastapi  # for `ServableModuleValidator`  # not setting version as re-defined in App

src/lightning/pytorch/trainer/connectors/logger_connector/logger_connector.py

@@ -93,8 +93,9 @@ def log_metrics(self, metrics: _OUT_DICT, step: Optional[int] = None) -> None:
 
         Args:
             metrics: Metric values
-            step: Step for which metrics should be logged. Default value is `self.global_step` during training or
-                the total validation / test log step count during validation and testing.
+            step: Step for which metrics should be logged. If a `step` metric is logged, this value will
+                be used else will default to `self.global_step` during training or the total log step count
+                during validation and testing.
 
         """
         if not self.trainer.loggers or not metrics: