Skip to content

Commit ff53616

Browse files
rohitgr7Bordaakihironittacarmoccadependabot[bot]
authored
Weekly patch release v1.6.5 (#13481)
* update NGC docker (#13136) * update docker * Apply suggestions from code review Co-authored-by: Akihiro Nitta <[email protected]> Co-authored-by: Carlos Mocholí <[email protected]> * Decouple pulling legacy checkpoints from existing GHA workflows and docker files (#13185) * Add pull-legacy-checkpoints action * Replace pulls with the new action and script * Simplify * Merge pull request #13250 from PyTorchLightning/ci/rm-base CI: Remove simple test `ci_test-base.yml` * Update rich requirement from !=10.15.*,<=12.0.0,>=10.2.2 to >=10.2.2,!=10.15.0.a,<13.0.0 in /requirements (#13047) * Update rich requirement in /requirements Updates the requirements on [rich](https://github.com/willmcgugan/rich) to permit the latest version. - [Release notes](https://github.com/willmcgugan/rich/releases) - [Changelog](https://github.com/Textualize/rich/blob/master/CHANGELOG.md) - [Commits](Textualize/rich@v10.2.2...v12.4.1) --- updated-dependencies: - dependency-name: rich dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Fix torch.distributed._sharded_tensor DeprecationWarning (#13261) * update tutorials (#13268) * [BUG] `estimated_stepping_batches` requires distributed comms in `configure_optimizers` for `DeepSpeedStrategy` (#13350) * Update torchmetrics requirement from <=0.7.2,>=0.4.1 to >=0.4.1,<0.9.2 in /requirements (#13275) Update torchmetrics requirement in /requirements Updates the requirements on [torchmetrics](https://github.com/PyTorchLightning/metrics) to permit the latest version. - [Release notes](https://github.com/PyTorchLightning/metrics/releases) - [Changelog](https://github.com/PyTorchLightning/metrics/blob/master/CHANGELOG.md) - [Commits](Lightning-AI/torchmetrics@v0.4.1...v0.9.1) --- updated-dependencies: - dependency-name: torchmetrics dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix mypy errors for model summary utilities (#13384) * rename org Lightning AI * Modified python version check to accommodate for legacy version styles (#13420) Co-authored-by: Carlos Mocholí <[email protected]> (cherry picked from commit b332b66) * Call `set_epoch` for distributed batch samplers (#13396) Co-authored-by: Jirka <[email protected]> Co-authored-by: Rohit Gupta <[email protected]> (cherry picked from commit 2dd332f) * _RICH_AVAILABLE * _FAIRSCALE_AVAILABLE * _BAGUA_AVAILABLE * redefine * chlog spaces * CI: Fix `fatal: unsafe repository` (#13515) * update release date * CI: azure rename * Restore log step during restart (#13467) Co-authored-by: Carlos Mocholí <[email protected]> * remove redundant test * Update CI setup (#13291) * drop mamba * use legacy GPU machines * fix schema check Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Akihiro Nitta <[email protected]> Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Adam J. Stewart <[email protected]> Co-authored-by: Sean Naren <[email protected]> Co-authored-by: Adrian Wälchli <[email protected]> Co-authored-by: Jirka <[email protected]> Co-authored-by: Martino Sorbaro <[email protected]>
1 parent 74b1317 commit ff53616

File tree

72 files changed

+292
-297
lines changed

Some content is hidden

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

72 files changed

+292
-297
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
# Run this script from the project root.
3+
URL="https://pl-public-data.s3.amazonaws.com/legacy/checkpoints.zip"
4+
mkdir -p legacy
5+
# wget is simpler but does not work on Windows
6+
python -c "from urllib.request import urlretrieve; urlretrieve('$URL', 'legacy/checkpoints.zip')"
7+
ls -l legacy/
8+
unzip -o legacy/checkpoints.zip -d legacy/
9+
ls -l legacy/checkpoints/

.azure-pipelines/gpu-benchmark.yml renamed to .azure/gpu-benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- job: benchmarks
2727
timeoutInMinutes: "90"
2828
cancelTimeoutInMinutes: "2"
29-
pool: azure-gpus-spot
29+
pool: azure-jirka-spot
3030
container:
3131
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.11"
3232
options: "--runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all --shm-size=32g"

.azure-pipelines/gpu-tests.yml renamed to .azure/gpu-tests.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# how much time to give 'run always even if cancelled tasks' before stopping them
3030
cancelTimeoutInMinutes: "2"
3131

32-
pool: azure-gpus-spot
32+
pool: azure-jirka-spot
3333

3434
container:
3535
image: $(image)
@@ -69,10 +69,7 @@ jobs:
6969
python requirements/check-avail-extras.py
7070
displayName: 'Env details'
7171
72-
- bash: |
73-
wget https://pl-public-data.s3.amazonaws.com/legacy/checkpoints.zip -P legacy/
74-
unzip -o legacy/checkpoints.zip -d legacy/
75-
ls -l legacy/checkpoints/
72+
- bash: bash .actions/pull_legacy_checkpoints.sh
7673
displayName: 'Get legacy checkpoints'
7774

7875
- bash: |
File renamed without changes.
File renamed without changes.

.github/workflows/ci_dockers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
UBUNTU_VERSION=${{ matrix.ubuntu_version }}
9898
file: dockers/base-cuda/Dockerfile
9999
push: false
100-
timeout-minutes: 75
100+
timeout-minutes: 95
101101

102102
build-Conda:
103103
runs-on: ubuntu-20.04
@@ -123,7 +123,7 @@ jobs:
123123
CUDA_VERSION=${{ matrix.cuda_version }}
124124
file: dockers/base-conda/Dockerfile
125125
push: false
126-
timeout-minutes: 75
126+
timeout-minutes: 95
127127

128128
build-ipu:
129129
runs-on: ubuntu-20.04

.github/workflows/ci_schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- name: Azure Pipelines
2222
env:
2323
SCHEMA_FILE: https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/v1.204.0/service-schema.json
24-
run: check-jsonschema .azure-pipelines/*.yml --schemafile "$SCHEMA_FILE"
24+
run: check-jsonschema .azure/*.yml --schemafile "$SCHEMA_FILE"

.github/workflows/ci_test-base.yml

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

.github/workflows/ci_test-conda.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,27 @@ jobs:
3131
timeout-minutes: 30
3232
steps:
3333
- name: Workaround for https://github.com/actions/checkout/issues/760
34-
run: git config --global --add safe.directory /__w/pytorch-lightning/pytorch-lightning
34+
run: git config --global --add safe.directory /__w/lightning/lightning
3535

3636
- uses: actions/checkout@v2
3737

38-
- name: Update dependencies
38+
- name: Update base dependencies
39+
run: |
40+
conda info
41+
conda list
42+
pip install -r requirements/test.txt
43+
44+
- name: DocTests
45+
run: |
46+
coverage run --source pytorch_lightning -m pytest pytorch_lightning
47+
48+
- name: Update all dependencies
3949
env:
4050
HOROVOD_BUILD_ARCH_FLAGS: "-mfma"
4151
HOROVOD_WITHOUT_MXNET: 1
4252
HOROVOD_WITHOUT_TENSORFLOW: 1
4353
run: |
4454
set -e
45-
conda info
46-
conda list
4755
# adjust versions according installed Torch version
4856
python ./requirements/adjust-versions.py requirements/extra.txt
4957
python ./requirements/adjust-versions.py requirements/examples.txt
@@ -55,17 +63,12 @@ jobs:
5563
# sanity check
5664
python requirements/check-avail-extras.py
5765
58-
- name: Pull checkpoints from S3
59-
working-directory: ./legacy
60-
run: |
61-
# enter legacy and update checkpoints from S3
62-
curl https://pl-public-data.s3.amazonaws.com/legacy/checkpoints.zip --output checkpoints.zip
63-
unzip -o checkpoints.zip
64-
ls -l checkpoints/
66+
- name: Pull legacy checkpoints
67+
run: bash .actions/pull_legacy_checkpoints.sh
6568

66-
- name: Tests
69+
- name: UnitTests
6770
run: |
68-
coverage run --source pytorch_lightning -m pytest --timeout 150 pytorch_lightning tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml
71+
coverage run --source pytorch_lightning -m pytest --timeout 150 tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml
6972
7073
- name: Upload pytest results
7174
uses: actions/upload-artifact@v2

.github/workflows/ci_test-full.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,27 +76,21 @@ jobs:
7676
restore-keys: |
7777
${{ runner.os }}-pip-td${{ env.TIME_PERIOD }}-py${{ matrix.python-version }}-${{ matrix.release }}-${{ matrix.requires }}-
7878
79-
- name: Pull checkpoints from S3
80-
working-directory: ./legacy
81-
run: |
82-
# wget is simpler but does not work on Windows
83-
python -c "from urllib.request import urlretrieve ; urlretrieve('https://pl-public-data.s3.amazonaws.com/legacy/checkpoints.zip', 'checkpoints.zip')"
84-
ls -l .
85-
unzip -o checkpoints.zip
86-
ls -l checkpoints/
79+
- name: Pull legacy checkpoints
80+
run: bash .actions/pull_legacy_checkpoints.sh
8781

8882
- name: Install dependencies
8983
run: |
9084
flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else '')" 2>&1)
9185
url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')" 2>&1)
9286
pip install -r requirements.txt --upgrade $flag --find-links "https://download.pytorch.org/whl/${url}"
93-
# adjust versions according installed Torch version
94-
python ./requirements/adjust-versions.py requirements/examples.txt
95-
pip install -r requirements/examples.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
9687
pip install -r requirements/test.txt --upgrade
9788
pip list
9889
shell: bash
9990

91+
- name: DocTests
92+
run: coverage run --source pytorch_lightning -m pytest pytorch_lightning
93+
10094
- name: Install extra dependencies
10195
run: |
10296
# adjust versions according installed Torch version
@@ -132,13 +126,16 @@ jobs:
132126
run: |
133127
python requirements/check-avail-extras.py
134128
135-
- name: Tests
129+
- name: UnitTests
136130
run: |
137131
# NOTE: do not include coverage report here, see: https://github.com/nedbat/coveragepy/issues/1003
138132
coverage run --source pytorch_lightning -m pytest pytorch_lightning tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.requires }}-${{ matrix.release }}.xml
139133
140134
- name: Examples
141135
run: |
136+
# adjust versions according installed Torch version
137+
python ./requirements/adjust-versions.py requirements/examples.txt
138+
pip install -r requirements/examples.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
142139
python -m pytest pl_examples -v --durations=10
143140
144141
- name: Upload pytest results

0 commit comments

Comments
 (0)