Skip to content

Commit d13e52d

Browse files
GdoongMathewGdoongMathew
authored
Merge branch 'master' into feat/to_tensorrt
2 parents dcac65d + 33de230 commit d13e52d

33 files changed

+149
-99
lines changed

‎.actions/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
jsonargparse >=4.16.0, <=4.35.0
1+
jsonargparse
22
requests
33
packaging

‎.azure/gpu-benchmarks.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,13 @@ jobs:
7676
displayName: "Image info & NVIDIA"
7777
7878
- bash: |
79-
pip install -e .[dev] --find-links ${TORCH_URL}
80-
pip install setuptools==75.6.0 jsonargparse==4.35.0
79+
pip install -U -q -r .actions/requirements.txt
80+
python .actions/assistant.py copy_replace_imports --source_dir="./tests" \
81+
--source_import="lightning.fabric,lightning.pytorch" \
82+
--target_import="lightning_fabric,pytorch_lightning"
83+
displayName: "Adjust tests"
84+
85+
- bash: pip install -e .[dev] --find-links ${TORCH_URL}
8186
env:
8287
FREEZE_REQUIREMENTS: "1"
8388
displayName: "Install package"
@@ -88,13 +93,6 @@ jobs:
8893
python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu == 2, f'GPU: {mgpu}'"
8994
displayName: "Env details"
9095
91-
- bash: |
92-
pip install -q -r .actions/requirements.txt
93-
python .actions/assistant.py copy_replace_imports --source_dir="./tests" \
94-
--source_import="lightning.fabric,lightning.pytorch" \
95-
--target_import="lightning_fabric,pytorch_lightning"
96-
displayName: "Adjust tests"
97-
9896
- bash: python -m pytest parity_$(PACKAGE_NAME) -v --durations=0
9997
env:
10098
PL_RUNNING_BENCHMARKS: "1"

‎.azure/gpu-tests-fabric.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ jobs:
100100
pip list
101101
displayName: "Image info & NVIDIA"
102102
103+
- bash: |
104+
python .actions/assistant.py replace_oldest_ver
105+
pip install "cython<3.0" wheel # for compatibility
106+
condition: contains(variables['Agent.JobName'], 'oldest')
107+
displayName: "setting oldest dependencies"
108+
103109
- bash: |
104110
PYTORCH_VERSION=$(python -c "import torch; print(torch.__version__.split('+')[0])")
105111
pip install -q wget packaging
@@ -109,11 +115,22 @@ jobs:
109115
done
110116
displayName: "Adjust dependencies"
111117
118+
- bash: |
119+
pip install -U -q -r .actions/requirements.txt
120+
python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_fabric" \
121+
--source_import="lightning.fabric" \
122+
--target_import="lightning_fabric"
123+
python .actions/assistant.py copy_replace_imports --source_dir="./examples/fabric" \
124+
--source_import="lightning.fabric" \
125+
--target_import="lightning_fabric"
126+
# without succeeded this could run even if the job has already failed
127+
condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
128+
displayName: "Adjust tests & examples"
129+
112130
- bash: |
113131
set -e
114132
extra=$(python -c "print({'lightning': 'fabric-'}.get('$(PACKAGE_NAME)', ''))")
115-
pip install -e ".[${extra}dev]" pytest-timeout -U --extra-index-url="${TORCH_URL}"
116-
pip install setuptools==75.6.0 jsonargparse==4.35.0
133+
pip install -e ".[${extra}dev]" -U --extra-index-url="${TORCH_URL}"
117134
displayName: "Install package & dependencies"
118135
119136
- bash: |
@@ -130,18 +147,6 @@ jobs:
130147
condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
131148
displayName: "Testing: Fabric doctests"
132149

133-
- bash: |
134-
pip install -q -r .actions/requirements.txt
135-
python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_fabric" \
136-
--source_import="lightning.fabric" \
137-
--target_import="lightning_fabric"
138-
python .actions/assistant.py copy_replace_imports --source_dir="./examples/fabric" \
139-
--source_import="lightning.fabric" \
140-
--target_import="lightning_fabric"
141-
# without succeeded this could run even if the job has already failed
142-
condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
143-
displayName: "Adjust tests & examples"
144-
145150
- bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest tests_fabric/ -v --durations=50
146151
workingDirectory: tests/
147152
displayName: "Testing: fabric standard"

