Skip to content

Commit c86b87e

Browse files
akihironittaakihironitta
authored
Merge branch 'master' into bugfix/entry-points-py3.10
2 parents 51945db + d29a552 commit c86b87e

Some content is hidden

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

54 files changed

+611
-278
lines changed

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# the repo. Unless a later match takes precedence,
66
# @global-owner1 and @global-owner2 will be requested for
77
# review when someone opens a pull request.
8-
* @williamfalcon @borda @tchaton @SeanNaren @carmocca @awaelchli @justusschock @kaushikb11 @rohitgr7
8+
* @williamfalcon @borda @tchaton @carmocca @awaelchli @justusschock @kaushikb11 @rohitgr7
99

1010
# CI/CD and configs
1111
/.github/ @borda @carmocca @akihironitta @tchaton
@@ -28,22 +28,22 @@
2828
# Packages
2929
/src/pytorch_lightning/accelerators @williamfalcon @tchaton @SeanNaren @awaelchli @justusschock @kaushikb11
3030
/src/pytorch_lightning/callbacks @williamfalcon @tchaton @carmocca @borda @kaushikb11
31-
/src/pytorch_lightning/core @tchaton @SeanNaren @borda @carmocca @justusschock @kaushikb11
31+
/src/pytorch_lightning/core @tchaton @borda @carmocca @justusschock @kaushikb11
3232
/src/pytorch_lightning/distributed @williamfalcon @tchaton @awaelchli @kaushikb11
3333
/src/pytorch_lightning/lite @tchaton @awaelchli @carmocca
3434
/src/pytorch_lightning/loggers @tchaton @awaelchli @borda
3535
/src/pytorch_lightning/loggers/wandb.py @borisdayma
3636
/src/pytorch_lightning/loggers/neptune.py @shnela @HubertJaworski @pkasprzyk @pitercl @Raalsky @aniezurawski @kamil-kaczmarek
3737
/src/pytorch_lightning/loops @tchaton @awaelchli @justusschock @carmocca
38-
/src/pytorch_lightning/overrides @tchaton @SeanNaren @borda
39-
/src/pytorch_lightning/plugins @tchaton @SeanNaren @awaelchli @justusschock
38+
/src/pytorch_lightning/overrides @tchaton @borda
39+
/src/pytorch_lightning/plugins @tchaton @awaelchli @justusschock
4040
/src/pytorch_lightning/profilers @williamfalcon @tchaton @borda @carmocca
4141
/src/pytorch_lightning/profilers/pytorch.py @nbcsm @guotuofeng
4242
/src/pytorch_lightning/strategies @tchaton @SeanNaren @awaelchli @justusschock @kaushikb11
43-
/src/pytorch_lightning/trainer @williamfalcon @borda @tchaton @SeanNaren @carmocca @awaelchli @justusschock @kaushikb11
44-
/src/pytorch_lightning/trainer/connectors @tchaton @SeanNaren @carmocca @borda
43+
/src/pytorch_lightning/trainer @williamfalcon @borda @tchaton @carmocca @awaelchli @justusschock @kaushikb11
44+
/src/pytorch_lightning/trainer/connectors @tchaton @carmocca @borda
4545
/src/pytorch_lightning/tuner @SkafteNicki @borda @awaelchli
46-
/src/pytorch_lightning/utilities @borda @tchaton @SeanNaren @carmocca
46+
/src/pytorch_lightning/utilities @borda @tchaton @carmocca
4747

4848
/src/lightning_app @tchaton @awaelchli @manskx @hhsecond
4949

‎.github/workflows/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
| workflow name | workflow file | action | accelerator\* | (Python, PyTorch) | OS |
88
| -------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- | ------------------------------------------------ | ------------------- |
9-
| Test full | .github/workflows/ci_test-full.yml | Run all tests except for accelerator-specific, standalone and slow tests. | CPU | (3.7, 1.8), (3.7, 1.11), (3.9, 1.8), (3.9, 1.12) | linux, mac, windows |
9+
| Test full | .github/workflows/ci_test-full.yml | Run all tests except for accelerator-specific, standalone and slow tests. | CPU | (3.7, 1.9), (3.7, 1.12), (3.10, 1.12) | linux, mac, windows |
1010
| Test with Conda | .github/workflows/ci_test-conda.yml | Same as ci_test-full.yml but with dependencies installed with conda. | CPU | (3.8, 1.8), (3.8, 1.9), (3.8, 1.10), (3.9, 1.12) | linux |
1111
| Test slow | .github/workflows/ci_test-slow.yml | Run only slow tests. Slow tests usually need to spawn threads and cannot be speed up or simplified. | CPU | (3.7, 1.8) | linux, mac, windows |
1212
| pytorch-lightning (IPUs) | .azure-pipelines/ipu-tests.yml | Run only IPU-specific tests. | IPU | (3.8, 1.9) | linux |

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: [ubuntu-20.04, windows-2019, macOS-11]
24-
python-version: ["3.7", "3.9"] # minimum, maximum
24+
python-version: ["3.7", "3.10"] # minimum, maximum
2525
requires: ["oldest", "latest"]
2626
release: ["stable"]
27+
exclude:
28+
# There's no distribution of the oldest PyTorch 1.9 for Python 3.10.
29+
# TODO: Remove the exclusion when dropping PyTorch 1.9 support.
30+
- {python-version: "3.10", requires: "oldest"}
2731
# TODO: re-enable RC testing
2832
# include:
2933
# - {os: ubuntu-20.04, python-version: "3.10", requires: "latest", release: "pre"}
@@ -41,7 +45,7 @@ jobs:
4145
id: skip
4246
shell: bash -l {0}
4347
run: |
44-
FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*'
48+
FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*|.github/workflows/ci-pytorch_test-full.yml'
4549
echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt
4650
MATCHES=$(cat changed_files.txt | grep -E $FILTER)
4751
echo $MATCHES

