Skip to content

Commit 2882cef

Browse files
bhimrazybhimrazy
authored
Merge branch 'master' into chore/add-test-for-pytorch-3-10
2 parents 66c7dd1 + 283ce77 commit 2882cef

File tree

21 files changed

+143
-24
lines changed

21 files changed

+143
-24
lines changed

‎.github/markdown-links-config.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
},
99
{
1010
"pattern": "^https://codecov.io/gh/Lightning-AI/pytorch-lightning/graph/badge.svg"
11+
},
12+
{
13+
"pattern": "^https://app.neptune.ai"
14+
},
15+
{
16+
"pattern": "^https://www.neptune.ai/"
1117
}
1218
],
1319
"httpHeaders": [

‎.github/workflows/_build-packages.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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@v6
44+
- uses: actions/upload-artifact@v7
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@v7
54+
- uses: actions/download-artifact@v8
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@v6
65+
- uses: actions/upload-artifact@v7
6666
with:
6767
name: ${{ inputs.artifact-name }}
6868
path: pypi

‎.github/workflows/_legacy-checkpoints.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@v6
111+
uses: actions/upload-artifact@v7
112112
with:
113113
name: checkpoints-${{ github.sha }}
114114
path: ${{ env.LEGACY_FOLDER }}/checkpoints/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/setup-python@v6
5151
with:
5252
python-version: ${{ matrix.python-version }}
53-
- uses: actions/download-artifact@v7
53+
- uses: actions/download-artifact@v8
5454
with:
5555
name: dist-packages-${{ github.sha }}
5656
path: dist

‎.github/workflows/ci-tests-fabric.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ jobs:
103103
uv pip install -U "lightning-utilities[cli]"
104104
python -m lightning_utilities.cli requirements set-oldest \
105105
--req_files "['requirements/fabric/base.txt', 'requirements/fabric/strategies.txt', 'requirements/fabric/test.txt']"
106-
uv pip install "cython<3.0" wheel setuptools
107-
uv pip install "pyyaml==5.4" --no-build-isolation
106+
uv pip install "cython<3.0" wheel
107+
uv pip install "pyyaml==6.0.0" --no-build-isolation
108108
# This script removes any line containing "error::FutureWarning" from pyproject.toml
109109
uv pip install -r requirements/ci.txt
110110
python .actions/assistant.py prune_pytest_as_errors

‎.github/workflows/ci-tests-pytorch.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ jobs:
102102
uv pip install -U "lightning-utilities[cli]"
103103
python -m lightning_utilities.cli requirements set-oldest \
104104
--req_files "['requirements/pytorch/base.txt', 'requirements/pytorch/extra.txt', 'requirements/pytorch/strategies.txt', 'requirements/pytorch/examples.txt', 'requirements/pytorch/test.txt']"
105-
uv pip install "cython<3.0" wheel setuptools
106-
uv pip install "pyyaml==5.4" --no-build-isolation
105+
uv pip install "cython<3.0" wheel
106+
uv pip install "pyyaml==6.0.0" --no-build-isolation
107107
# This script removes any line containing "error::FutureWarning" from pyproject.toml
108108
uv pip install -r requirements/ci.txt
109109
python .actions/assistant.py prune_pytest_as_errors
@@ -134,8 +134,7 @@ jobs:
134134
run: |
135135
uv pip install ".[${EXTRA_PREFIX}extra,${EXTRA_PREFIX}test,${EXTRA_PREFIX}strategies]" \
136136
--upgrade \
137-
--find-links="${TORCH_URL}" \
138-
--find-links="https://download.pytorch.org/whl/torch-tensorrt"
137+
--find-links="${TORCH_URL}"
139138
# ensure pkg_resources is available for older python versions & packages like onnxruntime that require it
140139
uv pip install "setuptools<80.10.3"
141140
uv pip list

‎.github/workflows/docs-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133

134134
- name: Upload built docs
135135
if: ${{ matrix.target == 'html' }}
136-
uses: actions/upload-artifact@v6
136+
uses: actions/upload-artifact@v7
137137
with:
138138
name: docs-${{ matrix.pkg-name }}-${{ github.sha }}
139139
path: docs/build/html/
@@ -153,7 +153,7 @@ jobs:
153153
# use input if dispatch or git tag
154154
VERSION: ${{ inputs.version || github.ref_name }}
155155
steps:
156-
- uses: actions/download-artifact@v7
156+
- uses: actions/download-artifact@v8
157157
with:
158158
name: docs-${{ matrix.pkg-name }}-${{ github.sha }}
159159
path: docs/build/html/

‎.github/workflows/release-nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
nb-dirs: ${{ env.NB_DIRS }}
4141
allow-local-changes: "true"
4242

43-
- uses: actions/upload-artifact@v6
43+
- uses: actions/upload-artifact@v7
4444
with:
4545
name: nightly-packages-${{ github.sha }}
4646
path: dist
@@ -54,7 +54,7 @@ jobs:
5454
PKG_NAME: "lightning"
5555
steps:
5656
- uses: actions/checkout@v6 # needed to use local composite action
57-
- uses: actions/download-artifact@v7
57+
- uses: actions/download-artifact@v8
5858
with:
5959
name: nightly-packages-${{ github.sha }}
6060
path: dist

‎.github/workflows/release-pkg.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.event_name == 'release'
3939
steps:
4040
- uses: actions/checkout@v6
41-
- uses: actions/download-artifact@v7
41+
- uses: actions/download-artifact@v8
4242
with:
4343
name: dist-packages-${{ github.sha }}
4444
path: dist
@@ -140,7 +140,7 @@ jobs:
140140
name: ["FABRIC", "PYTORCH", "LIGHTNING"]
141141
steps:
142142
- uses: actions/checkout@v6 # needed for local action below
143-
- uses: actions/download-artifact@v7
143+
- uses: actions/download-artifact@v8
144144
with:
145145
name: dist-packages-${{ github.sha }}
146146
path: dist
@@ -165,7 +165,7 @@ jobs:
165165
name: ["FABRIC", "PYTORCH", "LIGHTNING"]
166166
steps:
167167
- uses: actions/checkout@v6 # needed for local action below
168-
- uses: actions/download-artifact@v7
168+
- uses: actions/download-artifact@v8
169169
with:
170170
name: dist-packages-${{ github.sha }}
171171
path: dist

‎.lightning/workflows/pytorch.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ run: |
123123
extra=$(python -c "print({'lightning': 'pytorch-'}.get('${PACKAGE_NAME}', ''))")
124124
125125
# Use find-links to prefer CUDA-specific packages from PyTorch index
126-
uv pip install -e ".[${extra}dev]" --upgrade \
126+
uv pip install -e ".[${extra}dev,${extra}test_gpu]" --upgrade \
127127
--find-links="https://download.pytorch.org/whl/${UV_TORCH_BACKEND}" \
128128
--find-links="https://download.pytorch.org/whl/${UV_TORCH_BACKEND}/torch-tensorrt"
129129
uv pip list

0 commit comments

Comments
 (0)