Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync 1.1.4 >> feature 1.2 [full merge, no squash] #5483

Merged
merged 27 commits into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
edfd6b2
Update sharded install to latest fairscale release, add reasoning why…
SeanNaren Jan 6, 2021
e1a4c2e
docker: run ci only docker related files are changed (#5203)
Jan 6, 2021
fb6c33a
Fix pre-commit trailing-whitespace and end-of-file-fixer hooks. (#5387)
arnaudgelas Jan 7, 2021
9dd0402
tests for legacy checkpoints (#5223)
Borda Jan 8, 2021
26e7e58
Add 1.1.4 section to CHANGELOG (#5378)
carmocca Jan 6, 2021
f2f4a49
[bug-fix] Call transfer_batch_to_device in DDPlugin (#5195)
tchaton Jan 8, 2021
f422d93
[bugfix] Logging only on `not should_accumulate()` during training (#…
tchaton Jan 9, 2021
64b701f
GH action - label conflicts (#5450)
Borda Jan 10, 2021
defbeec
fix typos in validation_step and test_step docs (#5438)
thepooons Jan 11, 2021
fd49795
GH action - auto-update PRs (#5451)
Borda Jan 11, 2021
b4d1129
Add automatic optimization property setter to lightning module (#5169)
ananthsub Jan 11, 2021
ee934de
populate some more legacy checkpoints (#5457)
Borda Jan 12, 2021
0c370ad
[BUG] Check environ before selecting a seed to prevent warning messag…
SeanNaren Jan 12, 2021
cccbcc5
[docs] Add ananthsub to core (#5476)
ananthsub Jan 12, 2021
0435e23
deprecate enable_pl_optimizer as it is not restored properly (#5244)
tchaton Jan 8, 2021
127e041
Fix merge issue
Jan 12, 2021
8e75f2c
bugfix: Resolve interpolation bug with Hydra (#5406)
tchaton Jan 9, 2021
a80e37b
Add hydra experimental to correct location
Jan 12, 2021
8db2b2d
update nightly & upgrade Twine (#5458)
Borda Jan 12, 2021
bee7d31
ci: update recurent events (#5480)
Borda Jan 12, 2021
df3c170
Fix imports & issues in lightning optimizer refactor merge
Jan 12, 2021
17cf6b4
drop duplicated func _module_available
Borda Jan 12, 2021
f33db67
Fix merge _module_available
Jan 13, 2021
942488b
update CHANGELOG.md (#5482)
SeanNaren Jan 12, 2021
53b0ae4
fix imports / isort / flake8
Borda Jan 23, 2021
2b71acc
fix logging test
Borda Jan 24, 2021
4e7e1df
chlog
Borda Jan 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ steps:
# when Image has defined CUDa version we can switch to this package spec "nvidia-dali-cuda${CUDA_VERSION%%.*}0"
- pip install --extra-index-url https://developer.download.nvidia.com/compute/redist nvidia-dali-cuda100 --upgrade-strategy only-if-needed
- pip list
# todo: remove unzip install after new nigtly docker is created
- apt-get update -qq
- apt-get install -y --no-install-recommends unzip
# get legacy checkpoints
- wget https://pl-public-data.s3.amazonaws.com/legacy/checkpoints.zip -P legacy/
- unzip -o legacy/checkpoints.zip -d legacy/
- ls -l legacy/checkpoints/
# testing...
- python -m coverage run --source pytorch_lightning -m pytest pytorch_lightning tests -v --durations=25 # --flake8
# Running special tests
- sh tests/special_tests.sh
Expand Down
18 changes: 9 additions & 9 deletions .github/BECOMING_A_CORE_CONTRIBUTOR.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# How to become a core contributor

Thanks for your interest in joining the Lightning team! We’re a rapidly growing project which is poised to become the go-to framework for DL researchers!
We're currently recruiting for a team of 5 core maintainers.
Thanks for your interest in joining the Lightning team! We’re a rapidly growing project which is poised to become the go-to framework for DL researchers!
We're currently recruiting for a team of 5 core maintainers.

As a core maintainer you will have a strong say in the direction of the project. Big changes will require a majority of maintainers to agree.

### Code of conduct
### Code of conduct
First and foremost, you'll be evaluated against [these core values](https://github.com/PyTorchLightning/pytorch-lightning/blob/master/.github/CONTRIBUTING.md). Any code we commit or feature we add needs to align with those core values.

### The bar for joining the team
### The bar for joining the team
Lightning is being used to solve really hard problems at the top AI labs in the world. As such, the bar for adding team members is extremely high. Candidates must have solid engineering skills, have a good eye for user experience, and must be a power user of Lightning and PyTorch.

With that said, the Lightning team will be diverse and a reflection of an inclusive AI community. You don't have to be an engineer to contribute! Scientists with great usability intuition and PyTorch ninja skills are welcomed!
Expand Down Expand Up @@ -36,26 +36,26 @@ Pleasant/helpful tone.
- Code is NOT overly engineered or hard to read
- Ask yourself, could a non-engineer understand what’s happening here?
- Make sure new tests are written
- Is this NECESSARY for Lightning? There are some PRs which are just purely about adding engineering complexity which have no place in Lightning.
- Is this NECESSARY for Lightning? There are some PRs which are just purely about adding engineering complexity which have no place in Lightning.
Guidance
- Some other PRs are for people who are wanting to get involved and add something unnecessary. We do want their help though! So don’t approve the PR, but direct them to a Github issue that they might be interested in helping with instead!
- To be considered for core contributor, please review 10 PRs and help the authors land it on master. Once you've finished the review, ping me
- To be considered for core contributor, please review 10 PRs and help the authors land it on master. Once you've finished the review, ping me
for a sanity check. At the end of 10 PRs if your PR reviews are inline with expectations described above, then you can merge PRs on your own going forward,
otherwise we'll do a few more until we're both comfortable :)

#### Project directions
There are some big decisions which the project must make. For these I expect core contributors to have something meaningful to add if it’s their area of expertise.

#### Diversity
Lightning should reflect the broader community it serves. As such we should have scientists/researchers from
different fields contributing!
Lightning should reflect the broader community it serves. As such we should have scientists/researchers from
different fields contributing!

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.

#### Summary: Requirements to apply
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.

- Solve 10+ Github issues.
- Solve 10+ Github issues.
- Create 5+ meaningful PRs which solves some reported issue - bug,
- Perform 10+ PR reviews from other contributors.

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ assignees: ''
For typos and doc fixes, please go ahead and:

1. Create an issue.
2. Fix the typo.
2. Fix the typo.
3. Submit a PR.

Thanks!
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/how-to-question.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ assignees: ''

## ❓ Questions and Help

### Before asking:
### Before asking:
1. Try to find answers to your questions in [the Lightning Forum!](https://forums.pytorchlightning.ai/)
2. Search for similar [issues](https://github.com/PyTorchLightning/pytorch-lightning/issues).
3. Search the [docs](https://pytorch-lightning.readthedocs.io/en/latest/).
2. Search for similar [issues](https://github.com/PyTorchLightning/pytorch-lightning/issues).
3. Search the [docs](https://pytorch-lightning.readthedocs.io/en/latest/).

<!-- If you still can't find what you need: -->

#### What is your question?

#### Code

<!-- Please paste a code snippet if your question requires it! -->
<!-- Please paste a code snippet if your question requires it! -->

#### What have you tried?

Expand Down
12 changes: 0 additions & 12 deletions .github/prepare-nightly_pkg-name.py

This file was deleted.

17 changes: 12 additions & 5 deletions .github/workflows/ci_dockers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,21 @@ name: CI build Docker
# https://www.docker.com/blog/first-docker-github-action-is-here
# https://github.com/docker/build-push-action
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
on: # Trigger the workflow on push or pull request, but only for the master branch
on: # Trigger the workflow on push or pull request, but only for the master branch
push:
branches: [master, "release/*"] # include release branches like release/1.0.x
branches: [master, "release/*"] # include release branches like release/1.0.x
pull_request:
branches: [master, "release/*"]
paths:
- "dockers/**"
- "!dockers/README.md"
- "requirements/*.txt"
- "environment.yml"
- "requirements.txt"
- ".github/workflows/ci_dockers.yml"
- ".github/workflows/events-nightly.yml"
- ".github/workflows/release-docker.yml"
- "setup.py"

jobs:
build-PL:
Expand Down Expand Up @@ -55,7 +65,6 @@ jobs:
build-args: |
PYTHON_VERSION=${{ matrix.python_version }}
XLA_VERSION=${{ matrix.xla_version }}
cache-from: pytorchlightning/pytorch_lightning:base-xla-py${{ matrix.python_version }}-torch${{ matrix.xla_version }}
file: dockers/base-xla/Dockerfile
push: false
timeout-minutes: 50
Expand Down Expand Up @@ -96,7 +105,6 @@ jobs:
PYTHON_VERSION=${{ matrix.python_version }}
PYTORCH_VERSION=${{ matrix.pytorch_version }}
CUDA_VERSION=${{ steps.extend.outputs.CUDA }}
cache-from: pytorchlightning/pytorch_lightning:base-cuda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
file: dockers/base-cuda/Dockerfile
push: false
timeout-minutes: 50
Expand Down Expand Up @@ -139,7 +147,6 @@ jobs:
PYTORCH_VERSION=${{ matrix.pytorch_version }}
PYTORCH_CHANNEL=${{ steps.extend.outputs.CHANNEL }}
CUDA_VERSION=${{ steps.extend.outputs.CUDA }}
cache-from: pytorchlightning/pytorch_lightning:base-conda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
file: dockers/base-conda/Dockerfile
push: false
timeout-minutes: 50
28 changes: 17 additions & 11 deletions .github/workflows/ci_pkg-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Install pkg
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
on: # Trigger the workflow on push or pull request, but only for the master branch
push:
branches: [master, "release/*"] # include release branches like release/1.0.x
branches: [master, "release/*"]
pull_request:
branches: [master, "release/*"]

Expand All @@ -27,13 +27,13 @@ jobs:

- name: Prepare env
run: |
pip install check-manifest "twine>=3.2"
pip install check-manifest "twine==3.2" setuptools wheel

- name: Create package
run: |
check-manifest
# python setup.py check --metadata --strict
python setup.py sdist
python setup.py sdist bdist_wheel

- name: Check package
run: |
Expand All @@ -46,12 +46,18 @@ jobs:
# this is just a hotfix because of Win cannot install it directly
pip install -r requirements.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html

- name: Install package
- name: Install | Uninstall package - archive
run: |
# install as archive
pip install dist/*.tar.gz
cd ..
python -c "import pytorch_lightning as pl ; print(pl.__version__)"
pip uninstall -y pytorch-lightning

- name: Install | Uninstall package - wheel
run: |
# pip install virtualenv
# virtualenv vEnv --system-site-packages
# source vEnv/bin/activate
pip install dist/*
cd .. & python -c "import pytorch_lightning as pl ; print(pl.__version__)"
# deactivate
# rm -rf vEnv
# install as wheel
pip install dist/*.whl
cd ..
python -c "import pytorch_lightning as pl ; print(pl.__version__)"
pip uninstall -y pytorch-lightning
2 changes: 1 addition & 1 deletion .github/workflows/ci_test-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI basic testing
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
on: # Trigger the workflow on push or pull request, but only for the master branch
push:
branches: [master, "release/*"] # include release branches like release/1.0.x
branches: [master, "release/*"]
pull_request:
branches: [master, "release/*"]

Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/ci_test-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: PyTorch & Conda
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
on: # Trigger the workflow on push or pull request, but only for the master branch
push:
branches: [master, "release/*"] # include release branches like release/1.0.x
branches: [master, "release/*"]
pull_request:
branches: [master, "release/*"]

Expand Down Expand Up @@ -34,10 +34,21 @@ jobs:
# todo this probably does not work with docker images, rather cache dockers
uses: actions/cache@v2
with:
path: Datasets # This path is specific to Ubuntu
# Look to see if there is a cache hit for the corresponding requirements file
path: Datasets
key: pl-dataset

- name: Pull checkpoints from S3
# todo: consider adding coma caching, but ATM all models have less then 100KB
run: |
# todo: remove unzip install after new nigtly docker is created
apt-get update -qq
apt-get install -y --no-install-recommends unzip
# enter legacy and update checkpoints from S3
cd legacy
curl https://pl-public-data.s3.amazonaws.com/legacy/checkpoints.zip --output checkpoints.zip
unzip -o checkpoints.zip
ls -l checkpoints/

- name: Tests
run: |
# NOTE: run coverage on tests does not propagare faler status for Win, https://github.com/nedbat/coveragepy/issues/1003
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/ci_test-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI complete testing
# see: https://help.github.com/en/actions/reference/events-that-trigger-workflows
on: # Trigger the workflow on push or pull request, but only for the master branch
push:
branches: [master, "release/*"] # include release branches like release/1.0.x
branches: [master, "release/*"]
pull_request:
branches: [master, "release/*"]

Expand Down Expand Up @@ -87,6 +87,16 @@ jobs:
restore-keys: |
${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.requires }}-

- name: Pull checkpoints from S3
# todo: consider adding some caching, but ATM all models have less then 100KB
run: |
cd legacy
# wget is simpler but does not work on Windows
python -c "from urllib.request import urlretrieve ; urlretrieve('https://pl-public-data.s3.amazonaws.com/legacy/checkpoints.zip', 'checkpoints.zip')"
ls -l .
unzip -o checkpoints.zip
ls -l checkpoints/

- name: Install dependencies
env:
# MAKEFLAGS: "-j2"
Expand Down Expand Up @@ -119,8 +129,7 @@ jobs:
- name: Cache datasets
uses: actions/cache@v2
with:
path: Datasets # This path is specific to Ubuntu
# Look to see if there is a cache hit for the corresponding requirements file
path: Datasets
key: pl-dataset

- name: Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_test-tpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: TPU tests

on:
push:
branches: [master, "release/*"] # include release branches like release/1.0.x
branches: [master, "release/*"]
# TODO: temporal disable TPU testing until we find way how to pass credentials to forked PRs
# pull_request:
# branches:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Check Code Format"

on: # Trigger the workflow on push or pull request, but only for the master branch
push:
branches: [master, "release/*"] # include release branches like release/1.0.x
branches: [master, "release/*"]
pull_request:
branches: [master, "release/*"]

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docs-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Docs check"

on: # Trigger the workflow on push or pull request, but only for the master branch
push:
branches: [master, "release/*"] # include release branches like release/1.0.x
branches: [master, "release/*"]
pull_request:
branches: [master, "release/*"]

Expand Down Expand Up @@ -109,4 +109,3 @@ jobs:
path: docs/build/html/
# Use always() to always run this step to publish test results when there are test failures
if: success()

Loading