Skip to content

Commit 5b3bb74

Browse files
justusschockbhimrazymatsumotosanBordadeependujha
authored
Release 2.5.6 (#21336)
* Remove Support For Deprecated Habana (#21327) * remove habana * changelog * remove from install * update docs * update * update * pytest match * Add name to accelerator interface (#21325) * changelog + rebase * version.info bumo * fix: Checkout and Git LFS fetch issue for pytorch docs workflow (#21219) * ci: `uv` for `docs-build` (#21206) replace pip with uv Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> * fix: failing ci linkcheck in markdown (#21222) Update timeout and retry configuration Increased timeout and adjusted retry settings. * simplify lit CI config (#21220) * simplify lit CI config * Empty-Commit * Empty-Commit * Update --------- Co-authored-by: Justus Schock <12886177+justusschock@users.noreply.github.com> * fix:docs build errors (#21286) * docs: add 'typing.Union' to nitpick_ignore_regex in Sphinx configuration * docs: add Supermicro link to linkcheck_ignore due to 403 error * [Hotfix] Remove reference to `torch.jit.export` (#21292) update docs * Docs: drop deprecated project (#21250) * drop dumping wheels after UV switch (#21217) * chore(`ci/litjob`): fix and optimize GPU related tests (#21290) * fix: add unzip to dependencies in pytorch workflow * fix: update variable interpolation for PACKAGE_NAME in YAML workflows * fix: update variable interpolation for PACKAGE_NAME in fabric workflow * fix: disable CUDA_LAUNCH_BLOCKING to speed up tests * apply suggestion * remove integrations from Dockerfile * Update readme (#21263) Update LitServe description for clarity * Update heading from 'Why PyTorch Lightning?' to 'Convert from PyTorch to PyTorch Lightning?' * Fix heading formatting in README.md * Add UTM parameters to links in README Updated links in README to include UTM parameters for tracking. * readme readme * readme updates readme updates * update readme Update readme * update * update * update * update * resolve docker builds * update * update * update * update * update * update * update --------- Co-authored-by: Bhimraj Yadav <bhimrajyadav977@gmail.com> Co-authored-by: Shion Matsumoto <smatsumoto97@gmail.com> Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> Co-authored-by: Deependu <deependujha21@gmail.com> Co-authored-by: Nicki Skafte Detlefsen <skaftenicki@gmail.com> Co-authored-by: William Falcon <waf2107@columbia.edu>
1 parent dd0a8f3 commit 5b3bb74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+548
-850
lines changed

.actions/assistant.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,25 @@ def generate_docker_tags(
459459
tags = [f"{docker_project}:{tag}" for tag in tags]
460460
print(",".join(tags))
461461

462+
@staticmethod
463+
def prune_pytest_as_errors(
464+
pyproject_toml: str = "pyproject.toml", errors: tuple = ("FutureWarning", "DeprecationWarning")
465+
) -> None:
466+
"""Prune pytest warnings as errors from the pyproject.toml file."""
467+
import tomlkit
468+
469+
with open(pyproject_toml, encoding="utf-8") as fopen:
470+
content = fopen.read()
471+
pyproject = tomlkit.parse(content)
472+
filterwarnings = pyproject.get("tool", {}).get("pytest", {}).get("ini_options", {}).get("filterwarnings", [])
473+
if not filterwarnings:
474+
return
475+
filterwarnings = [wrn for wrn in filterwarnings if not any(f"error::{err}" in wrn for err in errors)]
476+
pyproject["tool"]["pytest"]["ini_options"]["filterwarnings"] = filterwarnings
477+
478+
with open(pyproject_toml, "w", encoding="utf-8") as fopen:
479+
fopen.write(tomlkit.dumps(pyproject))
480+
462481

463482
if __name__ == "__main__":
464483
import jsonargparse

.azure/gpu-tests-fabric.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
cuda_ver=$(python -c "import torch ; print(''.join(map(str, torch.version.cuda.split('.')[:2])))")
7777
echo "##vso[task.setvariable variable=CUDA_VERSION_MM]$cuda_ver"
7878
echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/cu${cuda_ver}/torch_stable.html"
79-
scope=$(python -c 'n = "$(PACKAGE_NAME)" ; print(dict(fabric="lightning_fabric").get(n, n))')
79+
scope=$(python -c 'n = "${PACKAGE_NAME}" ; print(dict(fabric="lightning_fabric").get(n, n))')
8080
echo "##vso[task.setvariable variable=COVERAGE_SOURCE]$scope"
8181
displayName: "set env. vars"
8282
- bash: |
@@ -135,7 +135,7 @@ jobs:
135135
136136
- bash: |
137137
set -e
138-
extra=$(python -c "print({'lightning': 'fabric-'}.get('$(PACKAGE_NAME)', ''))")
138+
extra=$(python -c "print({'lightning': 'fabric-'}.get('${PACKAGE_NAME}', ''))")
139139
pip install -e ".[${extra}dev]" -U --upgrade-strategy=eager --extra-index-url="${TORCH_URL}"
140140
displayName: "Install package & dependencies"
141141

.azure/gpu-tests-pytorch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
cuda_ver=$(python -c "import torch ; print(''.join(map(str, torch.version.cuda.split('.')[:2])))")
8181
echo "##vso[task.setvariable variable=CUDA_VERSION_MM]$cuda_ver"
8282
echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/cu${cuda_ver}/torch_stable.html"
83-
scope=$(python -c 'n = "$(PACKAGE_NAME)" ; print(dict(pytorch="pytorch_lightning").get(n, n))')
83+
scope=$(python -c 'n = "${PACKAGE_NAME}" ; print(dict(pytorch="pytorch_lightning").get(n, n))')
8484
echo "##vso[task.setvariable variable=COVERAGE_SOURCE]$scope"
8585
displayName: "set env. vars"
8686
- bash: |
@@ -139,7 +139,7 @@ jobs:
139139
140140
- bash: |
141141
set -e
142-
extra=$(python -c "print({'lightning': 'pytorch-'}.get('$(PACKAGE_NAME)', ''))")
142+
extra=$(python -c "print({'lightning': 'pytorch-'}.get('${PACKAGE_NAME}', ''))")
143143
pip install -e ".[${extra}dev]" -U --upgrade-strategy=eager --extra-index-url="${TORCH_URL}"
144144
displayName: "Install package & dependencies"
145145

.github/actions/pip-wheels/action.yml

Lines changed: 0 additions & 82 deletions
This file was deleted.

.github/checkgroup.yml

Lines changed: 14 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ subprojects:
2121
checks:
2222
- "pl-cpu-guardian" # aggregated check for all cases
2323

24-
- id: "pytorch_lightning: Azure GPU"
24+
- id: "pytorch_lightning: lit GPU"
2525
paths:
2626
- ".actions/*"
27-
- ".azure/gpu-tests-pytorch.yml"
27+
- ".lightning/workflows/pytorch.yml"
2828
# only the azure GPU workflow runs the examples
2929
# all examples don't need to be added because they aren't used in CI, but these are
3030
- "examples/run_pl_examples.sh"
@@ -47,13 +47,13 @@ subprojects:
4747
- "!*.md"
4848
- "!**/*.md"
4949
checks:
50-
- "pytorch-lightning (GPUs) (testing Lightning | latest)"
51-
- "pytorch-lightning (GPUs) (testing PyTorch | oldest)"
52-
- "pytorch-lightning (GPUs) (testing PyTorch | latest)"
50+
- "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-devel-ubuntu22.04, pytorch, 3.10)"
51+
- "pytorch.yml / Lit Job (lightning, 3.12)"
52+
- "pytorch.yml / Lit Job (pytorch, 3.12)"
5353

54-
- id: "pytorch_lightning: Benchmarks"
54+
- id: "Benchmarks"
5555
paths:
56-
- ".azure/gpu-benchmarks.yml"
56+
- ".lightning/workflows/benchmark.yml"
5757
- "requirements/fabric/**"
5858
- "requirements/pytorch/**"
5959
- "src/lightning/fabric/**"
@@ -65,7 +65,8 @@ subprojects:
6565
- "!*.md"
6666
- "!**/*.md"
6767
checks:
68-
- "lightning.Benchmarks"
68+
- "benchmark.yml / Lit Job (fabric)"
69+
- "benchmark.yml / Lit Job (pytorch)"
6970

7071
# Temporarily disabled
7172
# - id: "pytorch-lightning: TPU workflow"
@@ -111,34 +112,6 @@ subprojects:
111112
- "docs-make (pytorch, doctest)"
112113
- "docs-make (pytorch, html)"
113114

114-
- id: "pytorch_lightning: Docker"
115-
paths:
116-
- ".actions/*"
117-
- ".github/workflows/docker-build.yml"
118-
- "dockers/**"
119-
- "requirements/pytorch/**"
120-
- "requirements/fabric/**"
121-
- "setup.py"
122-
- "!requirements/*/docs.txt"
123-
- "!*.md"
124-
- "!**/*.md"
125-
checks:
126-
- "build-cuda (3.10, 2.1.2, 12.1.1)"
127-
- "build-cuda (3.11, 2.2.2, 12.1.1)"
128-
- "build-cuda (3.11, 2.3.1, 12.1.1)"
129-
- "build-cuda (3.11, 2.4.1, 12.1.1)"
130-
- "build-cuda (3.12, 2.5.1, 12.1.1)"
131-
- "build-cuda (3.12, 2.6.0, 12.4.1)"
132-
#- "build-NGC"
133-
- "build-pl (3.10, 2.1, 12.1.1)"
134-
- "build-pl (3.11, 2.2, 12.1.1)"
135-
- "build-pl (3.11, 2.3, 12.1.1)"
136-
- "build-pl (3.11, 2.4, 12.1.1)"
137-
- "build-pl (3.12, 2.5, 12.1.1)"
138-
- "build-pl (3.12, 2.6, 12.4.1)"
139-
- "build-pl (3.12, 2.7, 12.6.3)"
140-
- "build-pl (3.12, 2.8, 12.6.3, true)"
141-
142115
# SECTION: lightning_fabric
143116

144117
- id: "lightning_fabric: CPU workflow"
@@ -156,10 +129,10 @@ subprojects:
156129
checks:
157130
- "fabric-cpu-guardian" # aggregated check for all cases
158131

159-
- id: "lightning_fabric: Azure GPU"
132+
- id: "lightning_fabric: lit GPU"
160133
paths:
161134
- ".actions/*"
162-
- ".azure/gpu-tests-fabric.yml"
135+
- ".lightning/workflows/fabric.yml"
163136
- "examples/fabric/**"
164137
- "examples/run_fabric_examples.sh"
165138
- "requirements/fabric/**"
@@ -175,9 +148,9 @@ subprojects:
175148
- "!*.md"
176149
- "!**/*.md"
177150
checks:
178-
- "lightning-fabric (GPUs) (testing Fabric | oldest)"
179-
- "lightning-fabric (GPUs) (testing Fabric | latest)"
180-
- "lightning-fabric (GPUs) (testing Lightning | latest)"
151+
- "fabric.yml / Lit Job (nvidia/cuda:12.1.1-devel-ubuntu22.04, fabric, 3.10)"
152+
- "fabric.yml / Lit Job (fabric, 3.12)"
153+
- "fabric.yml / Lit Job (lightning, 3.12)"
181154

182155
# Temporarily disabled
183156
# - id: "lightning_fabric: TPU workflow"

.github/label-change.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ package:
5454
- "src/lightning_fabric/*"
5555
- "src/pytorch_lightning/*"
5656

57-
dockers:
58-
- changed-files:
59-
- any-glob-to-any-file:
60-
- "dockers/**"
61-
- ".github/workflows/docker-build.yml"
62-
6357
dependencies:
6458
- changed-files:
6559
- any-glob-to-any-file:

.github/markdown-links-config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
}
2424
}
2525
],
26-
"timeout": "20s",
26+
"timeout": "30s",
2727
"retryOn429": true,
28-
"retryCount": 5,
29-
"fallbackRetryDelay": "20s"
28+
"retryCount": 10,
29+
"fallbackRetryDelay": "10s"
3030
}

