Update local pytorch-lightning master

.circleci/config.yml

@@ -1,191 +1,133 @@
-# Python CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-python/ for more details
-#
-version: 2.0
+# Python CircleCI 2.1 configuration file.
+version: 2.1
+orbs:
+  gcp-gke: circleci/gcp-gke@1.0.4
+  go: circleci/go@1.3.0
+  codecov: codecov/codecov@1.1.0
 
 references:
 
-  install_deps: &install_deps
+  make_docs: &make_docs
     run:
-      name: Install Dependences
+      name: Make Documentation
       command: |
-        sudo apt-get update && sudo apt-get install -y cmake
-        pip install "$TORCH_VERSION"
-        pip install -r requirements.txt -q
-        sudo pip install pytest pytest-cov pytest-flake8 -q
-        pip install -r ./tests/requirements-devel.txt -q
-
-  tests: &tests
+        # First run the same pipeline as Read-The-Docs
+        # apt-get update && apt-get install -y cmake
+        # using: https://hub.docker.com/r/readthedocs/build
+        # we need to use py3.7 ot higher becase of an issue with metaclass inheritence
+        pyenv global 3.7.3
+        python --version
+        pip install -r requirements/docs.txt
+        pip list
+        cd docs
+        make clean
+        make html --jobs 2 SPHINXOPTS="-W"
+
+  checkout_ml_testing: &checkout_ml_testing
    run:
-     name: Testing
+     name: Checkout ml-testing-accelerators
      command: |
-       python --version ; pip --version ; pip list
-       py.test pytorch_lightning tests -v --doctest-modules --junitxml=test-reports/pytest_junit.xml
-     no_output_timeout: 30m
+       git clone https://github.com/GoogleCloudPlatform/ml-testing-accelerators.git
+       cd ml-testing-accelerators
+       git fetch origin 5e88ac24f631c27045e62f0e8d5dfcf34e425e25:stable
+       git checkout stable
+       cd ..
 
-  examples: &examples
-   run:
-     name: PL Examples
-     command: |
-       pip install -r ./pl_examples/requirements.txt --user
-       python --version ; pip --version ; pip list
-       py.test pl_examples -v --doctest-modules --junitxml=test-reports/pytest_junit.xml
-     no_output_timeout: 20m
-
-  install_pkg: &install_pkg
+  build_push_docker: &build_push_docker
     run:
-      name: Install package
+      name: Build and push Docker image
       command: |
