Skip to content

Commit 282ce57

Browse files
authored
Merge pull request #1 from PyTorchLightning/master
Update
2 parents c738b14 + 514cb22 commit 282ce57

File tree

177 files changed

+12512
-8033
lines changed

Some content is hidden

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

177 files changed

+12512
-8033
lines changed

.drone.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ name: torch-GPU
2020

2121
steps:
2222
- name: testing
23-
image: pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.5
23+
image: pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.6
2424

2525
environment:
2626
CODECOV_TOKEN:
@@ -32,6 +32,8 @@ steps:
3232
- pip --version
3333
- nvidia-smi
3434
- pip install -r ./requirements/devel.txt --upgrade-strategy only-if-needed -v --no-cache-dir
35+
# when Image has defined CUDa version we can switch to this package spec "nvidia-dali-cuda${CUDA_VERSION%%.*}0"
36+
- pip install --extra-index-url https://developer.download.nvidia.com/compute/redist nvidia-dali-cuda100 --upgrade-strategy only-if-needed
3537
- pip list
3638
- coverage run --source pytorch_lightning -m pytest pytorch_lightning tests -v --color=yes --durations=25 # --flake8
3739
- python -m pytest benchmarks pl_examples -v --color=yes --maxfail=2 --durations=0 # --flake8
@@ -46,6 +48,7 @@ steps:
4648
trigger:
4749
branch:
4850
- master
51+
- release/*
4952
event:
5053
include:
5154
- push

.github/BECOMING_A_CORE_CONTRIBUTOR.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ different fields contributing!
5353
The first 5 core contributors will fit this profile. Thus if you overlap strongly with experiences and expertise as someone else on the team, you might have to wait until the next set of contributors are added.
5454

5555
#### Summary: Requirements to apply
56-
- Solve 10 Github issues. The goal is to be inline with expectations for solving issues by the last one so you can do them on your own. If not, I might ask you to solve a few more specific ones.
57-
- Do 10 PR reviews. The goal is to be inline with expectations for solving issues by the last one so you can do them on your own. If not, I might ask you to solve a few more specific ones.
56+
The goal is to be inline with expectations for solving issues by the last one so you can do them on your own. If not, I might ask you to solve a few more specific ones.
5857

59-
If you want to be considered, ping me on gitter and start [tracking your progress here](https://docs.google.com/spreadsheets/d/15D58gp8DvI0Z6qbbYVRuaWioiwzafcP58-UlbuO_CMU/edit?usp=sharing).
58+
- Solve 10+ Github issues.
59+
- Create 5+ meaningful PRs which solves some reported issue - bug,
60+
- Perform 10+ PR reviews from other contributors.
61+
62+
If you want to be considered, ping me on [Slack](https://join.slack.com/t/pytorch-lightning/shared_invite/zt-f6bl2l0l-JYMK3tbAgAmGRrlNr00f1A).

.github/CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,11 @@
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 @teddykoker @awaelchli @nateraw @justusschock @tchaton @SeanNaren @ananyahjha93
8+
* @williamfalcon @borda @teddykoker @awaelchli @nateraw @justusschock @tchaton @SeanNaren @ananyahjha93
9+
10+
# Metrics
11+
/pytorch_lightning/metrics/* @teddykoker @ananyahjha93 @justusschock
12+
/tests/metrics/* @teddykoker @ananyahjha93 @justusschock
13+
/docs/source/metrics.rst @teddykoker @ananyahjha93 @justusschock
14+
15+

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
Please include a summary of the change and which issue is fixed.
55
Please also include relevant motivation and context.
66
List any dependencies that are required for this change.
7+
8+
If we didn't discuss your PR in Github issues there's a high chance it will not be merged.
79
-->
810

911
Fixes # (issue)
@@ -20,10 +22,14 @@ Fixes # (issue)
2022
<!-- For CHANGELOG separate each item in unreleased section by a blank line to reduce collisions -->
2123

2224
## PR review
23-
- [ ] Is this pull request ready for review? (if not, please submit in draft mode)
25+
Anyone in the community is free to review the PR once the tests have passed.
26+
Before you start reviewing make sure you have read [Review guidelines](https://github.com/PyTorchLightning/pytorch-lightning/wiki/Review-guidelines). In in short, see following bullet-list:
2427

25-
Anyone in the community is free to review the PR once the tests have passed.
26-
If we didn't discuss your PR in Github issues there's a high chance it will not be merged.
28+
- [ ] Is this pull request ready for review? (if not, please submit in draft mode)
29+
- [ ] Check that all items from **Before submitting** are resolved
30+
- [ ] Make sure the title is self explanatory and the description concisely explains the PR
31+
- [ ] Add labels and milestones (and optionally projects) to the PR so it can be classified; _Bugfixes should be including in bug-fix release milestones (m.f.X) and features should be included in (m.X.b) releases._
32+
2733

2834
## Did you have fun?
2935
Make sure you had fun coding 🙃

.github/workflows/ci_dockers.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: CI build Docker
44
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
55
on: # Trigger the workflow on push or pull request, but only for the master branch
66
push:
7-
branches: [master]
7+
branches: [master, "release/*"] # include release branches like release/1.0.x
88
pull_request:
9-
branches: [master]
9+
branches: [master, "release/*"]
1010

1111
jobs:
1212
build-PL:
@@ -24,7 +24,7 @@ jobs:
2424
# Set up Docker Buildx - to use cache-from and cache-to argument of buildx command
2525
- uses: docker/setup-buildx-action@v1
2626
- name: Build PL Docker
27-
# publish master
27+
# publish master/release
2828
uses: docker/build-push-action@v2
2929
with:
3030
build-args: |
@@ -40,7 +40,7 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
python_version: [3.7]
43-
xla_version: [1.6] # todo: , "nightly"
43+
xla_version: [1.6, "nightly"]
4444
steps:
4545
- name: Checkout
4646
uses: actions/checkout@v2
@@ -49,13 +49,13 @@ jobs:
4949
# Set up Docker Buildx - to use cache-from and cache-to argument of buildx command
5050
- uses: docker/setup-buildx-action@v1
5151
- name: Build XLA Docker
52-
# publish master
52+
# publish master/release
5353
uses: docker/build-push-action@v2
5454
with:
5555
build-args: |
5656
PYTHON_VERSION=${{ matrix.python_version }}
5757
XLA_VERSION=${{ matrix.xla_version }}
58-
cache-from: pytorchlightning/pytorch_lightning:base-xla-cache-py${{ matrix.python_version }}-torch${{ matrix.xla_version }}
58+
cache-from: pytorchlightning/pytorch_lightning:base-xla-py${{ matrix.python_version }}-torch${{ matrix.xla_version }}
5959
file: dockers/base-xla/Dockerfile
6060
push: false
6161
timeout-minutes: 50
@@ -66,8 +66,8 @@ jobs:
6666
fail-fast: false
6767
matrix:
6868
include:
69-
#- python_version: 3.8
70-
# pytorch_version: 1.7 # todo
69+
- python_version: 3.8
70+
pytorch_version: 1.7
7171
- python_version: 3.7
7272
pytorch_version: 1.6
7373
- python_version: 3.6
@@ -86,14 +86,14 @@ jobs:
8686
# Set up Docker Buildx - to use cache-from and cache-to argument of buildx command
8787
- uses: docker/setup-buildx-action@v1
8888
- name: Build CUDA Docker
89-
# publish master
89+
# publish master/release
9090
uses: docker/build-push-action@v2
9191
with:
9292
build-args: |
9393
PYTHON_VERSION=${{ matrix.python_version }}
9494
PYTORCH_VERSION=${{ matrix.pytorch_version }}
9595
CUDA_VERSION=${{ steps.extend.outputs.CUDA }}
96-
cache-from: pytorchlightning/pytorch_lightning:base-cuda-cache-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
96+
cache-from: pytorchlightning/pytorch_lightning:base-cuda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
9797
file: dockers/base-cuda/Dockerfile
9898
push: false
9999
timeout-minutes: 50
@@ -108,8 +108,11 @@ jobs:
108108
pytorch_version: 1.6
109109
- python_version: 3.6
110110
pytorch_version: 1.4
111-
#- python_version: 3.7
112-
# pytorch_version: 1.8 # todo
111+
- python_version: 3.7
112+
pytorch_version: 1.7
113+
# TODO
114+
# - python_version: 3.7
115+
# pytorch_version: 1.8
113116
steps:
114117
- name: Checkout
115118
uses: actions/checkout@v2
@@ -126,15 +129,15 @@ jobs:
126129
# Set up Docker Buildx - to use cache-from and cache-to argument of buildx command
127130
- uses: docker/setup-buildx-action@v1
128131
- name: Build CUDA Docker
129-
# publish master
132+
# publish master/release
130133
uses: docker/build-push-action@v2
131134
with:
132135
build-args: |
133136
PYTHON_VERSION=${{ matrix.python_version }}
134137
PYTORCH_VERSION=${{ matrix.pytorch_version }}
135138
PYTORCH_CHANNEL=${{ steps.extend.outputs.CHANNEL }}
136139
CUDA_VERSION=${{ steps.extend.outputs.CUDA }}
137-
cache-from: pytorchlightning/pytorch_lightning:base-conda-cache-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
140+
cache-from: pytorchlightning/pytorch_lightning:base-conda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
138141
file: dockers/base-conda/Dockerfile
139142
push: false
140143
timeout-minutes: 50

.github/workflows/ci_pkg-install.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Install pkg
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: [master]
6+
branches: [master, "release/*"] # include release branches like release/1.0.x
77
pull_request:
8-
branches: [master]
8+
branches: [master, "release/*"]
99

1010
jobs:
1111

@@ -20,7 +20,7 @@ jobs:
2020
python-version: [3.6, 3.8]
2121

2222
steps:
23-
- uses: actions/checkout@master
23+
- uses: actions/checkout@v2
2424
- uses: actions/setup-python@v2
2525
with:
2626
python-version: ${{ matrix.python-version }}

.github/workflows/ci_test-base.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: CI base testing
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: [master]
6+
branches: [master, "release/*"] # include release branches like release/1.0.x
77
pull_request:
8-
branches: [master]
8+
branches: [master, "release/*"]
99

1010
jobs:
1111
doctest:
@@ -72,7 +72,7 @@ jobs:
7272
coverage run --source pytorch_lightning -m pytest pytorch_lightning -v --color=yes --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
7373
7474
- name: Upload pytest test results
75-
uses: actions/upload-artifact@master
75+
uses: actions/upload-artifact@v2
7676
with:
7777
name: pytest-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}
7878
path: junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml

.github/workflows/ci_test-conda.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: PyTorch & Conda
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: [master]
6+
branches: [master, "release/*"] # include release branches like release/1.0.x
77
pull_request:
8-
branches: [master]
8+
branches: [master, "release/*"]
99

1010
jobs:
1111
conda:
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
# os: [ubuntu-20.04]
1818
python-version: [3.7]
19-
pytorch-version: [1.3, 1.4, 1.5, 1.6] # , 1.7 # todo
19+
pytorch-version: [1.3, 1.4, 1.5, 1.6, 1.7]
2020

2121
# Timeout: https://stackoverflow.com/a/59076067/4521646
2222
timeout-minutes: 35
@@ -46,7 +46,7 @@ jobs:
4646
shell: bash -l {0}
4747

4848
- name: Upload pytest test results
49-
uses: actions/upload-artifact@master
49+
uses: actions/upload-artifact@v2
5050
with:
5151
name: pytest-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}
5252
path: junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml

.github/workflows/ci_test-full.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: CI complete testing
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: [master]
6+
branches: [master, "release/*"] # include release branches like release/1.0.x
77
pull_request:
8-
branches: [master]
8+
branches: [master, "release/*"]
99

1010
jobs:
1111
pytest:
@@ -89,7 +89,7 @@ jobs:
8989
run: |
9090
# python -m pip install --upgrade --user pip
9191
pip install --requirement requirements.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --quiet --upgrade
92-
pip install --requirement ./requirements/devel.txt --quiet --upgrade
92+
pip install --requirement ./requirements/devel.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --quiet --upgrade
9393
python --version
9494
pip --version
9595
pip list
@@ -122,7 +122,7 @@ jobs:
122122
coverage run --source pytorch_lightning -m pytest pytorch_lightning tests pl_examples -v --color=yes --durations=0 --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
123123
124124
- name: Upload pytest test results
125-
uses: actions/upload-artifact@master
125+
uses: actions/upload-artifact@v2
126126
with:
127127
name: pytest-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}
128128
path: junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml

.github/workflows/ci_test-tpu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: TPU tests
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [master, "release/*"] # include release branches like release/1.0.x
66
# TODO: temporal disable TPU testing until we find way how to pass credentials to forked PRs
77
# pull_request:
88
# branches:
@@ -119,7 +119,7 @@ jobs:
119119
# pycobertura show coverage.xml
120120
121121
- name: Upload coverage results
122-
uses: actions/upload-artifact@master
122+
uses: actions/upload-artifact@v2
123123
with:
124124
name: coverage-TPU
125125
path: coverage

0 commit comments

Comments
 (0)