Merge branch 'master' into mlflow-logging-fix

Author: SkafteNicki

.actions/assistant.py

@@ -154,8 +154,8 @@ def load_readme_description(path_dir: str, homepage: str, version: str) -> str:
 
     """
     path_readme = os.path.join(path_dir, "README.md")
-    with open(path_readme, encoding="utf-8") as fo:
-        text = fo.read()
+    with open(path_readme, encoding="utf-8") as fopen:
+        text = fopen.read()
 
     # drop images from readme
     text = text.replace(
@@ -308,17 +308,17 @@ def copy_replace_imports(
         if ext in (".pyc",):
             continue
         # Try to parse everything else
-        with open(fp, encoding="utf-8") as fo:
+        with open(fp, encoding="utf-8") as fopen:
             try:
-                lines = fo.readlines()
+                lines = fopen.readlines()
             except UnicodeDecodeError:
                 # a binary file, skip
                 print(f"Skipped replacing imports for {fp}")
                 continue
         lines = _replace_imports(lines, list(zip(source_imports, target_imports)), lightning_by=lightning_by)
         os.makedirs(os.path.dirname(fp_new), exist_ok=True)
-        with open(fp_new, "w", encoding="utf-8") as fo:
-            fo.writelines(lines)
+        with open(fp_new, "w", encoding="utf-8") as fopen:
+            fopen.writelines(lines)
 
 
 def create_mirror_package(source_dir: str, package_mapping: dict[str, str]) -> None:
@@ -370,10 +370,10 @@ def _prune_packages(req_file: str, packages: Sequence[str]) -> None:
 
     @staticmethod
     def _replace_min(fname: str) -> None:
-        with open(fname, encoding="utf-8") as fo:
-            req = fo.read().replace(">=", "==")
-        with open(fname, "w", encoding="utf-8") as fw:
-            fw.write(req)
+        with open(fname, encoding="utf-8") as fopen:
+            req = fopen.read().replace(">=", "==")
+        with open(fname, "w", encoding="utf-8") as fwrite:
+            fwrite.write(req)
 
     @staticmethod
     def replace_oldest_ver(requirement_fnames: Sequence[str] = REQUIREMENT_FILES_ALL) -> None:
@@ -471,15 +471,15 @@ def convert_version2nightly(ver_file: str = "src/version.info") -> None:
         """Load the actual version and convert it to the nightly version."""
         from datetime import datetime
 
-        with open(ver_file) as fo:
-            version = fo.read().strip()
+        with open(ver_file) as fopen:
+            version = fopen.read().strip()
         # parse X.Y.Z version and prune any suffix
         vers = re.match(r"(\d+)\.(\d+)\.(\d+).*", version)
         # create timestamp  YYYYMMDD
         timestamp = datetime.now().strftime("%Y%m%d")
         version = f"{'.'.join(vers.groups())}.dev{timestamp}"
-        with open(ver_file, "w") as fo:
-            fo.write(version + os.linesep)
+        with open(ver_file, "w") as fopen:
+            fopen.write(version + os.linesep)
 
     @staticmethod
     def generate_docker_tags(

.actions/requirements.txt

@@ -1,3 +1,3 @@
-jsonargparse >=4.16.0, <=4.35.0
+jsonargparse
 requests
 packaging

.azure/gpu-benchmarks.yml

@@ -76,8 +76,13 @@ jobs:
         displayName: "Image info & NVIDIA"
 
       - bash: |
-          pip install -e .[dev] --find-links ${TORCH_URL}
-          pip install setuptools==75.6.0 jsonargparse==4.35.0
+          pip install -U -q -r .actions/requirements.txt
+          python .actions/assistant.py copy_replace_imports --source_dir="./tests" \
+            --source_import="lightning.fabric,lightning.pytorch" \
+            --target_import="lightning_fabric,pytorch_lightning"
+        displayName: "Adjust tests"
+
+      - bash: pip install -e .[dev] --find-links ${TORCH_URL}
         env:
           FREEZE_REQUIREMENTS: "1"
         displayName: "Install package"
@@ -88,17 +93,10 @@ jobs:
           python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu == 2, f'GPU: {mgpu}'"
         displayName: "Env details"
 
-      - bash: |
-          pip install -q -r .actions/requirements.txt
-          python .actions/assistant.py copy_replace_imports --source_dir="./tests" \
-            --source_import="lightning.fabric,lightning.pytorch" \
-            --target_import="lightning_fabric,pytorch_lightning"
-        displayName: "Adjust tests"
-
       - bash: python -m pytest parity_$(PACKAGE_NAME) -v --durations=0
         env:
           PL_RUNNING_BENCHMARKS: "1"
-          PL_RUN_CUDA_TESTS: "1"
+          RUN_ONLY_CUDA_TESTS: "1"
         workingDirectory: tests/
         displayName: "Testing: benchmarks"
 
@@ -107,7 +105,7 @@ jobs:
         # without succeeded this could run even if the job has already failed
         condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
         env:
-          PL_RUN_CUDA_TESTS: "1"
+          RUN_ONLY_CUDA_TESTS: "1"
           PL_RUN_STANDALONE_TESTS: "1"
         displayName: "Testing: fabric standalone tasks"
         timeoutInMinutes: "10"

.azure/gpu-tests-fabric.yml

@@ -48,7 +48,7 @@ jobs:
       DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )
       FREEZE_REQUIREMENTS: "1"
       PIP_CACHE_DIR: "/var/tmp/pip"
-      PL_RUN_CUDA_TESTS: "1"
+      RUN_ONLY_CUDA_TESTS: "1"
     container:
       image: $(image)
       # default shm size is 64m. Increase it to avoid:
@@ -60,13 +60,13 @@ jobs:
           image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
           PACKAGE_NAME: "fabric"
         "Fabric | latest":
-          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.8-cuda12.6.3"
           PACKAGE_NAME: "fabric"
         #"Fabric | future":
         #  image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
         #  PACKAGE_NAME: "fabric"
         "Lightning | latest":
-          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.8-cuda12.6.3"
           PACKAGE_NAME: "lightning"
     workspace:
       clean: all
@@ -78,8 +78,6 @@ jobs:
           echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/cu${cuda_ver}/torch_stable.html"
           scope=$(python -c 'n = "$(PACKAGE_NAME)" ; print(dict(fabric="lightning_fabric").get(n, n))')
           echo "##vso[task.setvariable variable=COVERAGE_SOURCE]$scope"
-          python_ver=$(python -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")
-          echo "##vso[task.setvariable variable=PYTHON_VERSION_MM]$python_ver"
         displayName: "set env. vars"
       - bash: |
           echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM}"
@@ -100,6 +98,12 @@ jobs:
           pip list
         displayName: "Image info & NVIDIA"
 
+      - bash: |
+          python .actions/assistant.py replace_oldest_ver
+          pip install "cython<3.0" wheel  # for compatibility
+        condition: contains(variables['Agent.JobName'], 'oldest')
+        displayName: "setting oldest dependencies"
+
       - bash: |
           PYTORCH_VERSION=$(python -c "import torch; print(torch.__version__.split('+')[0])")
           pip install -q wget packaging
@@ -109,11 +113,22 @@ jobs:
           done
         displayName: "Adjust dependencies"
 
+      - bash: |
+          pip install -U -q -r .actions/requirements.txt
+          python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_fabric" \
+            --source_import="lightning.fabric" \
+            --target_import="lightning_fabric"
+          python .actions/assistant.py copy_replace_imports --source_dir="./examples/fabric" \
+            --source_import="lightning.fabric" \
+            --target_import="lightning_fabric"
+        # without succeeded this could run even if the job has already failed
+        condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
+        displayName: "Adjust tests & examples"
+
       - bash: |
           set -e
           extra=$(python -c "print({'lightning': 'fabric-'}.get('$(PACKAGE_NAME)', ''))")
-          pip install -e ".[${extra}dev]" pytest-timeout -U --extra-index-url="${TORCH_URL}"
-          pip install setuptools==75.6.0 jsonargparse==4.35.0
+          pip install -e ".[${extra}dev]" -U --upgrade-strategy=eager --extra-index-url="${TORCH_URL}"
         displayName: "Install package & dependencies"
 
       - bash: |
@@ -130,18 +145,6 @@ jobs:
         condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
         displayName: "Testing: Fabric doctests"
 
-      - bash: |
-          pip install -q -r .actions/requirements.txt
-          python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_fabric" \
-            --source_import="lightning.fabric" \
-            --target_import="lightning_fabric"
-          python .actions/assistant.py copy_replace_imports --source_dir="./examples/fabric" \
-            --source_import="lightning.fabric" \
-            --target_import="lightning_fabric"
-        # without succeeded this could run even if the job has already failed
-        condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
-        displayName: "Adjust tests & examples"
-
       - bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest tests_fabric/ -v --durations=50
         workingDirectory: tests/
         displayName: "Testing: fabric standard"

.azure/gpu-tests-pytorch.yml

@@ -53,20 +53,20 @@ jobs:
           image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
           PACKAGE_NAME: "pytorch"
         "PyTorch | latest":
-          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.8-cuda12.6.3"
           PACKAGE_NAME: "pytorch"
         #"PyTorch | future":
         #  image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
         #  PACKAGE_NAME: "pytorch"
         "Lightning | latest":
-          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.8-cuda12.6.3"
           PACKAGE_NAME: "lightning"
     pool: lit-rtx-3090
     variables:
       DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )
       FREEZE_REQUIREMENTS: "1"
       PIP_CACHE_DIR: "/var/tmp/pip"
-      PL_RUN_CUDA_TESTS: "1"
+      RUN_ONLY_CUDA_TESTS: "1"
     container:
       image: $(image)
       # default shm size is 64m. Increase it to avoid:
@@ -82,8 +82,6 @@ jobs:
           echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/cu${cuda_ver}/torch_stable.html"
           scope=$(python -c 'n = "$(PACKAGE_NAME)" ; print(dict(pytorch="pytorch_lightning").get(n, n))')
           echo "##vso[task.setvariable variable=COVERAGE_SOURCE]$scope"
-          python_ver=$(python -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")
-          echo "##vso[task.setvariable variable=PYTHON_VERSION_MM]$python_ver"
         displayName: "set env. vars"
       - bash: |
           echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM}"
@@ -104,6 +102,12 @@ jobs:
           pip list
         displayName: "Image info & NVIDIA"
 
+      - bash: |
+          python .actions/assistant.py replace_oldest_ver
+          pip install "cython<3.0" wheel  # for compatibility
+        condition: contains(variables['Agent.JobName'], 'oldest')
+        displayName: "setting oldest dependencies"
+
       - bash: |
           PYTORCH_VERSION=$(python -c "import torch; print(torch.__version__.split('+')[0])")
           pip install -q wget packaging
@@ -113,11 +117,22 @@ jobs:
           done
         displayName: "Adjust dependencies"
 
+      - bash: |
+          pip install -U -q -r .actions/requirements.txt
+          python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_pytorch" \
+            --source_import="lightning.fabric,lightning.pytorch" \
+            --target_import="lightning_fabric,pytorch_lightning"
+          python .actions/assistant.py copy_replace_imports --source_dir="./examples/pytorch/basics" \
+            --source_import="lightning.fabric,lightning.pytorch" \
+            --target_import="lightning_fabric,pytorch_lightning"
+        # without succeeded this could run even if the job has already failed
+        condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
+        displayName: "Adjust tests & examples"
+
       - bash: |
           set -e
           extra=$(python -c "print({'lightning': 'pytorch-'}.get('$(PACKAGE_NAME)', ''))")
-          pip install -e ".[${extra}dev]" pytest-timeout -U --extra-index-url="${TORCH_URL}"
-          pip install setuptools==75.6.0 jsonargparse==4.35.0
+          pip install -e ".[${extra}dev]" -U --upgrade-strategy=eager --extra-index-url="${TORCH_URL}"
         displayName: "Install package & dependencies"
 
       - bash: pip uninstall -y lightning
@@ -144,17 +159,6 @@ jobs:
         condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
         displayName: "Testing: PyTorch doctests"
 
-      - bash: |
-          python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_pytorch" \
-            --source_import="lightning.fabric,lightning.pytorch" \
-            --target_import="lightning_fabric,pytorch_lightning"
-          python .actions/assistant.py copy_replace_imports --source_dir="./examples/pytorch/basics" \
-            --source_import="lightning.fabric,lightning.pytorch" \
-            --target_import="lightning_fabric,pytorch_lightning"
-        # without succeeded this could run even if the job has already failed
-        condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
-        displayName: "Adjust tests & examples"
-
       - bash: |
           bash .actions/pull_legacy_checkpoints.sh
           cd tests/legacy

.github/CONTRIBUTING.md

@@ -3,7 +3,7 @@
 Welcome to the PyTorch Lightning community! We're building the most advanced research platform on the planet to implement the latest, best practices
 and integrations that the amazing PyTorch team and other research organization rolls out!
 
-If you are new to open source, check out [this blog to get started with your first Open Source contribution](https://devblog.pytorchlightning.ai/quick-contribution-guide-86d977171b3a).
+If you are new to open source, check out [this blog to get started with your first Open Source contribution](https://medium.com/pytorch-lightning/quick-contribution-guide-86d977171b3a).
 
 ## Main Core Value: One less thing to remember
 
@@ -109,6 +109,50 @@ ______________________________________________________________________
 
 ## Guidelines
 
+### Development environment
+
+To set up a local development environment, we recommend using `uv`, which can be installed following their [instructions](https://docs.astral.sh/uv/getting-started/installation/).
+
+Once `uv` has been installed, begin by cloning the forked repository:
+
+```bash
+git clone https://github.com/{YOUR_GITHUB_USERNAME}/pytorch-lightning.git
+cd pytorch-lightning
+```
+
+> If you're using [Lightning Studio](https://lightning.ai) or already have your `uv venv` activated, you can quickly set up the project by running:
+
+```bash
+make setup
+```
+
+This will:
+
+- Install all required dependencies.
+- Perform an editable install of the `pytorch-lightning` project.
+- Install and configure `pre-commit`.
+
+#### Manual Setup (Optional)
+
+If you prefer more fine-grained control over the dependencies, you can set up the environment manually:
+
+```bash
+uv venv
+# uv venv --python 3.11 # use this instead if you need a specific python version
+
+source .venv/bin/activate # command may differ based on your shell
+uv pip install ".[dev, examples]"
+```
+
+Once the dependencies have been installed, install pre-commit and set up the git hook scripts:
+
+```bash
+uv pip install pre-commit
+pre-commit install
+```
+
+If you would like more information regarding the uv commands, please refer to uv's documentation for more information on their [pip interface](https://docs.astral.sh/uv/pip/).
+
 ### Developments scripts
 
 To build the documentation locally, simply execute the following commands from project root (only for Unix):
@@ -130,11 +174,11 @@ In case you are adding new dependencies, make sure that they are compatible with
 
 ### Documentation
 
-To learn about development of docs, check out the docs [README.md](https://github.com/Lightning-AI/lightning/blob/master/docs/README.md).
+To learn about development of docs, check out the docs [README.md](https://github.com/Lightning-AI/pytorch-lightning/blob/master/docs/README.md).
 
 ### Testing
 
-To learn about tests, check out the tests [README.md](https://github.com/Lightning-AI/lightning/blob/master/tests/README.md).
+To learn about tests, check out the tests [README.md](https://github.com/Lightning-AI/pytorch-lightning/blob/master/tests/README.md).
 
 ### Pull Request
 
@@ -165,8 +209,8 @@ We welcome any useful contribution! For your convenience here's a recommended wo
 
 1. If any of the existing tests fail in your PR on our CI, refer to the following READMEs to identify what's failing and try to address it.
 
-   - [Test README](https://github.com/Lightning-AI/lightning/blob/master/tests/README.md)
-   - [CI/CD README](https://github.com/Lightning-AI/lightning/blob/master/.github/workflows/README.md)
+   - [Test README](https://github.com/Lightning-AI/pytorch-lightning/blob/master/tests/README.md)
+   - [CI/CD README](https://github.com/Lightning-AI/pytorch-lightning/tree/master/.github/workflows#readme)
 
 1. When you feel ready for integrating your work, mark your PR "Ready for review".
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,7 +18,7 @@ Fixes #\<issue_number>
   <summary><b>Before submitting</b></summary>
 
 - Was this **discussed/agreed** via a GitHub issue? (not for typos and docs)
-- [ ] Did you read the [contributor guideline](https://github.com/Lightning-AI/lightning/blob/master/.github/CONTRIBUTING.md), **Pull Request** section?
+- [ ] Did you read the [contributor guideline](https://github.com/Lightning-AI/pytorch-lightning/blob/master/.github/CONTRIBUTING.md), **Pull Request** section?
 - [ ] Did you make sure your **PR does only one thing**, instead of bundling different changes together?
 - Did you make sure to **update the documentation** with your changes? (if necessary)
 - Did you write any **new necessary tests**? (not for typos and docs)