-        virtualenv vEnv ; source vEnv/bin/activate
-        pip install --editable . ; cd .. & python -c "import pytorch_lightning ; print(pytorch_lightning.__version__)"
-        deactivate ; rm -rf vEnv
-
-  create_pkg: &create_pkg
-    run:
-      name: Create package
-      command: |
-        sudo pip install twine==1.13.0
-        python setup.py sdist
-        twine check dist/*
-        python setup.py clean
-
-  format: &format
+        gcloud --quiet auth configure-docker
+        #cd dockers/tpu-tests
+        export PYTHON_VER=$(python -c "import random ; print('3.6' if random.random() > 0.5 else '3.7')" 2>&1)
+        echo $PYTHON_VER
+        docker build --tag "$GCR_IMAGE_PATH:$CIRCLE_WORKFLOW_JOB_ID" -f ./dockers/tpu-tests/Dockerfile --build-arg "PYTHON_VERSION=$PYTHON_VER" --build-arg "PYTORCH_VERSION=$XLA_VER" .
+        docker push "$GCR_IMAGE_PATH:$CIRCLE_WORKFLOW_JOB_ID"
+
+  deploy_cluster: &deploy_cluster
    run:
-     name: Formatting
+     name: Deploy the job on the kubernetes cluster
      command: |
-       python --version ; pip --version
-       sudo pip install flake8 -q
-       pip list
-       flake8 .
-
-  make_docs: &make_docs
+       go get github.com/google/go-jsonnet/cmd/jsonnet
+       export PATH=$PATH:$HOME/go/bin
+       python -c "fname = 'dockers/tpu-tests/tpu_test_cases.jsonnet' ; fff = open(fname).read().replace('pytorch-VERSION', 'pytorch-$XLA_VER') ; open(fname, 'w').write(fff)"
+       job_name=$(jsonnet -J ml-testing-accelerators/ dockers/tpu-tests/tpu_test_cases.jsonnet --ext-str image=$GCR_IMAGE_PATH --ext-str image-tag=$CIRCLE_WORKFLOW_JOB_ID | kubectl create -f -)
+       job_name=${job_name#job.batch/}
+       job_name=${job_name% created}
+       echo "Waiting on kubernetes job: $job_name"
+       i=0 && \
+       # N checks spaced 30s apart = 900s total.
+       status_code=2 && \
+       # Check on the job periodically. Set the status code depending on what
+       # happened to the job in Kubernetes. If we try MAX_CHECKS times and
+       # still the job hasn't finished, give up and return the starting
+       # non-zero status code.
+       printf "Waiting for job to finish: " && \
+       while [ $i -lt $MAX_CHECKS ]; do ((i++)); if kubectl get jobs $job_name -o jsonpath='Failed:{.status.failed}' | grep "Failed:1"; then status_code=1 && break; elif kubectl get jobs $job_name -o jsonpath='Succeeded:{.status.succeeded}' | grep "Succeeded:1" ; then status_code=0 && break; else printf "."; fi; sleep $CHECK_SPEEP; done && \
+       echo "Done waiting. Job status code: $status_code" && \
+       pod_name=$(kubectl get po -l controller-uid=`kubectl get job $job_name -o "jsonpath={.metadata.labels.controller-uid}"` | awk 'match($0,!/NAME/) {print $1}') && \
+       echo "GKE pod name: $pod_name" && \
+       kubectl logs -f $pod_name --container=train > /tmp/full_output.txt
+       if grep -q '<?xml version="1.0" ?>' /tmp/full_output.txt ; then csplit /tmp/full_output.txt '/<?xml version="1.0" ?>/'; else mv /tmp/full_output.txt xx00; fi && \
+       # First portion is the test logs. Print these to Github Action stdout.
+       cat xx00 && \
+       echo "Done with log retrieval attempt." && \
+       gcloud container images delete "$GCR_IMAGE_PATH:$CIRCLE_WORKFLOW_JOB_ID" --force-delete-tags && \
+       exit $status_code
+
+  stats: &stats
    run:
-     name: Make Documentation
+     name: Statistics
      command: |
-       # sudo apt-get install pandoc
-       sudo apt-get update && sudo apt-get install -y cmake
-       pip install -r requirements.txt --user
-       sudo pip install -r docs/requirements.txt
-       pip install -r requirements-extra.txt --user  # for doctesting loggers etc.
-       # sphinx-apidoc -o ./docs/source ./pytorch_lightning **/test_* --force --follow-links
-       cd docs; make clean; make html --debug --jobs 2 SPHINXOPTS="-W"
-       make doctest; make coverage
+       mv ./xx01 coverage.xml
+       # TODO: add human readable report
+       cat coverage.xml
+       sudo pip install pycobertura
+       pycobertura show coverage.xml
 
 jobs:
 
-  Build-Docs:
-    docker:
-      - image: circleci/python:3.7
-    steps:
-      - checkout
-      - *make_docs
-      - store_artifacts:
-          # allows us to preview the generated html pages
-          path: docs/build/html/
-          destination: html
-
-  Formatting:
+  TPU-tests:
     docker:
       - image: circleci/python:3.7
     environment:
-        - TORCH_VERSION: "torch"
+      - XLA_VER: 1.7
+      - MAX_CHECKS: 240
+      - CHECK_SPEEP: 5
     steps:
       - checkout
