Skip to content

Commit 105ee0a

Browse files
authored
Merge branch 'master' into sync_dist
2 parents e89ea8d + 9596fab commit 105ee0a

File tree

85 files changed

+831
-537
lines changed

Some content is hidden

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

85 files changed

+831
-537
lines changed

.azure/hpu-tests.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,44 @@ jobs:
2020
timeoutInMinutes: "10"
2121
# how much time to give 'run always even if cancelled tasks' before stopping them
2222
cancelTimeoutInMinutes: "2"
23-
pool: intel-hpus
23+
pool: habana-gaudi-hpus
24+
container:
25+
image: "vault.habana.ai/gaudi-docker/1.5.0/ubuntu20.04/habanalabs/pytorch-installer-1.11.0:latest"
26+
options: "--runtime=habana -e HABANA_VISIBLE_DEVICES=all -e OMPI_MCA_btl_vader_single_copy_mechanism=none --cap-add=sys_nice --ipc=host --shm-size=4g --name cd-container -v /usr/bin/docker:/tmp/docker:ro"
2427
workspace:
2528
clean: all
2629

2730
steps:
31+
- script: |
32+
/tmp/docker exec -t -u 0 cd-container \
33+
sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confold" -y install sudo"
34+
displayName: 'Install Sudo in container (thanks Microsoft!)'
35+
2836
- bash: |
29-
apt-get install -y hwinfo
37+
sudo apt-get install -y hwinfo
3038
hwinfo --short
39+
python --version
40+
sudo pip install pip -U
3141
displayName: 'Instance HW info'
3242
3343
- bash: |
34-
pip install -e .[extra] -r requirements/pytorch/test.txt
44+
set -e
45+
pip --version
46+
sudo pip uninstall -y lightning pytorch-lightning
47+
pip install fire
48+
python .actions/assistant.py requirements-prune-pkgs torch,torchvision,torchtext
49+
pip install ".[extra,test]"
50+
pip list
3551
env:
3652
PACKAGE_NAME: pytorch
3753
FREEZE_REQUIREMENTS: 1
3854
displayName: 'Install dependencies'
3955
56+
- bash: |
57+
hl-smi -L
58+
lsmod | grep habanalabs
59+
displayName: 'Check the driver status'
60+
4061
- bash: |
4162
python -m pytest -sv accelerators/test_hpu.py --forked --junitxml=hpu1_test-results.xml
4263
workingDirectory: tests/tests_pytorch

.github/gatekeeper-config_app.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
approvals:
2-
# check will fail if there is no approval
3-
minimum: 1
42
groups:
53
- name: 'Lightning Apps'
4+
minimum: 1
65
from:
76
- alecmerdler
87
- awaelchli

.github/gatekeeper-config_pytorch.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
approvals:
2-
# check will fail if there is no approval
3-
minimum: 1
42
groups:
53
- name: 'PyTorch Lightning'
4+
minimum: 1
65
from:
76
- awaelchli
87
- Borda

.github/labeler.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
11
app:
2-
- any: ['src/lightning*/**/*', 'tests/tests_app*/**/*', 'docs/source-app/**/*', 'requirements/app/*']
2+
- any: ['src/lightning/**/*']
3+
all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
4+
- any: ['src/lightning_app/**/*']
5+
all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
6+
- any: ['tests/tests_app/**/*']
7+
all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
8+
- any: ['tests/tests_app_examples/**/*']
9+
all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
10+
- any: ['examples/app_*/**/*']
11+
all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
12+
- any: ['docs/source-app/**/*']
13+
all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
14+
- any: ['requirements/app/*']
315
all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
416

517
pl:
6-
- any: ['src/pytorch_lightning/**/*', 'tests/tests_pytorch/**/*', 'docs/source-pytorch/**/*', 'requirements/pytorch/*']
7-
all: ['!src/lightning*/**/*', '!tests/tests_app*/**/*', '!docs/source-app/**/*', '!requirements/app/*']
18+
- any: ['src/pytorch_lightning/**/*']
19+
all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
20+
- any: ['examples/*pl_*/**/*']
21+
all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
22+
- any: ['tests/tests_pytorch/**/*']
23+
all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
24+
- any: ['docs/source-pytorch/**/*']
25+
all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
26+
- any: ['requirements/pytorch/*']
27+
all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']

.github/workflows/ci-app_cloud_e2e_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: cloud-testing
44

55
on: # Trigger the workflow on push or pull request, but only for the master branch
66
push:
7-
branches:
8-
- "master"
7+
branches: [master, "release/*"]
98
pull_request:
9+
branches: [master, "release/*"]
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}

.github/workflows/ci-app_examples.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@ name: Test App - examples
33
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
44
on: # Trigger the workflow on push or pull request, but only for the master branch
55
push:
6-
branches:
7-
- "master"
6+
branches: [master, "release/*"]
87
pull_request:
9-
paths:
10-
- "src/lightning_app/**"
11-
- "tests/tests_app_examples/**"
12-
- "requirements/app/**"
13-
- "setup.py"
8+
branches: [master, "release/*"]
149

1510
concurrency:
1611
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}

.github/workflows/ci-app_tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Test App
33
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
44
on: # Trigger the workflow on push or pull request, but only for the master branch
55
push:
6-
branches:
7-
- "master"
6+
branches: [master, "release/*"]
87
pull_request:
98
paths:
109
- "src/lightning_app/**"

.github/workflows/ci_pkg-install.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on: # Trigger the workflow on push or pull request, but only for the master bra
66
branches: [master, "release/*"]
77
pull_request:
88
branches: [master, "release/*"]
9-
paths-ignore:
10-
- "src/lightning_app/**" # todo: implement job skip
119

1210
concurrency:
1311
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}

.github/workflows/ci_pr-gatekeeper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
patterns = ('docs/source-${{ matrix.pkg }}', 'src/lightning_${{ matrix.pkg }}', 'tests/tests_${{ matrix.pkg }}')
2828
changed = any(p in "${{steps.changed-files.outputs.all_changed_and_modified_files}}" for p in patterns)
29-
print('::set-output name=files::' + int(changed))
29+
print(f'::set-output name=files::{int(changed)}')
3030
shell: python
3131
- uses: octodemo/pr-gatekeeper@main
3232
if: steps.touched.outputs.files == 1

.github/workflows/cicd-pytorch_dockers.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ on:
88
paths:
99
- "dockers/**"
1010
- "!dockers/README.md"
11-
- "requirements/*"
11+
- "requirements/**"
1212
- "requirements.txt"
1313
- "environment.yml"
1414
- ".github/workflows/*docker*.yml"
15-
- ".github/workflows/events-nightly.yml"
1615
- "setup.py"
1716
schedule:
1817
- cron: "0 0 * * *" # at the end of every day
@@ -226,7 +225,7 @@ jobs:
226225
build-args: |
227226
DIST=latest
228227
GAUDI_VERSION=${{ matrix.gaudi_version }}
229-
PYTORCH_VERSION=${{ matrix.pytorch_version }}
228+
PYTORCH_INSTALLER_VERSION=${{ matrix.pytorch_version }}
230229
file: dockers/ci-runner-hpu/Dockerfile
231230
push: ${{ env.PUSH_TO_HUB }}
232231
tags: pytorchlightning/pytorch_lightning:hpu-ci-runner-gaudi${{ matrix.gaudi_version }}

0 commit comments

Comments
 (0)