Skip to content

Commit 699b656

Browse files
committed
Revert "Update Lightning App docs (#13537)"
This reverts commit cd31ba3.
1 parent cd31ba3 commit 699b656

File tree

214 files changed

+2526
-7725
lines changed

Some content is hidden

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

214 files changed

+2526
-7725
lines changed

.actions/app/delete_cloud_lightning_apps.py

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

.actions/app/download_frontend.py

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

.azure/gpu-tests.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ trigger:
1212
- "master"
1313
- "release/*"
1414
- "refs/tags/*"
15-
1615
pr:
1716
- "master"
1817
- "release/*"
@@ -38,19 +37,6 @@ jobs:
3837

3938
steps:
4039

41-
- bash: |
42-
CHANGED_FILES=$(git diff --name-status master | awk '{print $2}')
43-
echo $CHANGED_FILES > changed_files.txt
44-
MATCHES=$(cat changed_files.txt | grep -E $FILTER)
45-
echo $MATCHES
46-
if [ -z "$MATCHES" ]; then
47-
echo "Skip"
48-
else
49-
echo "Continue"
50-
fi
51-
52-
displayName: Decide if skipping should be done.
53-
5440
- bash: |
5541
lspci | egrep 'VGA|3D'
5642
whereis nvidia

.azure/hpu-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ trigger:
99
- "master"
1010
- "release/*"
1111
- "refs/tags/*"
12-
1312
pr:
1413
- "master"
1514
- "release/*"

