Merge branch 'v0.5.1' of github.com:pytorch/vision into build/v0.5.1

Author: fmassa

.circleci/config.yml

@@ -76,6 +76,27 @@ jobs:
             python .circleci/regenerate.py
             git diff --exit-code || (echo ".circleci/config.yml not in sync with config.yml.in! Run .circleci/regenerate.py to update config"; exit 1)
 
+  python_lint:
+    docker:
+      - image: circleci/python:3.7
+    steps:
+      - checkout
+      - run:
+          command: |
+            pip install --user --progress-bar off flake8 typing
+            flake8 .
+
+  clang_format:
+    docker:
+      - image: circleci/python:3.7
+    steps:
+      - checkout
+      - run:
+          command: |
+            sudo apt-get update -y
+            sudo apt-get install -y clang-format
+            ./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc
+
   binary_linux_wheel:
     <<: *binary_common
     docker:
@@ -152,7 +173,7 @@ jobs:
           sudo apt-get update && sudo apt-get install -y nvidia-container-toolkit=${NVIDIA_CONTAINER_VERSION}
           sudo systemctl restart docker
 
-          DRIVER_FN="NVIDIA-Linux-x86_64-410.104.run"
+          DRIVER_FN="NVIDIA-Linux-x86_64-440.59.run"
           wget "https://s3.amazonaws.com/ossci-linux/nvidia_driver/$DRIVER_FN"
           sudo /bin/bash "$DRIVER_FN" -s --no-drm || (sudo cat /var/log/nvidia-installer.log && false)
           nvidia-smi
@@ -497,6 +518,10 @@ workflows:
           name: binary_macos_conda_py3.8_cpu
           python_version: '3.8'
           wheel_docker_image: pytorch/manylinux-cuda102
+      - binary_linux_conda_cuda:
+          name: torchvision_linux_py3.8_cu102_cuda
+          python_version: "3.8"
+          cu_version: "cu102"
       - binary_win_conda:
           name: torchvision_win_py3.6_cpu
           python_version: "3.6"
@@ -505,10 +530,14 @@ workflows:
           name: torchvision_win_py3.6_cu101
           python_version: "3.6"
           cu_version: "cu101"
+      - python_lint
+      - clang_format
 
   nightly:
     jobs:
       - circleci_consistency
+      - python_lint
+      - clang_format
       - binary_linux_wheel:
           cu_version: cpu
           filters:

.circleci/config.yml.in

@@ -76,6 +76,27 @@ jobs:
             python .circleci/regenerate.py
             git diff --exit-code || (echo ".circleci/config.yml not in sync with config.yml.in! Run .circleci/regenerate.py to update config"; exit 1)
 
+  python_lint:
+    docker:
+      - image: circleci/python:3.7
+    steps:
+      - checkout
+      - run:
+          command: |
+            pip install --user --progress-bar off flake8 typing
+            flake8 .
+
+  clang_format:
+    docker:
+      - image: circleci/python:3.7
+    steps:
+      - checkout
+      - run:
+          command: |
+            sudo apt-get update -y
+            sudo apt-get install -y clang-format
+            ./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc
+
   binary_linux_wheel:
     <<: *binary_common
     docker:
@@ -152,7 +173,7 @@ jobs:
           sudo apt-get update && sudo apt-get install -y nvidia-container-toolkit=${NVIDIA_CONTAINER_VERSION}
           sudo systemctl restart docker
 
-          DRIVER_FN="NVIDIA-Linux-x86_64-410.104.run"
+          DRIVER_FN="NVIDIA-Linux-x86_64-440.59.run"
           wget "https://s3.amazonaws.com/ossci-linux/nvidia_driver/$DRIVER_FN"
           sudo /bin/bash "$DRIVER_FN" -s --no-drm || (sudo cat /var/log/nvidia-installer.log && false)
           nvidia-smi
@@ -299,6 +320,10 @@ workflows:
     jobs:
       - circleci_consistency
       {{ workflows() }}
+      - binary_linux_conda_cuda:
+          name: torchvision_linux_py3.8_cu102_cuda
+          python_version: "3.8"
+          cu_version: "cu102"
       - binary_win_conda:
           name: torchvision_win_py3.6_cpu
           python_version: "3.6"
@@ -307,9 +332,13 @@ workflows:
           name: torchvision_win_py3.6_cu101
           python_version: "3.6"
           cu_version: "cu101"
+      - python_lint
+      - clang_format
 
   nightly:
 {%- endif %}
     jobs:
       - circleci_consistency
+      - python_lint
+      - clang_format
       {{ workflows(prefix="nightly_", filter_branch="nightly", upload=True) }}

.travis.yml

@@ -3,23 +3,6 @@ language: python
 dist: xenial
 matrix:
   include:
-    - env: FORMAT_CHECK
-      language: cpp
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-xenial-7
-          packages:
-            - clang-7
-            - clang-format-7
-      before_install: skip
-      install: skip
-      script: ./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc
-    - env: LINT_CHECK
-      python: "3.6"
-      install: pip install flake8 typing
-      script: flake8 .circleci
-      after_success: []
     - python: "3.6"
       env: IMAGE_BACKEND=Pillow-SIMD
     - python: "3.6"

docs/requirements.txt

@@ -1,3 +1,3 @@
 sphinx==1.7.3
 sphinxcontrib-googleanalytics
