Skip to content

Commit 1e615c3

Browse files
deependujhadeependujha
authored
Merge branch 'master' into update/code-owners
2 parents 44f43cb + 3bcfc17 commit 1e615c3

Some content is hidden

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

53 files changed

+1661
-258
lines changed

‎.azure/gpu-tests-fabric.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
displayName: "extend env. vars 4 future"
8686
8787
- bash: |
88+
set -ex
8889
echo $(DEVICES)
8990
echo $CUDA_VISIBLE_DEVICES
9091
echo $CUDA_VERSION_MM
@@ -96,6 +97,10 @@ jobs:
9697
python --version
9798
pip --version
9899
pip list
100+
# todo: rather use devel base image
101+
apt-get update -qq --fix-missing
102+
apt-get install -y cuda-toolkit
103+
nvcc --version
99104
displayName: "Image info & NVIDIA"
100105
101106
- bash: |
@@ -156,7 +161,7 @@ jobs:
156161
- bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest tests_fabric/ -v --durations=50
157162
workingDirectory: tests/
158163
displayName: "Testing: fabric standard"
159-
timeoutInMinutes: "10"
164+
timeoutInMinutes: "15"
160165

161166
- bash: |
162167
wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/run_standalone_tests.sh
@@ -165,7 +170,7 @@ jobs:
165170
env:
166171
PL_RUN_STANDALONE_TESTS: "1"
167172
displayName: "Testing: fabric standalone"
168-
timeoutInMinutes: "10"
173+
timeoutInMinutes: "15"
169174
170175
- bash: |
171176
python -m coverage report

‎.azure/gpu-tests-pytorch.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
displayName: "extend env. vars 4 future"
8585
8686
- bash: |
87+
set -ex
8788
echo $(DEVICES)
8889
echo $CUDA_VISIBLE_DEVICES
8990
echo $CUDA_VERSION_MM
@@ -95,6 +96,10 @@ jobs:
9596
python --version
9697
pip --version
9798
pip list
99+
# todo: rather use devel base image
100+
apt-get update -qq --fix-missing
101+
apt-get install -y cuda-toolkit
102+
nvcc --version
98103
displayName: "Image info & NVIDIA"
99104
100105
- bash: |
@@ -189,7 +194,7 @@ jobs:
189194
env:
190195
PL_USE_MOCKED_MNIST: "1"
191196
displayName: "Testing: PyTorch standalone tasks"
192-
timeoutInMinutes: "10"
197+
timeoutInMinutes: "15"
193198

194199
- bash: |
195200
python -m coverage report

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

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

‎.github/checkgroup.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ subprojects:
4747
- "!*.md"
4848
- "!**/*.md"
4949
checks:
50-
- "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, pytorch, 3.10)"
50+
- "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-devel-ubuntu22.04, pytorch, 3.10)"
5151
- "pytorch.yml / Lit Job (lightning, 3.12)"
5252
- "pytorch.yml / Lit Job (pytorch, 3.12)"
5353

@@ -148,7 +148,7 @@ subprojects:
148148
- "!*.md"
149149
- "!**/*.md"
150150
checks:
151-
- "fabric.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, fabric, 3.10)"
151+
- "fabric.yml / Lit Job (nvidia/cuda:12.1.1-devel-ubuntu22.04, fabric, 3.10)"
152152
- "fabric.yml / Lit Job (fabric, 3.12)"
153153
- "fabric.yml / Lit Job (lightning, 3.12)"
154154

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,6 @@ jobs:
134134
--find-links="${TORCH_URL}"
135135
uv pip list
136136
137-
- name: Dump handy wheels
138-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
139-
continue-on-error: true
140-
uses: ./.github/actions/pip-wheels
141-
with:
142-
wheel-dir: ${{ env.PYPI_CACHE_DIR }}
143-
torch-url: ${{ env.TORCH_URL }}
144-
cache-key: "pypi_wheels"
145-
146137
- name: Adjust tests
147138
if: ${{ matrix.config.pkg-name != 'lightning' }}
148139
run: |

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,6 @@ jobs:
147147
if: ${{ matrix.config.pkg-name == 'lightning' }}
148148
run: uv pip uninstall pytorch-lightning
149149

150-
- name: Dump handy wheels
151-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
152-
continue-on-error: true
153-
uses: ./.github/actions/pip-wheels
154-
with:
155-
wheel-dir: ${{ env.PYPI_CACHE_DIR }}
156-
torch-url: ${{ env.TORCH_URL }}
157-
cache-key: "pypi_wheels"
158-
159150
- name: Cache datasets
160151
uses: actions/cache@v4
161152
with:

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ defaults:
4747
env:
4848
FREEZE_REQUIREMENTS: "1"
4949
TORCH_URL: "https://download.pytorch.org/whl/cpu/"
50-
PYPI_CACHE_DIR: "_pip-wheels"
5150
PYPI_LOCAL_DIR: "pypi_pkgs/"
5251