‎.azure/gpu-tests-pytorch.yml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ jobs:
104104
pip list
105105
displayName: "Image info & NVIDIA"
106106
107+
- bash: |
108+
python .actions/assistant.py replace_oldest_ver
109+
pip install "cython<3.0" wheel # for compatibility
110+
condition: contains(variables['Agent.JobName'], 'oldest')
111+
displayName: "setting oldest dependencies"
112+
107113
- bash: |
108114
PYTORCH_VERSION=$(python -c "import torch; print(torch.__version__.split('+')[0])")
109115
pip install -q wget packaging
@@ -113,10 +119,22 @@ jobs:
113119
done
114120
displayName: "Adjust dependencies"
115121
122+
- bash: |
123+
pip install -U -q -r .actions/requirements.txt
124+
python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_pytorch" \
125+
--source_import="lightning.fabric,lightning.pytorch" \
126+
--target_import="lightning_fabric,pytorch_lightning"
127+
python .actions/assistant.py copy_replace_imports --source_dir="./examples/pytorch/basics" \
128+
--source_import="lightning.fabric,lightning.pytorch" \
129+
--target_import="lightning_fabric,pytorch_lightning"
130+
# without succeeded this could run even if the job has already failed
131+
condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
132+
displayName: "Adjust tests & examples"
133+
116134
- bash: |
117135
set -e
118136
extra=$(python -c "print({'lightning': 'pytorch-'}.get('$(PACKAGE_NAME)', ''))")
119-
pip install -e ".[${extra}dev]" pytest-timeout -U --extra-index-url="${TORCH_URL}"
137+
pip install -e ".[${extra}dev]" -U --extra-index-url="${TORCH_URL}"
120138
displayName: "Install package & dependencies"
121139
122140
- bash: pip uninstall -y lightning
@@ -143,17 +161,6 @@ jobs:
143161
condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
144162
displayName: "Testing: PyTorch doctests"
145163

146-
- bash: |
147-
python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_pytorch" \
148-
--source_import="lightning.fabric,lightning.pytorch" \
149-
--target_import="lightning_fabric,pytorch_lightning"
150-
python .actions/assistant.py copy_replace_imports --source_dir="./examples/pytorch/basics" \
151-
--source_import="lightning.fabric,lightning.pytorch" \
152-
--target_import="lightning_fabric,pytorch_lightning"
153-
# without succeeded this could run even if the job has already failed
154-
condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
155-
displayName: "Adjust tests & examples"
156-
157164
- bash: |
158165
bash .actions/pull_legacy_checkpoints.sh
159166
cd tests/legacy

‎.github/checkgroup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ subprojects:
7171
# paths:
7272
# # tpu CI availability is very limited, so we only require tpu tests
7373
# # to pass when their configurations are modified
74-
# - ".github/workflows/tpu-tests.yml"
74+
# - ".github/workflows/tpu-tests.yml.disabled"
7575
# - "tests/tests_pytorch/run_tpu_tests.sh"
7676
# checks:
7777
# - "test-on-tpus (pytorch, pjrt, v4-8)"
@@ -181,7 +181,7 @@ subprojects:
181181
# paths:
182182
# # tpu CI availability is very limited, so we only require tpu tests
183183
# # to pass when their configurations are modified
184-
# - ".github/workflows/tpu-tests.yml"
184+
# - ".github/workflows/tpu-tests.yml.disabled"
185185
# - "tests/tests_fabric/run_tpu_tests.sh"
186186
# checks:
187187
# - "test-on-tpus (pytorch, pjrt, v4-8)"

‎.github/workflows/_legacy-checkpoints.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,11 @@ jobs:
149149
title: Adding test for legacy checkpoint created with ${{ env.PL_VERSION }}
150150
committer: GitHub <[email protected]>
151151
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
152-
commit-message: "adding `${{ env.PL_VERSION }}` checkpoint"
153-
body: "**This is automated addition of created checkpoints with the latest `lightning` release!**"
152+
body: "**This is automated addition of created checkpoint with the latest `${{ env.PL_VERSION }}` `lightning` release!**"
154153
delete-branch: true
155154
token: ${{ secrets.PAT_GHOST }}
156155
labels: |
157156
checkpointing
158157
tests
159158
pl
160159
assignees: borda
161-
reviewers: borda

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
run: |
168168
echo $GITHUB_RUN_ID
169169
python -m coverage run --source ${{ env.COVERAGE_SCOPE }} \
170-
-m pytest -v --timeout=30 --durations=50 --random-order-seed=$GITHUB_RUN_ID \
170+
-m pytest -v --timeout=60 --durations=50 --random-order-seed=$GITHUB_RUN_ID \
171171
--junitxml=junit.xml -o junit_family=legacy # NOTE: for Codecov's test results
172172
173173
- name: Statistics

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
run: |
197197
echo $GITHUB_RUN_ID
198198
python -m coverage run --source ${{ env.COVERAGE_SCOPE }} \
199-
-m pytest . -v --timeout=60 --durations=50 --random-order-seed=$GITHUB_RUN_ID \
199+
-m pytest . -v --timeout=90 --durations=50 --random-order-seed=$GITHUB_RUN_ID \
200200
--junitxml=junit.xml -o junit_family=legacy # NOTE: for Codecov's test results
201201
202202
- name: Statistics

‎.github/workflows/docs-tutorials.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
5656
token: ${{ secrets.PAT_GHOST }}
5757
add-paths: _notebooks
58-
commit-message: "update tutorials to `${{ env.SHA_LATEST }}`"
5958
branch: "docs/update-tutorials"
6059
# Delete the branch when closing pull requests, and when undeleted after merging.
6160
delete-branch: true
@@ -72,4 +71,3 @@ jobs:
7271
docs
7372
examples
7473
assignees: borda
75-
reviewers: borda

‎.github/workflows/tpu-tests.yml renamed to ‎.github/workflows/tpu-tests.yml.disabled

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
gcloud compute tpus tpu-vm list
166166

167167
- name: Upload coverage to Codecov
168-
uses: codecov/codecov-action@v4
168+
uses: codecov/codecov-action@v5
169169
continue-on-error: true
170170
with:
171171
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)