‎.github/workflows/ci-pytorch_test-slow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
id: skip
3737
shell: bash -l {0}
3838
run: |
39-
FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*'
39+
FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*|.github/workflows/ci-pytorch_test-slow.yml'
4040
echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt
4141
MATCHES=$(cat changed_files.txt | grep -E $FILTER)
4242
echo $MATCHES

‎.github/workflows/code-checks.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ jobs:
3232
3333
- name: Install dependencies
3434
run: |
35-
pip install torch==1.11 --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
35+
pip install torch==1.12 --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
3636
python ./requirements/pytorch/adjust-versions.py requirements/pytorch/extra.txt
37+
# todo: adjust requirements for both code-bases
3738
pip install -r requirements/pytorch/devel.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
3839
pip list
3940

‎docs/source-pytorch/api_references.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,20 @@ callbacks
4747
Timer
4848
TQDMProgressBar
4949

50+
cli
51+
-----
52+
53+
.. currentmodule:: pytorch_lightning.cli
54+
55+
.. autosummary::
56+
:toctree: api
57+
:nosignatures:
58+
:template: classtemplate.rst
59+
60+
LightningCLI
61+
LightningArgumentParser
62+
SaveConfigCallback
63+
5064
core
5165
----
5266

‎pyproject.toml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,15 @@ module = [
5252
"pytorch_lightning.callbacks.progress.rich_progress",
5353
"pytorch_lightning.callbacks.quantization",
5454
"pytorch_lightning.core.datamodule",
55-
"pytorch_lightning.core.decorators",
5655
"pytorch_lightning.core.module",
57-
"pytorch_lightning.core.saving",
5856
"pytorch_lightning.demos.boring_classes",
5957
"pytorch_lightning.demos.mnist_datamodule",
6058
"pytorch_lightning.profilers.base",
6159
"pytorch_lightning.profilers.pytorch",
6260
"pytorch_lightning.profilers.simple",
63-
"pytorch_lightning.strategies.ddp",
6461
"pytorch_lightning.strategies.sharded",
6562
"pytorch_lightning.strategies.sharded_spawn",
6663
"pytorch_lightning.trainer.callback_hook",
67-
"pytorch_lightning.trainer.connectors.callback_connector",
6864
"pytorch_lightning.trainer.connectors.data_connector",
6965
"pytorch_lightning.trainer.supporters",
7066
"pytorch_lightning.trainer.trainer",

‎requirements/app/base.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
py
21
lightning-cloud==0.5.0
32
packaging
4-
deepdiff>=5.7.0
3+
deepdiff>=5.7.0, <=5.8.1
54
starsessions
6-
fsspec>=2022.01.0
7-
s3fs>=2022.1.0
5+
fsspec>=2022.01.0, <=2022.7.1
6+
s3fs>=2022.1.0, <=2022.7.1
87
croniter # for now until we found something more robust.
98
traitlets<5.2.0 # Traitlets 5.2.X fails: https://github.com/ipython/traitlets/issues/741

‎requirements/app/cloud.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
starsessions
22
redis>=4.0.0, <=4.2.4
33
docker==5.0.3
4-
setuptools==59.5.0
5-
s3fs==2022.1.0
4+
# setuptools==59.5.0

‎requirements/app/docs.txt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
sphinx>=4.0,<5.0
2-
myst-parser>=0.15
3-
nbsphinx>=0.8.5
2+
myst-parser>=0.15,<0.17
3+
nbsphinx>=0.8.5, <=0.8.9
44
ipython[notebook]
55
ipython_genutils
6-
pandoc>=1.0
7-
docutils>=0.16
8-
sphinxcontrib-fulltoc>=1.0
6+
pandoc>=1.0, <=2.2
7+
docutils>=0.16, <0.19
8+
sphinxcontrib-fulltoc>=1.0, <=1.2.0
99
sphinxcontrib-mockautodoc
1010

11-
https://storage.googleapis.com/grid-packages/lightning-ai-sphinx-theme/build-31-rc1.zip
11+
https://storage.googleapis.com/grid-packages/lightning-ai-sphinx-theme/build-31.3.zip
1212
sphinx-autodoc-typehints>=1.0,<1.15 # v1.15 failing on master (#11405)
13-
sphinx-paramlinks>=0.5.1
14-
sphinx-togglebutton>=0.2
15-
sphinx-copybutton>=0.3
13+
sphinx-paramlinks>=0.5.1, <=0.5.4
14+
sphinx-togglebutton>=0.2, <=0.3.2
15+
sphinx-copybutton>=0.3, <=0.5.0
1616
sphinx-autobuild
17-
typing-extensions # already in `requirements.txt` but the docs CI job does not install it
1817
jinja2>=3.0.0,<3.1.0

0 commit comments

Comments
 (0)