Merge remote-tracking branch 'origin/master' into TPU_device_check

# Conflicts:
#	CHANGELOG.md
#	pytorch_lightning/accelerators/tpu_backend.py
#	pytorch_lightning/trainer/data_loading.py
#	tests/models/test_tpu.py

Author: lezwon

.circleci/config.yml

@@ -35,12 +35,8 @@ references:
       name: Build and push Docker image
       command: |
         gcloud --quiet auth configure-docker
-        cd dockers/tpu-tests
-        # TODO: How to find the GITHUB_REF in CircleCI?
-        # $CI_PULL_REQUEST seems to be of form: https://github.com/org/repo-name/pull/11.
-        # Grab the last bit, e.g. pull/11, convert to pull/11/head, and use it
-        # for the GITHUB_REF so Docker can pull the latest pending code in PR.
-        if [ -z "$CI_PULL_REQUEST" ]; then docker build --tag "$GCR_IMAGE_PATH:$CIRCLE_WORKFLOW_JOB_ID" -f Dockerfile --build-arg "TEST_IMAGE=1" .; else git_ref=$(echo "$CI_PULL_REQUEST" | sed "s/.*pytorch-lightning\///")/head && docker build --tag "$GCR_IMAGE_PATH:$CIRCLE_WORKFLOW_JOB_ID" -f Dockerfile --build-arg "TEST_IMAGE=1" --build-arg "GITHUB_REF=$git_ref" .; fi
+        #cd dockers/tpu-tests
+        docker build --tag "$GCR_IMAGE_PATH:$CIRCLE_WORKFLOW_JOB_ID" -f ./dockers/tpu-tests/Dockerfile --build-arg "PYTHON_VERSION=$PYTHON_VER" .
         docker push "$GCR_IMAGE_PATH:$CIRCLE_WORKFLOW_JOB_ID"
 
   deploy_cluster: &deploy_cluster
@@ -99,9 +95,13 @@ references:
 jobs:
 
   TPU-tests:
+    parameters:
+      python:
+        type: string
     docker:
       - image: circleci/python:3.7
     environment:
+      - PYTHON_VER: << parameters.python >>
       - MAX_CHECKS: 240
       - CHECK_SPEEP: 5
     steps:
@@ -148,19 +148,14 @@ jobs:
 
 workflows:
   version: 2
-  build:
+  tpu-tests:
     jobs:
       - build-Docs
       - TPU-tests:
-          filters:
-            branches:
-              # https://discuss.circleci.com/t/create-separate-steps-jobs-for-pr-forks-versus-branches/13419/4
-              #only:
-              #  # only from forks
-              #  - /^pull\/.\d+$/
-              ignore:
-                - master
-  cleanup:
+          matrix:
+            parameters:
+              python: ["3.6", "3.7"]
+  tpu-cleanup:
     triggers:
       - schedule:
           # The cron format is:

.drone.yml

@@ -46,7 +46,7 @@ steps:
     - pip install pip -U
     - pip --version
     - nvidia-smi
-    #- bash ./tests/install_AMP.sh
+    #- bash ./requirements/install_AMP.sh
     - apt-get update && apt-get install -y cmake
     - pip install -r ./requirements/base.txt --user -q --upgrade-strategy only-if-needed
     - pip install -r ./requirements/devel.txt --user -q --upgrade-strategy only-if-needed

.github/ISSUE_TEMPLATE/how-to-question.md

@@ -9,9 +9,10 @@ assignees: ''
 
 ## ❓ Questions and Help
 
-### Before asking:   
-1. search the issues.   
-2. search the docs.    
+### 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/).    
 
 <!-- If you still can't find what you need: -->
 

.github/prepare-nightly_pkg-name.py

@@ -0,0 +1,12 @@
+import os
+import re
+
+PATH_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+
+PATH_SETUP = os.path.join(PATH_ROOT, 'setup.py')
+print(f"rename package '{PATH_SETUP}'")
+with open(PATH_SETUP, 'r') as fp:
+    setup = fp.read()
+setup = re.sub(r'name=[\'"]pytorch-lightning[\'"]', 'name="pytorch-lightning-nightly"', setup)
+with open(PATH_SETUP, 'w') as fp:
+    fp.write(setup)

.github/prepare_nightly.py renamed to .github/prepare-nightly_version.py

@@ -4,14 +4,6 @@
 
 PATH_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
-PATH_SETUP = os.path.join(PATH_ROOT, 'setup.py')
-print(f"rename package '{PATH_SETUP}'")
-with open(PATH_SETUP, 'r') as fp:
-    setup = fp.read()
-setup = re.sub(r'name=[\'"]pytorch-lightning[\'"]', 'name="pytorch-lightning-nightly"', setup)
-with open(PATH_SETUP, 'w') as fp:
-    fp.write(setup)
-
 # get today date
 now = datetime.datetime.now()
 now_date = now.strftime("%Y%m%d")

.github/workflows/ci_dockers.yml

@@ -14,11 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python_version: [3.6, 3.8]
-        pytorch_version: [1.3, 1.5, 1.7]
-        exclude:
-          - python_version: 3.8
-            pytorch_version: 1.3
+        python_version: [3.6]
+        pytorch_version: [1.3, 1.7]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -62,6 +59,9 @@ jobs:
             pytorch_version: 1.7
             pytorch_channel: pytorch-nightly
           - python_version: 3.8
+            pytorch_version: 1.6
+            pytorch_channel: pytorch
+          - python_version: 3.6
             pytorch_version: 1.5
             pytorch_channel: pytorch
     steps:

