CUDA 8 cleanup (#32013)

Summary: CUDA 8 is no longer supported Pull Request resolved: pytorch/pytorch#32013 Differential Revision: D19372963 Pulled By: ezyang fbshipit-source-id: e584d7d5d5908933221ea4400234b3e6e7c32e7a
TonyTangYu · Jan 13, 2020 · 8e93159 · 8e93159
1 parent 9a4219e
commit 8e93159
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 173 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5734,12 +5734,6 @@ workflows:
       - docker_build_job:
           name: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7"
           image_name: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7"
-      - docker_build_job:
-          name: "pytorch-linux-xenial-cuda8-cudnn7-py2"
-          image_name: "pytorch-linux-xenial-cuda8-cudnn7-py2"
-      - docker_build_job:
-          name: "pytorch-linux-xenial-cuda8-cudnn7-py3"
-          image_name: "pytorch-linux-xenial-cuda8-cudnn7-py3"
       - docker_build_job:
           name: "pytorch-linux-xenial-cuda9-cudnn7-py2"
           image_name: "pytorch-linux-xenial-cuda9-cudnn7-py2"

diff --git a/.circleci/docker/build.sh b/.circleci/docker/build.sh
@@ -88,22 +88,6 @@ case "$image" in
     DB=yes
     VISION=yes
     ;;
-  pytorch-linux-xenial-cuda8-cudnn7-py2)
-    CUDA_VERSION=8.0
-    CUDNN_VERSION=7
-    ANACONDA_PYTHON_VERSION=2.7
-    PROTOBUF=yes
-    DB=yes
-    VISION=yes
-    ;;
-  pytorch-linux-xenial-cuda8-cudnn7-py3)
-    CUDA_VERSION=8.0
-    CUDNN_VERSION=7
-    ANACONDA_PYTHON_VERSION=3.6
-    PROTOBUF=yes
-    DB=yes
-    VISION=yes
-    ;;
   pytorch-linux-xenial-cuda9-cudnn7-py2)
     CUDA_VERSION=9.0
     CUDNN_VERSION=7

diff --git a/.circleci/docker/common/install_conda.sh b/.circleci/docker/common/install_conda.sh
@@ -65,9 +65,7 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
   # DO NOT install cmake here as it would install a version newer than 3.5, but
   # we want to pin to version 3.5.
   conda_install numpy pyyaml mkl mkl-include setuptools cffi typing future six
-  if [[ "$CUDA_VERSION" == 8.0* ]]; then
-    conda_install magma-cuda80 -c pytorch
-  elif [[ "$CUDA_VERSION" == 9.0* ]]; then
+  if [[ "$CUDA_VERSION" == 9.0* ]]; then
     conda_install magma-cuda90 -c pytorch
   elif [[ "$CUDA_VERSION" == 9.1* ]]; then
     conda_install magma-cuda91 -c pytorch

diff --git a/.circleci/verbatim-sources/workflows-docker-builder.yml b/.circleci/verbatim-sources/workflows-docker-builder.yml
@@ -17,12 +17,6 @@
       - docker_build_job:
           name: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7"
           image_name: "pytorch-linux-xenial-cuda10.1-cudnn7-py3-gcc7"
-      - docker_build_job:
-          name: "pytorch-linux-xenial-cuda8-cudnn7-py2"
-          image_name: "pytorch-linux-xenial-cuda8-cudnn7-py2"
-      - docker_build_job:
-          name: "pytorch-linux-xenial-cuda8-cudnn7-py3"
-          image_name: "pytorch-linux-xenial-cuda8-cudnn7-py3"
       - docker_build_job:
           name: "pytorch-linux-xenial-cuda9-cudnn7-py2"
           image_name: "pytorch-linux-xenial-cuda9-cudnn7-py2"

diff --git a/.jenkins/caffe2/build.sh b/.jenkins/caffe2/build.sh
@@ -175,12 +175,6 @@ if [[ $BUILD_ENVIRONMENT == *rocm* ]]; then
   ${PYTHON} "${ROOT_DIR}/tools/amd_build/build_amd.py"
 fi
 
-# building bundled nccl in this config triggers a bug in nvlink. For
-# more, see https://github.com/pytorch/pytorch/issues/14486
-if [[ "${BUILD_ENVIRONMENT}" == *-cuda8*-cudnn7* ]]; then
-    build_args+=("USE_SYSTEM_NCCL=ON")
-fi
-
 # Try to include Redis support for Linux builds
 if [ "$(uname)" == "Linux" ]; then
   build_args+=("USE_REDIS=ON")

diff --git a/.jenkins/pytorch/multigpu-test.sh b/.jenkins/pytorch/multigpu-test.sh
@@ -20,7 +20,7 @@ if [ -n "${IN_CIRCLECI}" ]; then
     sudo apt-get install -y --allow-downgrades --allow-change-held-packages libnccl-dev=2.2.13-1+cuda9.0 libnccl2=2.2.13-1+cuda9.0
   fi
 
-  if [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda8-* ]] || [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda9-cudnn7-py2* ]]; then
+  if [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda9-cudnn7-py2* ]]; then
     # TODO: move this to Docker
     sudo apt-get update
     sudo apt-get install -y --allow-downgrades --allow-change-held-packages openmpi-bin libopenmpi-dev

diff --git a/.jenkins/pytorch/test.sh b/.jenkins/pytorch/test.sh
@@ -21,7 +21,7 @@ if [ -n "${IN_CIRCLECI}" ]; then
     sudo apt-get -qq install --allow-downgrades --allow-change-held-packages libnccl-dev=2.2.13-1+cuda9.0 libnccl2=2.2.13-1+cuda9.0
   fi
 
-  if [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda8-* ]] || [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda9-cudnn7-py2* ]]; then
+  if [[ "$BUILD_ENVIRONMENT" == *-xenial-cuda9-cudnn7-py2* ]]; then
     # TODO: move this to Docker
     sudo apt-get -qq update
     sudo apt-get -qq install --allow-downgrades --allow-change-held-packages openmpi-bin libopenmpi-dev

diff --git a/docker/caffe2/ubuntu-16.04-cuda8-cudnn6-all-options/Dockerfile b/docker/caffe2/ubuntu-16.04-cuda8-cudnn6-all-options/Dockerfile
diff --git a/docker/caffe2/ubuntu-16.04-cuda8-cudnn7-all-options/Dockerfile b/docker/caffe2/ubuntu-16.04-cuda8-cudnn7-all-options/Dockerfile