5352
jobs:
@@ -95,12 +94,6 @@ jobs:
9594
aws s3 sync --no-sign-request s3://sphinx-packages/ ${PYPI_LOCAL_DIR}
9695
uv pip install lai-sphinx-theme -U -f ${PYPI_LOCAL_DIR}
9796
98-
- name: pip wheels cache
99-
uses: actions/cache/restore@v4
100-
with:
101-
path: ${{ env.PYPI_CACHE_DIR }}
102-
key: pypi_wheels
103-
10497
- name: Install pandoc & texlive
10598
if: ${{ matrix.pkg-name == 'pytorch' }}
10699
timeout-minutes: 5
@@ -111,10 +104,8 @@ jobs:
111104
- name: Install package & dependencies
112105
timeout-minutes: 20
113106
run: |
114-
mkdir -p ${PYPI_CACHE_DIR} # in case cache was not hit
115-
ls -lh ${PYPI_CACHE_DIR}
116107
uv pip install .[all] -U -r requirements/${{ matrix.pkg-name }}/docs.txt \
117-
-f ${PYPI_LOCAL_DIR} -f ${PYPI_CACHE_DIR} --extra-index-url="${TORCH_URL}"
108+
-f ${PYPI_LOCAL_DIR} --extra-index-url="${TORCH_URL}"
118109
uv pip list
119110
120111
- name: Install req. for Notebooks/tutorials
@@ -149,15 +140,6 @@ jobs:
149140
retention-days: ${{ env.ARTIFACT_DAYS }}
150141
include-hidden-files: true
151142

152-
#- name: Dump handy wheels
153-
# if: github.event_name == 'push' && github.ref == 'refs/heads/master'
154-
# continue-on-error: true
155-
# uses: ./.github/actions/pip-wheels
156-
# with:
157-
# wheel-dir: ${{ env.PYPI_CACHE_DIR }}
158-
# torch-url: ${{ env.TORCH_URL }}
159-
# cache-key: "pypi_wheels"
160-
161143
deploy-docs:
162144
needs: docs-make
163145
if: github.repository_owner == 'Lightning-AI' && github.event_name != 'pull_request'

‎.lightning/workflows/fabric.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ trigger:
66

77
timeout: "60" # minutes
88
machine: "L4_X_2"
9-
image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
9+
image: "nvidia/cuda:12.6.3-devel-ubuntu22.04"
1010
parametrize:
1111
matrix: {}
1212
include:
1313
# note that this is setting also all oldest requirements which is linked to python == 3.10
14-
- image: "nvidia/cuda:12.1.1-runtime-ubuntu22.04"
14+
- image: "nvidia/cuda:12.1.1-devel-ubuntu22.04"
1515
PACKAGE_NAME: "fabric"
1616
python_version: "3.10"
1717
- PACKAGE_NAME: "fabric"
1818
python_version: "3.12"
19-
# - image: "nvidia/cuda:12.6-runtime-ubuntu22.04"
20-
# PACKAGE_NAME: "fabric"
19+
#- image: "nvidia/cuda:12.6-runtime-ubuntu22.04"
20+
# PACKAGE_NAME: "fabric"
2121
- PACKAGE_NAME: "lightning"
2222
python_version: "3.12"
2323
exclude: []

‎.lightning/workflows/pytorch.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ trigger:
66

77
timeout: "60" # minutes
88
machine: "L4_X_2"
9-
image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
9+
image: "nvidia/cuda:12.6.3-devel-ubuntu22.04"
1010
parametrize:
1111
matrix: {}
1212
include:
1313
# note that this also sets oldest requirements which are linked to Python == 3.10
14-
- image: "nvidia/cuda:12.1.1-runtime-ubuntu22.04"
14+
- image: "nvidia/cuda:12.1.1-devel-ubuntu22.04"
1515
PACKAGE_NAME: "pytorch"
1616
python_version: "3.10"
1717
- PACKAGE_NAME: "pytorch"
1818
python_version: "3.12"
19-
# - image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
20-
# PACKAGE_NAME: "pytorch"
19+
#- image: "nvidia/cuda:12.6.3-devel-ubuntu22.04"
20+
# PACKAGE_NAME: "pytorch"
2121
- PACKAGE_NAME: "lightning"
2222
python_version: "3.12"
2323
exclude: []

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ci:
2323

2424
repos:
2525
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v5.0.0
26+
rev: v6.0.0
2727
hooks:
2828
- id: end-of-file-fixer
2929
- id: trailing-whitespace
@@ -70,7 +70,7 @@ repos:
7070
- id: sphinx-lint
7171

7272
- repo: https://github.com/astral-sh/ruff-pre-commit
73-
rev: v0.12.2
73+
rev: v0.13.3
7474
hooks:
7575
# try to fix what is possible
7676
- id: ruff
@@ -95,8 +95,8 @@ repos:
9595
README.md
9696
)$
9797
98-
- repo: https://github.com/pre-commit/mirrors-prettier
99-
rev: v3.1.0
98+
- repo: https://github.com/JoC0de/pre-commit-prettier
99+
rev: v3.6.2
100100
hooks:
101101
- id: prettier
102102
# https://prettier.io/docs/en/options.html#print-width

0 commit comments

Comments
 (0)