.github/workflows/_build-packages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pkg-name: ${{ fromJSON(inputs.pkg-names) }}
2727
steps:
2828
- uses: actions/checkout@v5
29-
- uses: actions/setup-python@v5
29+
- uses: actions/setup-python@v6
3030
with:
3131
python-version: "3.x"
3232

@@ -41,7 +41,7 @@ jobs:
4141
mkdir -p pypi/${{ matrix.pkg-name }}
4242
cp dist/* pypi/${{ matrix.pkg-name }}/
4343
44-
- uses: actions/upload-artifact@v4
44+
- uses: actions/upload-artifact@v5
4545
with:
4646
name: ${{ inputs.artifact-name }}-${{ matrix.pkg-name }}
4747
path: pypi
@@ -51,7 +51,7 @@ jobs:
5151
needs: build-packages
5252
runs-on: ubuntu-22.04
5353
steps:
54-
- uses: actions/download-artifact@v5
54+
- uses: actions/download-artifact@v6
5555
with: # download all build artifacts
5656
pattern: ${{ inputs.artifact-name }}-*
5757
merge-multiple: true
@@ -62,7 +62,7 @@ jobs:
6262
6363
- name: Keep artifact
6464
run: python -c "print('DAYS=' + str(5 if '${{ github.event_name }}'.startswith('pull_request') else 0))" >> $GITHUB_ENV
65-
- uses: actions/upload-artifact@v4
65+
- uses: actions/upload-artifact@v5
6666
with:
6767
name: ${{ inputs.artifact-name }}
6868
path: pypi

.github/workflows/_legacy-checkpoints.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@v5
5959

6060
- name: Install uv and set Python version
61-
uses: astral-sh/setup-uv@v6
61+
uses: astral-sh/setup-uv@v7
6262
with:
6363
python-version: "3.9"
6464
# TODO: Avoid activating environment like this
@@ -108,7 +108,7 @@ jobs:
108108
python -c "print('AWS_RUN=' + str('' if '${{inputs.push_to_s3}}' == 'true' else '--dryrun'))" >> $GITHUB_ENV
109109
110110
- name: Upload checkpoints to GitHub Actions artifact
111-
uses: actions/upload-artifact@v4
111+
uses: actions/upload-artifact@v5
112112
with:
113113
name: checkpoints-${{ github.sha }}
114114
path: ${{ env.LEGACY_FOLDER }}/checkpoints/

.github/workflows/ci-pkg-install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
python-version: ["3.9", "3.11"]
4848
steps:
4949
- uses: actions/checkout@v5
50-
- uses: actions/setup-python@v5
50+
- uses: actions/setup-python@v6
5151
with:
5252
python-version: ${{ matrix.python-version }}
53-
- uses: actions/download-artifact@v5
53+
- uses: actions/download-artifact@v6
5454
with:
5555
name: dist-packages-${{ github.sha }}
5656
path: dist

0 commit comments

Comments
 (0)