--e git://github.com/snide/sphinx_rtd_theme.git#egg=sphinx_rtd_theme
+-e git+git://github.com/pytorch/pytorch_sphinx_theme.git#egg=pytorch_sphinx_theme

docs/source/conf.py

@@ -22,7 +22,7 @@
 # sys.path.insert(0, os.path.abspath('.'))
 import torch
 import torchvision
-import sphinx_rtd_theme
+import pytorch_sphinx_theme
 
 
 # -- General configuration ------------------------------------------------
@@ -104,8 +104,8 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+html_theme = 'pytorch_sphinx_theme'
+html_theme_path = [pytorch_sphinx_theme.get_html_theme_path()]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -115,6 +115,7 @@
     'collapse_navigation': False,
     'display_version': True,
     'logo_only': True,
+    'pytorch_project': 'docs',
 }
 
 html_logo = '_static/img/pytorch-logo-dark.svg'
@@ -125,12 +126,12 @@
 html_static_path = ['_static']
 
 # html_style_path = 'css/pytorch_theme.css'
-html_context = {
-    'css_files': [
-        'https://fonts.googleapis.com/css?family=Lato',
-        '_static/css/pytorch_theme.css'
-    ],
-}
+# html_context = {
+#    'css_files': [
+#        'https://fonts.googleapis.com/css?family=Lato',
+#        '_static/css/pytorch_theme.css'
+#    ],
+# }
 
 
 # -- Options for HTMLHelp output ------------------------------------------

docs/source/models.rst

@@ -86,6 +86,28 @@ You can use the following transform to normalize::
 An example of such normalization can be found in the imagenet example
 `here <https://github.com/pytorch/examples/blob/42e5b996718797e45c46a25c55b031e6768f8440/imagenet/main.py#L89-L101>`_
 
+The process for obtaining the values of `mean` and `std` is roughly equivalent
+to::
+
+    import torch
+    from torchvision import datasets, transforms as T
+
+    transform = T.Compose([T.Resize(256), T.CenterCrop(224), T.ToTensor()])
+    dataset = datasets.ImageNet(".", split="train", transform=transform)
+
+    means = []
+    stds = []
+    for img in subset(dataset):
+        means.append(torch.mean(img))
+        stds.append(torch.std(img))
+
+    mean = torch.mean(torch.tensor(means))
+    std = torch.mean(torch.tensor(stds))
+
+Unfortunately, the concret `subset` that was used is lost. For more
+information see `this discussion <https://github.com/pytorch/vision/issues/1439>`_
+or `these experiments <https://github.com/pytorch/vision/pull/1965>`_.
+
 ImageNet 1-crop error rates (224x224)
 
 ================================  =============   =============

packaging/torchvision/meta.yaml

@@ -20,7 +20,6 @@ requirements:
     - python
     - pillow >=4.1.1
     - numpy >=1.11
-    - six
     {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
     {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
 

packaging/windows/internal/cuda_install.bat

@@ -96,6 +96,11 @@ if not exist "%SRC_DIR%\temp_build\NvToolsExt.7z" (
     if errorlevel 1 exit /b 1
 )
 
+if not exist "%SRC_DIR%\temp_build\gpu_driver_dlls.7z" (
+    curl -k -L "https://drive.google.com/u/0/uc?id=1injUyo3lnarMgWyRcXqKg4UGnN0ysmuq&export=download" --output "%SRC_DIR%\temp_build\gpu_driver_dlls.zip"
+    if errorlevel 1 exit /b 1
+)
+
 echo Installing CUDA toolkit...
 7z x %CUDA_SETUP_FILE% -o"%SRC_DIR%\temp_build\cuda"
 pushd "%SRC_DIR%\temp_build\cuda"
@@ -131,5 +136,8 @@ xcopy /Y "%SRC_DIR%\temp_build\cudnn\cuda\bin\*.*" "%ProgramFiles%\NVIDIA GPU Co
 xcopy /Y "%SRC_DIR%\temp_build\cudnn\cuda\lib\x64\*.*" "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\lib\x64"
 xcopy /Y "%SRC_DIR%\temp_build\cudnn\cuda\include\*.*" "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\include"
 
+echo Installing GPU driver DLLs
+7z x %SRC_DIR%\temp_build\gpu_driver_dlls.zip -o"C:\Windows\System32"
+
 echo Cleaning temp files
 rd /s /q "%SRC_DIR%\temp_build" || ver > nul

references/classification/train.py

@@ -1,8 +1,6 @@
-from __future__ import print_function
 import datetime
 import os
 import time
-import sys
 
 import torch
 import torch.utils.data
@@ -141,12 +139,9 @@ def load_data(traindir, valdir, cache_dataset, distributed):
 
 
 def main(args):
-    if args.apex:
-        if sys.version_info < (3, 0):
-            raise RuntimeError("Apex currently only supports Python 3. Aborting.")
-        if amp is None:
-            raise RuntimeError("Failed to import apex. Please install apex from https://www.github.com/nvidia/apex "
-                               "to enable mixed-precision training.")
+    if args.apex and amp is None:
+        raise RuntimeError("Failed to import apex. Please install apex from https://www.github.com/nvidia/apex "
+                           "to enable mixed-precision training.")
 
     if args.output_dir:
         utils.mkdir(args.output_dir)

references/classification/train_quantization.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import datetime
 import os
 import time