-      - *format
+      - go/install
+      - *checkout_ml_testing
+      - gcp-gke/install
+      - gcp-gke/update-kubeconfig-with-credentials:
+          cluster: $GKE_CLUSTER
+          perform-login: true
+      - setup_remote_docker
+      - *build_push_docker
+      - *deploy_cluster
+      - *stats
+      - codecov/upload:
+          file: coverage.xml
+          flags: tpu,pytest
+          upload_name: TPU-coverage
 
-  PyTorch:
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      - TORCH_VERSION: "torch"
-    steps: &steps
-      - checkout
-      #- restore_cache:
-      #    keys:
-      #      # when lock file changes, use increasingly general patterns to restore cache
-      #      - pip-packages--{{ .Environment.CIRCLE_JOB }}
-      #      - pip-packages--
-      - *install_deps
-      #- save_cache:
-      #    key: pip-packages--{{ .Environment.CIRCLE_JOB }}
-      #    paths:
-      #      # this path depends on where pipenv creates a virtualenv
-      #      - "~/.cache/pip"
-      #      - "/usr/local/lib/python3.6/site-packages"
-      #      - "/usr/local/lib/site-python"
-      - *tests
-      - store_test_results:
-          path: test-reports
       - store_artifacts:
-          path: test-reports
-
-  PyTorch-v1_1:
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      - TORCH_VERSION: "torch>=1.1, <1.2"
-    steps: *steps
-
-  PyTorch-v1_2:
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      - TORCH_VERSION: "torch>=1.2, <1.3"
-    steps: *steps
-
-  PyTorch-v1_3:
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      - TORCH_VERSION: "torch>=1.3, <1.4"
-    steps: *steps
-
-  PyTorch-v1_4:
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      - TORCH_VERSION: "torch>=1.4, <1.5"
-    steps: *steps
-
-  PyTorch-v1_5:
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      - TORCH_VERSION: "torch>=1.5, <1.6"
-    steps: *steps
+          path: coverage.xml
 
-  Examples:
+  build-Docs:
     docker:
-      - image: circleci/python:3.7
-    environment:
-        - TORCH_VERSION: "torch"
-    steps:
-      - checkout
-      - *install_deps
-      - *examples
-
-  Install-pkg:
-    docker:
-      - image: circleci/python:3.7
+      - image: readthedocs/build:latest
     steps:
       - checkout
-      - *create_pkg
-      - *install_pkg
-
-#orbs:
-#  python: circleci/python@0.2.1
+      - *make_docs
+      - store_artifacts:
+          # allows us to preview the generated html pages
+          path: docs/build/html/
+          destination: html
 
 workflows:
   version: 2
-  build:
+  tpu-tests:
     jobs:
-      - Formatting
-      - Build-Docs
-      - PyTorch-v1_1
-      - PyTorch-v1_2
-      - PyTorch-v1_3
-      - PyTorch-v1_4
-      - PyTorch-v1_5
-      - Install-pkg
-      - Examples
+      - build-Docs
+      - TPU-tests

.codecov.yml

@@ -1,3 +1,17 @@
+# 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.
+
 # see https://docs.codecov.io/docs/codecov-yaml
 # Validation check:
 # $ curl --data-binary @.codecov.yml https://codecov.io/validate
@@ -9,8 +23,10 @@ codecov:
   strict_yaml_branch: "yaml-config"
   require_ci_to_pass: yes
   notify:
-    # after_n_builds: 2
+    after_n_builds: 23
     wait_for_ci: yes
+  # https://docs.codecov.io/docs/codecov-yaml#section-expired-reports
+  max_report_age: off
 
 coverage:
   precision: 0  # 2 = xx.xx%, 0 = xx%
@@ -48,5 +64,4 @@ comment:
   layout: header, diff
   require_changes: false
   behavior: default  # update if exists else create new
-  # branches: *
-
+  after_n_builds: 23