Remove cuda 11.1 references (#73514)
Summary:
Fixes : https://github.com/pytorch/pytorch/issues/73377
We've migrated to CUDA-11.3 as default toolkit in 1.9, it's time to stop builds (especially considering forward-compatibility guarantee across CUDA-11.x drivers)
Hence we are removing CUDA 11.1 support. We should also cleanup old cuda related code from our builder and pytorch repo making scripts a little more clean.
We have code that references cuda 9.2 , 10.1 , 11.0, 11.1, 11.2 and none of these are currently use
Pull Request resolved: https://github.com/pytorch/pytorch/pull/73514
Reviewed By: janeyx99
Differential Revision: D34551989
Pulled By: atalman
fbshipit-source-id: 9ceaaa9b25ad49689986f4b29a26d20370d9d011
(cherry picked from commit fe109c62daf429e9053c03f6e374568ba23cd041)
diff --git a/.circleci/docker/build.sh b/.circleci/docker/build.sh
index 448d8cb..dcd83f7 100755
--- a/.circleci/docker/build.sh
+++ b/.circleci/docker/build.sh
@@ -122,17 +122,6 @@
VISION=yes
KATEX=yes
;;
- pytorch-linux-xenial-cuda11.1-cudnn8-py3-gcc7)
- CUDA_VERSION=11.1
- CUDNN_VERSION=8
- ANACONDA_PYTHON_VERSION=3.7
- CMAKE_VERSION=3.10.3
- GCC_VERSION=7
- PROTOBUF=yes
- DB=yes
- VISION=yes
- KATEX=yes
- ;;
pytorch-linux-xenial-cuda11.3-cudnn8-py3-gcc7)
CUDA_VERSION=11.3.0 # Deviating from major.minor to conform to nvidia's Docker image names
CUDNN_VERSION=8
@@ -233,16 +222,6 @@
DB=yes
VISION=yes
;;
- pytorch-linux-bionic-cuda11.0-cudnn8-py3.7-gcc9)
- CUDA_VERSION=11.0
- CUDNN_VERSION=8
- ANACONDA_PYTHON_VERSION=3.7
- GCC_VERSION=9
- PROTOBUF=yes
- DB=yes
- VISION=yes
- ROCM_VERSION=3.9
- ;;
pytorch-linux-bionic-rocm4.3.1-py3.7)
ANACONDA_PYTHON_VERSION=3.7
GCC_VERSION=9
diff --git a/.circleci/scripts/binary_populate_env.sh b/.circleci/scripts/binary_populate_env.sh
index eab7c2b..ff503d5 100755
--- a/.circleci/scripts/binary_populate_env.sh
+++ b/.circleci/scripts/binary_populate_env.sh
@@ -91,11 +91,6 @@
USE_GOLD_LINKER="ON"
fi
-USE_WHOLE_CUDNN="OFF"
-# Link whole cuDNN for CUDA-11.1 to include fp16 fast kernels
-if [[ "$(uname)" == "Linux" && "${DESIRED_CUDA}" == "cu111" ]]; then
- USE_WHOLE_CUDNN="ON"
-fi
# Default to nightly, since that's where this normally uploads to
PIP_UPLOAD_FOLDER='nightly/'
@@ -184,7 +179,6 @@
export USE_GOLD_LINKER="${USE_GOLD_LINKER}"
export USE_GLOO_WITH_OPENSSL="ON"
-export USE_WHOLE_CUDNN="${USE_WHOLE_CUDNN}"
# =================== The above code will be executed inside Docker container ===================
EOL
diff --git a/.github/scripts/build_publish_nightly_docker.sh b/.github/scripts/build_publish_nightly_docker.sh
index 55c7645..3e953db 100644
--- a/.github/scripts/build_publish_nightly_docker.sh
+++ b/.github/scripts/build_publish_nightly_docker.sh
@@ -3,7 +3,7 @@
set -xeuo pipefail
PYTORCH_DOCKER_TAG=$(git describe --tags --always)-devel
-CUDA_VERSION=11.1
+CUDA_VERSION=11.3
# Build PyTorch nightly docker
make -f docker.Makefile \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c35212f..f8988f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,9 +202,6 @@
BUILD_NVFUSER_BENCHMARK "Build C++ binaries for nvfuser benchmarks" ON
"USE_CUDA;BUILD_TEST" OFF)
cmake_dependent_option(
- USE_WHOLE_CUDNN "Use whole-library linking for cuDNN" OFF
- "USE_STATIC_CUDNN" OFF)
-cmake_dependent_option(
USE_EXPERIMENTAL_CUDNN_V8_API "Use experimental cuDNN v8 API" OFF
"USE_CUDNN" OFF)
option(USE_FBGEMM "Use FBGEMM (quantized 8-bit server operators)" ON)
diff --git a/Dockerfile b/Dockerfile
index 57c5dae..e5065cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@
FROM conda as conda-installs
ARG PYTHON_VERSION=3.8
-ARG CUDA_VERSION=11.1
+ARG CUDA_VERSION=11.3
ARG CUDA_CHANNEL=nvidia
ARG INSTALL_CHANNEL=pytorch-nightly
ENV CONDA_OVERRIDE_CUDA=${CUDA_VERSION}
diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake
index 30d3b52..b2cd975 100644
--- a/cmake/public/cuda.cmake
+++ b/cmake/public/cuda.cmake
@@ -318,15 +318,9 @@
TARGET caffe2::cudnn-private PROPERTY INTERFACE_INCLUDE_DIRECTORIES
${CUDNN_INCLUDE_PATH})
if(CUDNN_STATIC AND NOT WIN32)
- if(USE_WHOLE_CUDNN)
- set_property(
- TARGET caffe2::cudnn-private PROPERTY INTERFACE_LINK_LIBRARIES
- "-Wl,--whole-archive,\"${CUDNN_LIBRARY_PATH}\" -Wl,--no-whole-archive")
- else()
- set_property(
- TARGET caffe2::cudnn-private PROPERTY INTERFACE_LINK_LIBRARIES
- ${CUDNN_LIBRARY_PATH})
- endif()
+ set_property(
+ TARGET caffe2::cudnn-private PROPERTY INTERFACE_LINK_LIBRARIES
+ ${CUDNN_LIBRARY_PATH})
set_property(
TARGET caffe2::cudnn-private APPEND PROPERTY INTERFACE_LINK_LIBRARIES
"${CUDA_TOOLKIT_ROOT_DIR}/lib64/libculibos.a" dl)
diff --git a/docker.Makefile b/docker.Makefile
index dc79425..11c438d 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -8,7 +8,7 @@
DOCKER_ORG = $(shell whoami)
endif
-CUDA_VERSION = 11.1
+CUDA_VERSION = 11.3
CUDNN_VERSION = 8
BASE_RUNTIME = ubuntu:18.04
BASE_DEVEL = nvidia/cuda:$(CUDA_VERSION)-cudnn$(CUDNN_VERSION)-devel-ubuntu18.04
