Skip to content

Commit 695e220

Browse files
authored
Merge branch 'master' into req/freeze_major
2 parents 350abd4 + e5395de commit 695e220

File tree

70 files changed

+830
-580
lines changed

Some content is hidden

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

70 files changed

+830
-580
lines changed

.azure/app-cloud-e2e.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,24 @@ trigger:
1212
- "master"
1313
- "release/*"
1414
- "refs/tags/*"
15+
paths:
16+
include:
17+
- ".azure/app-cloud-e2e.yml"
18+
- "requirements/app/**"
19+
- "src/lightning_app/**"
20+
- "examples/app_*"
1521

1622
pr:
17-
- "master"
18-
- "release/*"
23+
branches:
24+
include:
25+
- "master"
26+
- "release/*"
27+
paths:
28+
include:
29+
- ".azure/app-cloud-e2e.yml"
30+
- "requirements/app/**"
31+
- "src/lightning_app/**"
32+
- "examples/app_*"
1933

2034
# variables are automatically exported as environment variables so this will override pip's default cache dir
2135
variables:

.azure/gpu-tests-lite.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,22 @@ trigger:
1818
- "requirements/lite/**"
1919
- "src/lightning_lite/**"
2020
- "tests/tests_lite/**"
21+
- "tests/tests_pytorch/run_standalone_tests.sh"
22+
- "tests/tests_lite/run_standalone_tests.sh" # a symlink to the one above
2123

2224
pr:
23-
- "master"
24-
- "release/*"
25+
branches:
26+
include:
27+
- "master"
28+
- "release/*"
29+
paths:
30+
include:
31+
- ".azure/gpu-tests-lite.yml"
32+
- "requirements/lite/**"
33+
- "src/lightning_lite/**"
34+
- "tests/tests_lite/**"
35+
- "tests/tests_pytorch/run_standalone_tests.sh"
36+
- "tests/tests_lite/run_standalone_tests.sh" # a symlink to the one above
2537

2638
jobs:
2739
- job: testing
@@ -78,7 +90,6 @@ jobs:
7890
- bash: bash run_standalone_tests.sh
7991
workingDirectory: tests/tests_lite
8092
env:
81-
PL_USE_MOCKED_MNIST: "1"
8293
PL_RUN_CUDA_TESTS: "1"
8394
PL_STANDALONE_TESTS_SOURCE: "lightning_lite"
8495
displayName: 'Testing: Lite standalone tests'

.azure/hpu-tests.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,26 @@ trigger:
99
- "master"
1010
- "release/*"
1111
- "refs/tags/*"
12+
paths:
13+
include:
14+
- ".azure/hpu-tests.yml"
15+
- "examples/pl_hpu/mnist_sample.py"
16+
- "requirements/pytorch/**"
17+
- "src/pytorch_lightning/**"
18+
- "tests/tests_pytorch/**"
1219

1320
pr:
14-
- "master"
15-
- "release/*"
21+
branches:
22+
include:
23+
- "master"
24+
- "release/*"
25+
paths:
26+
include:
27+
- ".azure/hpu-tests.yml"
28+
- "examples/pl_hpu/mnist_sample.py"
29+
- "requirements/pytorch/**"
30+
- "src/pytorch_lightning/**"
31+
- "tests/tests_pytorch/**"
1632

1733
jobs:
1834
- job: testing

.github/actions/pkg-check/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ inputs:
55
pkg-name:
66
description: package name inside lightning.*
77
required: true
8+
nb-dirs:
9+
description: nb of packages in the wrap/distribution
10+
required: false
11+
default: "1"
812

913
runs:
1014
using: "composite"
@@ -54,7 +58,7 @@ runs:
5458
# list folders without ending .egg-info
5559
dirs = [d for d in glob.glob(os.path.join("*", "src", "*")) if not d.endswith(".egg-info")]
5660
print(dirs)
57-
assert len(dirs) == 1
61+
assert len(dirs) == ${{ inputs.nb-dirs }}
5862
# cleaning
5963
shutil.rmtree(pathlib.Path(dirs[0]).parent.parent)
6064
shell: python

.github/file-filters.yml

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

.github/workflows/ci-app-cloud-e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- commands_and_api
3636
timeout-minutes: 35
3737
steps:
38-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v3
3939
- uses: actions/setup-python@v4
4040
with:
4141
python-version: "3.8"

.github/workflows/ci-app-examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
timeout-minutes: 10
3434

3535
steps:
36-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v3
3737
- name: Set up Python ${{ matrix.python-version }}
3838
uses: actions/setup-python@v4
3939
with:

.github/workflows/ci-app-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
timeout-minutes: 20
3131

3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v3
3434
- name: Set up Python ${{ matrix.python-version }}
3535
uses: actions/setup-python@v4
3636
with:

.github/workflows/ci-lite-test-full.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
timeout-minutes: 40
3939

4040
steps:
41-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v3
4242

4343
- name: Set up Python ${{ matrix.python-version }}
4444
uses: actions/setup-python@v4

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
python-version: [3.8] # , 3.9
3939

4040
steps:
41-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v3
4242
- uses: actions/setup-python@v4
4343
with:
4444
python-version: ${{ matrix.python-version }}
@@ -49,9 +49,11 @@ jobs:
4949
path: pypi
5050
- run: ls -lh pypi/
5151

52+
- run: python -c "print('NB_DIRS=' + str(2 if '${{ matrix.pkg }}' == 'pytorch' else 1))" >> $GITHUB_ENV
5253
- uses: ./.github/actions/pkg-check
5354
with:
5455
pkg-name: ${{ matrix.pkg }}
56+
nb-dirs: ${{ env.NB_DIRS }}
5557

5658
- uses: actions/upload-artifact@v3
5759
with:
@@ -72,7 +74,7 @@ jobs:
7274
python-version: [3.8] # , 3.9
7375

7476
steps:
75-
- uses: actions/checkout@v2
77+
- uses: actions/checkout@v3
7678
- uses: actions/setup-python@v4
7779
with:
7880
python-version: ${{ matrix.python-version }}
@@ -104,7 +106,7 @@ jobs:
104106
python-version: [3.8] # , 3.9
105107

106108
steps:
107-
- uses: actions/checkout@v2
109+
- uses: actions/checkout@v3
108110
- uses: actions/setup-python@v4
109111
with:
110112
python-version: ${{ matrix.python-version }}

0 commit comments

Comments
 (0)