.azure/ipu-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ trigger:
77
- master
88
- release/*
99
- refs/tags/*
10-
1110
pr:
1211
- master
1312
- release/*

.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ trigger:
1414
- "master"
1515
- "release/*"
1616
- "refs/tags/*"
17-
1817
pr:
1918
- "master"
2019
- "release/*"

.github/workflows/ci-app_block.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ jobs:
1313
- name: Get changed files using defaults
1414
id: changed-files
1515
uses: tj-actions/changed-files@v23
16-
1716
- name: List all added files
1817
run: |
1918
for file in ${{ steps.changed-files.outputs.all_changed_and_modified_files }}; do
2019
echo "$file"
2120
done
21+
22+
- name: Block edits in docs/source-app
23+
if: contains(steps.changed-files.outputs.all_changed_and_modified_files, 'docs/source-app')
24+
run: exit 1

.github/workflows/ci-pytorch_test-conda.yml

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ 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
11+
- "tests/tests_app/**" # todo: implement job skip
12+
- "tests/tests_app_examples/**" # todo: implement job skip
13+
- "examples/app_*" # todo: implement job skip
914

1015
concurrency:
1116
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
@@ -29,34 +34,13 @@ jobs:
2934
- {python-version: "3.9", pytorch-version: "1.11"}
3035

3136
timeout-minutes: 30
32-
3337
steps:
3438
- name: Workaround for https://github.com/actions/checkout/issues/760
3539
run: git config --global --add safe.directory /__w/lightning/lightning
3640

3741
- uses: actions/checkout@v2
3842

39-
- name: Get changed files
40-
id: changed-files
41-
uses: tj-actions/[email protected]
42-
43-
- name: Decide if the test should be skipped
44-
id: skip
45-
run: |
46-
FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_'
47-
echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt
48-
MATCHES=$(cat changed_files.txt | grep -E $FILTER)
49-
echo $MATCHES
50-
if [ -z "$MATCHES" ]; then
51-
echo "Skip"
52-
echo "::set-output name=continue::'0'"
53-
else
54-
echo "Continue"
55-
echo "::set-output name=continue::'1'"
56-
fi
57-
5843
- name: Update base dependencies
59-
if: ${{ (steps.skip.outputs.continue == '1') }}
6044
env:
6145
PACKAGE_NAME: pytorch
6246
FREEZE_REQUIREMENTS: 1
@@ -66,12 +50,10 @@ jobs:
6650
pip install -e .[test]
6751
6852
- name: DocTests
69-
if: ${{ (steps.skip.outputs.continue == '1') }}
7053
working-directory: ./src
7154
run: pytest pytorch_lightning --cov=pytorch_lightning
7255

7356
- name: Update all dependencies
74-
if: ${{ (steps.skip.outputs.continue == '1') }}
7557
env:
7658
HOROVOD_BUILD_ARCH_FLAGS: "-mfma"
7759
HOROVOD_WITHOUT_MXNET: 1
@@ -90,11 +72,9 @@ jobs:
9072
python requirements/pytorch/check-avail-extras.py
9173
9274
- name: Pull legacy checkpoints
93-
if: ${{ (steps.skip.outputs.continue == '1') }}
9475
run: bash .actions/pull_legacy_checkpoints.sh
9576

9677
- name: Testing PyTorch
97-
if: ${{ (steps.skip.outputs.continue == '1') }}
9878
working-directory: tests/tests_pytorch
9979
run: coverage run --source pytorch_lightning -m pytest -v --timeout 150 --durations=50 --junitxml=results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml
10080

@@ -106,15 +86,15 @@ jobs:
10686
if: failure()
10787

10888
- name: Statistics
109-
if: ${{ success() && (steps.skip.outputs.continue == '1') }}
89+
if: success()
11090
working-directory: tests/tests_pytorch
11191
run: |
11292
coverage report
11393
coverage xml
11494
11595
- name: Upload coverage to Codecov
11696
uses: codecov/codecov-action@v3
117-
if: ${{ success() && (steps.skip.outputs.continue == '1') }}
97+
if: always()
11898
# see: https://github.com/actions/toolkit/issues/399
11999
continue-on-error: true
120100
with:

.github/workflows/ci-pytorch_test-full.yml

Lines changed: 13 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test PyTorch full
1+
name: Test PyTorch full
22

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
@@ -7,6 +7,11 @@ on: # Trigger the workflow on push or pull request, but only for the master bra
77
pull_request:
88
branches: [master, "release/*"]
99
types: [opened, reopened, ready_for_review, synchronize]
10+
paths-ignore:
11+
- "src/lightning_app/**" # todo: implement job skip
12+
- "tests/tests_app/**" # todo: implement job skip
13+
- "tests/tests_app_examples/**" # todo: implement job skip
14+
- "examples/app_*" # todo: implement job skip
1015

1116
concurrency:
1217
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
@@ -32,67 +37,40 @@ jobs:
3237

3338
steps:
3439
- uses: actions/checkout@v2
35-
36-
- name: Get changed files
37-
id: changed-files
38-
uses: tj-actions/[email protected]
39-
40-
- name: Decide if the test should be skipped
41-
id: skip
42-
run: |
43-
FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_'
44-
echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt
45-
MATCHES=$(cat changed_files.txt | grep -E $FILTER)
46-
echo $MATCHES
47-
if [ -z "$MATCHES" ]; then
48-
echo "Skip"
49-
echo "::set-output name=continue::'0'"
50-
else
51-
echo "Continue"
52-
echo "::set-output name=continue::'1'"
53-
fi
54-
5540
- name: Set up Python ${{ matrix.python-version }}
56-
if: ${{ (steps.skip.outputs.continue == '1') }}
5741
uses: actions/setup-python@v2
5842
with:
5943
python-version: ${{ matrix.python-version }}
6044

6145
- name: Reset caching
62-
if: ${{ (steps.skip.outputs.continue == '1') }}
6346
run: python -c "import time; days = time.time() / 60 / 60 / 24; print(f'TIME_PERIOD=d{int(days / 2) * 2}')" >> $GITHUB_ENV
6447

6548
- name: basic setup
66-
if: ${{ (steps.skip.outputs.continue == '1') }}
6749
run: |
6850
pip --version
6951
pip install -q fire
7052
7153
# Github Actions: Run step on specific OS: https://stackoverflow.com/a/57948488/4521646
7254
- name: Setup macOS
73-
if: ${{ (runner.os == 'macOS') && (steps.skip.outputs.continue == '1') }}
55+
if: runner.os == 'macOS'
7456
run: |
7557
brew install openmpi libuv # Horovod on macOS requires OpenMPI, Gloo not currently supported
76-
7758
- name: Setup Windows
78-
if: ${{ (runner.os == 'windows') && (steps.skip.outputs.continue == '1') }}
59+
if: runner.os == 'windows'
7960
run: |
8061
python .actions/assistant.py requirements_prune_pkgs horovod
81-
8262
- name: Set min. dependencies
83-
if: ${{ (matrix.requires == 'oldest') && (steps.skip.outputs.continue == '1') }}
63+
if: matrix.requires == 'oldest'
8464
run: |
8565
python .actions/assistant.py replace_oldest_ver
8666
8767
# Note: This uses an internal pip API and may not always work
8868
# https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
8969
- name: Get pip cache dir
90-
if: ${{ (steps.skip.outputs.continue == '1') }}
9170
id: pip-cache
9271
run: echo "::set-output name=dir::$(pip cache dir)"
9372

9473
- name: pip cache
95-
if: ${{ (steps.skip.outputs.continue == '1') }}
9674
uses: actions/cache@v2
9775
with:
9876
path: ${{ steps.pip-cache.outputs.dir }}
@@ -101,11 +79,9 @@ jobs:
10179
${{ runner.os }}-pip-td${{ env.TIME_PERIOD }}-py${{ matrix.python-version }}-${{ matrix.release }}-${{ matrix.requires }}-
10280
10381
- name: Pull legacy checkpoints
104-
if: ${{ (steps.skip.outputs.continue == '1') }}
10582
run: bash .actions/pull_legacy_checkpoints.sh
10683

10784
- name: Install dependencies
108-
if: ${{ (steps.skip.outputs.continue == '1') }}
10985
env:
11086
PACKAGE_NAME: pytorch
11187
FREEZE_REQUIREMENTS: 1
@@ -117,12 +93,10 @@ jobs:
11793
shell: bash
11894

11995
- name: DocTests
120-
if: ${{ (steps.skip.outputs.continue == '1') }}
12196
working-directory: ./src
12297
run: pytest pytorch_lightning --cov=pytorch_lightning
12398

12499
- name: Install extra dependencies
125-
if: ${{ (steps.skip.outputs.continue == '1') }}
126100
run: |
127101
# adjust versions according installed Torch version
128102
python ./requirements/pytorch/adjust-versions.py requirements/pytorch/extra.txt
@@ -131,7 +105,7 @@ jobs:
131105
shell: bash
132106

133107
- name: Reinstall Horovod if necessary
134-
if: ${{ (runner.os != 'windows') && (steps.skip.outputs.continue == '1') }}
108+
if: runner.os != 'windows'
135109
env:
136110
HOROVOD_BUILD_ARCH_FLAGS: "-mfma"
137111
HOROVOD_WITHOUT_MXNET: 1
@@ -148,51 +122,46 @@ jobs:
148122
shell: bash
149123

150124
- name: Cache datasets
151-
if: ${{ (steps.skip.outputs.continue == '1') }}
152125
uses: actions/cache@v2
153126
with:
154127
path: Datasets
155128
key: pl-dataset
156129

157130
- name: Sanity check
158-
if: ${{ (steps.skip.outputs.continue == '1') }}
159131
run: python requirements/pytorch/check-avail-extras.py
160132

161133
- name: Testing PyTorch
162-
if: ${{ (steps.skip.outputs.continue == '1') }}
163134
working-directory: tests/tests_pytorch
164135
# NOTE: do not include coverage report here, see: https://github.com/nedbat/coveragepy/issues/1003
165136
run: coverage run --source pytorch_lightning -m pytest -v --durations=50 --junitxml=results-${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.requires }}-${{ matrix.release }}.xml
166137

167138
- name: Upload pytest results
168-
if: ${{ (failure()) && (steps.skip.outputs.continue == '1') }}
169139
uses: actions/upload-artifact@v3
170140
with:
171141
name: unittest-results-${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.requires }}-${{ matrix.release }}
172142
path: tests/tests_pytorch/results-${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.requires }}-${{ matrix.release }}.xml
143+
if: failure()
173144

174145
- name: Prepare Examples
175-
if: ${{ (steps.skip.outputs.continue == '1') }}
176146
run: |
177147
# adjust versions according installed Torch version
178148
python ./requirements/pytorch/adjust-versions.py requirements/pytorch/examples.txt
179149
pip install -r requirements/pytorch/examples.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade
180150
181151
- name: Run Examples
182-
if: ${{ (steps.skip.outputs.continue == '1') }}
183152
working-directory: ./examples
184153
run: python -m pytest test_pl_examples.py -v --durations=10
185154

186155
- name: Statistics
187-
if: ${{ (success()) && (steps.skip.outputs.continue == '1') }}
156+
if: success()
188157
working-directory: tests/tests_pytorch
189158
run: |
190159
coverage report
191160
coverage xml
192161
193162
- name: Upload coverage to Codecov
194163
uses: codecov/codecov-action@v3
195-
if: ${{ (always()) && (steps.skip.outputs.continue == '1') }}
164+
if: always()
196165
# see: https://github.com/actions/toolkit/issues/399
197166
continue-on-error: true
198167
with:

0 commit comments

Comments
 (0)