Merge branch 'master' into cifar10-baseline

Author: rohitgr7

.drone.jsonnet

@@ -0,0 +1,63 @@
+/*
+Copyright The PyTorch Lightning team.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// https://github.com/drone/drone-jsonnet-config/blob/master/.drone.jsonnet
+
+local pipeline(name, image) = {
+  kind: "pipeline",
+  type: "docker",
+  name: name,
+  steps: [
+    {
+      name: "testing",
+      image: image,
+      environment: {
+        "CODECOV_TOKEN": {
+          from_secret: "codecov_token"
+        },
+        "MKL_THREADING_LAYER": "GNU",
+      },
+      commands: [
+        "python --version",
+        "pip --version",
+        "nvidia-smi",
+        "pip install -r ./requirements/devel.txt --upgrade-strategy only-if-needed -v --no-cache-dir",
+        "pip list",
+        "coverage run --source pytorch_lightning -m pytest pytorch_lightning tests -v -ra --color=yes --durations=25",
+        "python -m pytest benchmarks pl_examples -v -ra --color=yes --maxfail=2 --durations=0",
+        "coverage report",
+        "codecov --token $CODECOV_TOKEN --flags=gpu,pytest --name='GPU-coverage' --env=linux --build $DRONE_BUILD_NUMBER --commit $DRONE_COMMIT",
+        "python tests/collect_env_details.py"
+      ],
+    },
+  ],
+  trigger: {
+    branch: [
+      "master",
+      "release/*"
+    ],
+    event: [
+      "push",
+      "pull_request"
+    ]
+  },
+  depends_on: if name == "torch-GPU-nightly" then ["torch-GPU"]
+};
+
+[
+    pipeline("torch-GPU", "pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.6"),
+    pipeline("torch-GPU-nightly", "pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.7"),
+]

.drone.yml

@@ -39,10 +39,11 @@ steps:
     # todo: temprarl fix till https://github.com/PyTorchLightning/pytorch-lightning/pull/4922 is resolved
     - pip install --extra-index-url https://developer.download.nvidia.com/compute/redist "nvidia-dali-cuda100<0.27" --upgrade-strategy only-if-needed
     - pip list
-    - coverage run --source pytorch_lightning -m pytest pytorch_lightning tests -v --durations=25 # --flake8
-    - python -m pytest benchmarks pl_examples -v --maxfail=2 --durations=0 # --flake8
-    #- cd docs; make doctest; make coverage
+    - python -m coverage run --source pytorch_lightning -m pytest pytorch_lightning tests -v --durations=25 # --flake8
+    # Running special tests
+    - sh tests/special_tests.sh
     - coverage report
+    - python -m pytest benchmarks pl_examples -v --maxfail=2 --durations=0
     # see: https://docs.codecov.io/docs/merging-reports
     - codecov --token $CODECOV_TOKEN --flags=gpu,pytest --name="GPU-coverage" --env=linux --build $DRONE_BUILD_NUMBER --commit $DRONE_COMMIT
     # --build $DRONE_BUILD_NUMBER --branch $DRONE_BRANCH --commit $DRONE_COMMIT --tag $DRONE_TAG --pr $DRONE_PULL_REQUEST

.github/workflows/code-formatting.yml

@@ -22,88 +22,55 @@ jobs:
       - name: Run isort
         run: isort --settings-path=./pyproject.toml --check-only --diff .
 
-  code-black:
-    name: Check code formatting with Black
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-      - name: Install Black
-        run: pip install black==19.10b0
-      - name: Run Black
-        run: echo "LGTM"
-        # run black --skip-string-normalization --config=pyproject.toml --check . # TODO, uncomment
+  #code-black:
+  #  name: Check code formatting with Black
+  #  runs-on: ubuntu-20.04
+  #  steps:
+  #    - name: Checkout
+  #      uses: actions/checkout@v2
+  #    - name: Set up Python 3.8
+  #      uses: actions/setup-python@v2
+  #      with:
+  #        python-version: 3.8
+  #    - name: Install Black
+  #      run: pip install black==19.10b0
+  #    - name: Run Black
+  #      run: echo "LGTM"
+  #      run black --skip-string-normalization --config=pyproject.toml --check . # TODO, uncomment
 
-  python-types:
-    name: Python static type checking with Pyright
+  python-pep8:
+    name: Python formatting PEP8
     runs-on: ubuntu-20.04
 
     # Timeout: https://stackoverflow.com/a/59076067/4521646
-    timeout-minutes: 15
+    timeout-minutes: 10
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
           python-version: 3.7
 
-      # Note: This uses an internal pip API and may not always work
-      # https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-extras-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements/extra.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-extras-
-
       - name: Install dependencies
-        env:
-          HOROVOD_BUILD_ARCH_FLAGS: "-mfma"
-          HOROVOD_WITHOUT_MXNET: 1
-          HOROVOD_WITHOUT_TENSORFLOW: 1
         run: |
-          # python -m pip install --upgrade --user pip
-          pip install --requirement requirements.txt --upgrade-strategy only-if-needed --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --quiet
-          pip install --requirement ./requirements/devel.txt --quiet
-          # pip install tox coverage
-          python --version ; pip --version ; pip list
-        shell: bash
-
-      - name: Set up node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-
-      - name: Install pyright
-        run: |
-          npm install pyright
+          pip install flake8
 
-      - name: Run type checking
+      - name: Run checking
         run: |
-          $(npm bin)/pyright --project .pyrightconfig.json
+          flake8 .
 
-  python-pep8:
-    name: Python formatting PEP8
+  python-typing-mypy:
+    name: Python typing check [mypy]
     runs-on: ubuntu-20.04
-
-    # Timeout: https://stackoverflow.com/a/59076067/4521646
-    timeout-minutes: 10
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - uses: actions/checkout@master
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.7
-
-      - name: Install dependencies
+          python-version: 3.8
+      - name: Install mypy
         run: |
-          pip install flake8
-
-      - name: Run checking
+          pip install mypy
+          pip list
+      - name: mypy check
         run: |
-          flake8 .
+          mypy

.github/workflows/release-pypi.yml

@@ -28,6 +28,17 @@ jobs:
         python setup.py sdist bdist_wheel
         ls -lh dist/
 
+    - name: Upload to release
+      if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: dist/*
+        tag: ${{ github.ref }}
+        asset_name: packages
+        overwrite: false
+        file_glob: true
+
     - name: Delay releasing
       if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
       uses: juliangruber/sleep-action@v1

.pre-commit-config.yaml

@@ -30,3 +30,8 @@ repos:
         args: [--settings-path, ./pyproject.toml]
         language: system
         types: [python]
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.790
+    hooks:
+      - id: mypy