.github/workflows/ci_pt-conda.yml renamed to .github/workflows/ci_test-conda.yml

@@ -20,10 +20,16 @@ jobs:
   setup-build-publish-deploy:
     name: tpu-testing-job
     runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.6, 3.7]
     # Timeout: https://stackoverflow.com/a/59076067/4521646
     timeout-minutes: 50
 
     steps:
+    - name: Set IMAGETAG
+      run: echo "IMAGETAG=$(date +%s)_${{ matrix.python-version }}" >> $GITHUB_ENV
     - name: Install Go
       uses: actions/setup-go@v2
       with:
@@ -61,9 +67,9 @@ jobs:
       shell: bash
     - name: Build and Push Docker Image
       run: |
-        cd dockers/tpu-tests
-        docker build --tag "$IMAGE:$GITHUB_RUN_ID" -f Dockerfile --build-arg "GITHUB_REF=$GITHUB_REF" --build-arg "TEST_IMAGE=1" .
-        docker push "$IMAGE:$GITHUB_RUN_ID"
+        #cd dockers/tpu-tests
+        docker build --tag "$IMAGE:$IMAGETAG" -f ./dockers/tpu-tests/Dockerfile --build-arg "PYTHON_VERSION=${{ matrix.python-version }}" .
+        docker push "$IMAGE:$IMAGETAG"
       shell: bash
 
     - name: Install jsonnet
@@ -78,7 +84,7 @@ jobs:
 
     - name: Deploy the job on the kubernetes cluster
       run: |-
-        job_name=$(jsonnet -J ml-testing-accelerators/ dockers/tpu-tests/tpu_test_cases.jsonnet --ext-str image=$IMAGE --ext-str image-tag=$GITHUB_RUN_ID | kubectl create -f -) && \
+        job_name=$(jsonnet -J ml-testing-accelerators/ dockers/tpu-tests/tpu_test_cases.jsonnet --ext-str image=$IMAGE --ext-str image-tag=$IMAGETAG | kubectl create -f -) && \
         job_name=${job_name#job.batch/} && \
         job_name=${job_name% created} && \
         echo "Waiting on kubernetes job: $job_name in cluster: $GKE_CLUSTER" && \
@@ -99,7 +105,7 @@ jobs:
         # First portion is the test logs. Print these to Github Action stdout.
         cat xx00 && \
         echo "Done with log retrieval attempt." && \
-        gcloud container images delete "$IMAGE:$GITHUB_RUN_ID" --force-delete-tags && \
+        gcloud container images delete "$IMAGE:$IMAGETAG" --force-delete-tags && \
         exit $status_code
       shell: bash
 

.github/workflows/ci_test-tpu.yml

@@ -49,7 +49,9 @@ jobs:
           pip install --requirement requirements/base.txt --upgrade-strategy only-if-needed --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --quiet
           pip install --requirement requirements/extra.txt
           pip install --requirement requirements/docs.txt
-          python --version ; pip --version ; pip list
+          python --version
+          pip --version
+          pip list
         shell: bash
 
       - name: Test Documentation
@@ -87,7 +89,9 @@ jobs:
           pip install --requirement requirements/docs.txt
           # install Texlive, see https://linuxconfig.org/how-to-install-latex-on-ubuntu-20-04-focal-fossa-linux
           sudo apt-get update && sudo apt-get install -y texlive-latex-extra dvipng texlive-pictures
-          python --version ; pip --version ; pip list
+          python --version
+          pip --version
+          pip list
         shell: bash
 
       - name: Make Documentation

.github/workflows/docs-checks.yml

@@ -23,7 +23,7 @@ jobs:
         python -m pip install --user --upgrade setuptools wheel
     - name: Build
       run: |
-        python .github/prepare_nightly.py
+        python .github/prepare-nightly_version.py
         python setup.py sdist bdist_wheel
         ls -lh dist/
 
@@ -34,12 +34,7 @@ jobs:
         user: __token__
         password: ${{ secrets.test_pypi_password }}
         repository_url: https://test.pypi.org/legacy/
-
-    - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_password }}
+        verbose: true
 
   docker-XLA:
     runs-on: ubuntu-20.04
@@ -52,7 +47,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Publish Master to Docker
+      - name: Publish XLA to Docker Hub
         # publish master
         uses: docker/[email protected]
         with:
@@ -88,7 +83,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Publish Master to Docker
+      - name: Publish CUDA to Docker Hub
         # publish master
         uses: docker/[email protected]
         with:
@@ -100,32 +95,7 @@ jobs:
           tags: "base-cuda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}"
         timeout-minutes: 55
 
-
-  docker-Conda:
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        python_version: [ 3.6, 3.7, 3.8 ]
-        pytorch_version: [ 1.3, 1.4, 1.5, 1.6, 1.7 ]
-        pytorch_channel: [ "pytorch", "pytorch-nightly" ]
-        # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-new-combinations
-        exclude:
-          - pytorch_version: 1.7
-            pytorch_channel: pytorch
-          - pytorch_version: 1.3
-            pytorch_channel: pytorch-nightly
-          - pytorch_version: 1.4
-            pytorch_channel: pytorch-nightly
-          - pytorch_version: 1.5
-            pytorch_channel: pytorch-nightly
-          - pytorch_version: 1.6
-            pytorch_channel: pytorch-nightly
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Publish Master to Docker
+      - name: Publish Conda to Docker Hub
         # publish master
         uses: docker/[email protected]
         with: