Skip to content

Commit 2432b6c

Browse files
ptrblckptrblck
authored
remove CUDA 11.6 builds (#1366)
* remove CUDA 11.6 builds * remove more 11.6 builds
1 parent 7b870ed commit 2432b6c

17 files changed

+9
-220
lines changed

‎.github/workflows/build-libtorch-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-22.04
2929
strategy:
3030
matrix:
31-
cuda_version: ["11.8", "11.7", "11.6"]
31+
cuda_version: ["11.8", "11.7"]
3232
env:
3333
GPU_ARCH_TYPE: cuda
3434
GPU_ARCH_VERSION: ${{ matrix.cuda_version }}

‎.github/workflows/build-manywheel-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-22.04
3131
strategy:
3232
matrix:
33-
cuda_version: ["11.8", "11.7", "11.6"]
33+
cuda_version: ["11.8", "11.7"]
3434
env:
3535
GPU_ARCH_TYPE: cuda
3636
GPU_ARCH_VERSION: ${{ matrix.cuda_version }}

‎CUDA_UPGRADE_GUIDE.MD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Here is the supported matrix for CUDA and CUDNN
99

1010
| CUDA | CUDNN | additional details |
1111
| --- | --- | --- |
12-
| 11.6 | 8.3.2.44 | Stable CUDA Release |
13-
| 11.7 | 8.5.0.96 | Latest CUDA Release |
12+
| 11.7 | 8.5.0.96 | Stable CUDA Release |
13+
| 11.8 | 8.7.0.84 | Latest CUDA Release |
1414

1515

1616
### B. Check the package availability

‎common/install_cuda.sh

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,6 @@
22

33
set -ex
44

5-
function install_116 {
6-
echo "Installing CUDA 11.6 and CuDNN 8.3"
7-
rm -rf /usr/local/cuda-11.6 /usr/local/cuda
8-
# install CUDA 11.6.2 in the same container
9-
wget -q https://developer.download.nvidia.com/compute/cuda/11.6.2/local_installers/cuda_11.6.2_510.47.03_linux.run
10-
chmod +x cuda_11.6.2_510.47.03_linux.run
11-
./cuda_11.6.2_510.47.03_linux.run --toolkit --silent
12-
rm -f cuda_11.6.2_510.47.03_linux.run
13-
rm -f /usr/local/cuda && ln -s /usr/local/cuda-11.6 /usr/local/cuda
14-
15-
# cuDNN license: https://developer.nvidia.com/cudnn/license_agreement
16-
mkdir tmp_cudnn && cd tmp_cudnn
17-
wget -q https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.2/local_installers/11.5/cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive.tar.xz -O cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive.tar.xz
18-
tar xf cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive.tar.xz
19-
cp -a cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive/include/* /usr/local/cuda/include/
20-
cp -a cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive/lib/* /usr/local/cuda/lib64/
21-
cd ..
22-
rm -rf tmp_cudnn
23-
ldconfig
24-
}
25-
265
function install_117 {
276
echo "Installing CUDA 11.7 and CuDNN 8.5 and NCCL 2.14"
287
rm -rf /usr/local/cuda-11.7 /usr/local/cuda
@@ -116,37 +95,6 @@ function install_121 {
11695
ldconfig
11796
}
11897

119-
function prune_116 {
120-
echo "Pruning CUDA 11.6 and CuDNN"
121-
#####################################################################################
122-
# CUDA 11.6 prune static libs
123-
#####################################################################################
124-
export NVPRUNE="/usr/local/cuda-11.6/bin/nvprune"
125-
export CUDA_LIB_DIR="/usr/local/cuda-11.6/lib64"
126-
127-
export GENCODE="-gencode arch=compute_35,code=sm_35 -gencode arch=compute_50,code=sm_50 -gencode arch=compute_60,code=sm_60 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86"
128-
export GENCODE_CUDNN="-gencode arch=compute_35,code=sm_35 -gencode arch=compute_37,code=sm_37 -gencode arch=compute_50,code=sm_50 -gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86"
129-
130-
if [[ -n "$OVERRIDE_GENCODE" ]]; then
131-
export GENCODE=$OVERRIDE_GENCODE
132-
fi
133-
134-
# all CUDA libs except CuDNN and CuBLAS (cudnn and cublas need arch 3.7 included)
135-
ls $CUDA_LIB_DIR/ | grep "\.a" | grep -v "culibos" | grep -v "cudart" | grep -v "cudnn" | grep -v "cublas" | grep -v "metis" \
136-
| xargs -I {} bash -c \
137-
"echo {} && $NVPRUNE $GENCODE $CUDA_LIB_DIR/{} -o $CUDA_LIB_DIR/{}"
138-
139-
# prune CuDNN and CuBLAS
140-
$NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublas_static.a -o $CUDA_LIB_DIR/libcublas_static.a
141-
$NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublasLt_static.a -o $CUDA_LIB_DIR/libcublasLt_static.a
142-
143-
#####################################################################################
144-
# CUDA 11.6 prune visual tools
145-
#####################################################################################
146-
export CUDA_BASE="/usr/local/cuda-11.6/"
147-
rm -rf $CUDA_BASE/libnvvp $CUDA_BASE/nsightee_plugins $CUDA_BASE/nsight-compute-2022.1.1 $CUDA_BASE/nsight-systems-2021.5.2
148-
}
149-
15098
function prune_117 {
15199
echo "Pruning CUDA 11.7 and CuDNN"
152100
#####################################################################################
@@ -172,7 +120,7 @@ function prune_117 {
172120
$NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublasLt_static.a -o $CUDA_LIB_DIR/libcublasLt_static.a
173121

174122
#####################################################################################
175-
# CUDA 11.6 prune visual tools
123+
# CUDA 11.7 prune visual tools
176124
#####################################################################################
177125
export CUDA_BASE="/usr/local/cuda-11.7/"
178126
rm -rf $CUDA_BASE/libnvvp $CUDA_BASE/nsightee_plugins $CUDA_BASE/nsight-compute-2022.2.0 $CUDA_BASE/nsight-systems-2022.1.3
@@ -244,8 +192,6 @@ function prune_121 {
244192
while test $# -gt 0
245193
do
246194
case "$1" in
247-
11.6) install_116; prune_116
248-
;;
249195
11.7) install_117; prune_117
250196
;;
251197
11.8) install_118; prune_118

‎conda/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ ENV CUDA_HOME=/usr/local/cuda-${CUDA_VERSION}
4848
# Make things in our path by default
4949
ENV PATH=/usr/local/cuda-${CUDA_VERSION}/bin:$PATH
5050

51-
FROM cuda as cuda11.6
52-
RUN bash ./install_cuda.sh 11.6
53-
ENV DESIRED_CUDA=11.6
54-
5551
FROM cuda as cuda11.7
5652
RUN bash ./install_cuda.sh 11.7
5753
ENV DESIRED_CUDA=11.7
@@ -70,7 +66,6 @@ ADD ./common/install_mnist.sh install_mnist.sh
7066
RUN bash ./install_mnist.sh
7167

7268
FROM base as all_cuda
73-
COPY --from=cuda11.6 /usr/local/cuda-11.6 /usr/local/cuda-11.6
7469
COPY --from=cuda11.7 /usr/local/cuda-11.7 /usr/local/cuda-11.7
7570
COPY --from=cuda11.8 /usr/local/cuda-11.8 /usr/local/cuda-11.8
7671
COPY --from=cuda12.1 /usr/local/cuda-12.1 /usr/local/cuda-12.1

‎conda/build_pytorch.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,6 @@ else
271271
elif [[ "$desired_cuda" == "11.7" ]]; then
272272
export CONDA_CUDATOOLKIT_CONSTRAINT=" - pytorch-cuda >=11.7,<11.8 # [not osx]"
273273
export MAGMA_PACKAGE=" - magma-cuda117 # [not osx and not win]"
274-
elif [[ "$desired_cuda" == "11.6" ]]; then
275-
export CONDA_CUDATOOLKIT_CONSTRAINT=" - pytorch-cuda >=11.6,<11.7 # [not osx]"
276-
export MAGMA_PACKAGE=" - magma-cuda116 # [not osx and not win]"
277274
else
278275
echo "unhandled desired_cuda: $desired_cuda"
279276
exit 1

‎conda/pytorch-cuda/conda_build_config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
version:
2-
- 11.6
32
- 11.7
43
- 11.8
54
target_platform:

‎conda/pytorch-cuda/meta.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@
1212
# https://conda.anaconda.org/pytorch/noarch/
1313
# https://conda.anaconda.org/pytorch/noarch/repodata.json
1414
{% set build = 3 %}
15-
{% set cuda_constraints=">=11.6,<11.7" %}
16-
{% set libcufft_constraints=">=10.7.0.55,<10.7.2.50" %}
17-
{% set libcublas_constraints=">=11.8.1.74,<11.10.1.25" %}
18-
{% set libcusolver_constraints=">=11.3.2.55,<11.3.5.50" %}
19-
{% set libcusparse_constraints=">=11.7.1.55,<11.7.3.50" %}
20-
{% set libnpp_constraints=">=11.6.0.55,<11.7.3.21" %}
21-
{% set libnvjpeg_constraints=">=11.6.0.55,<11.7.2.34" %}
22-
{% if version == '11.7' %}
2315
{% set cuda_constraints=">=11.7,<11.8" %}
2416
{% set libcufft_constraints=">=10.7.2.50,<10.9.0.58" %}
2517
{% set libcublas_constraints=">=11.10.1.25,<11.11.3.6" %}

‎conda/pytorch-nightly/bld.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ set CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%desired_cuda%
2121
set CUDA_BIN_PATH=%CUDA_PATH%\bin
2222
set TORCH_NVCC_FLAGS=-Xfatbin -compress-all
2323
set TORCH_CUDA_ARCH_LIST=3.7+PTX;5.0;6.0;6.1;7.0;7.5;8.0;8.6
24-
if "%desired_cuda%" == "11.5" (
25-
set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2
26-
)
27-
if "%desired_cuda%" == "11.6" (
28-
set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2
29-
)
3024
if "%desired_cuda%" == "11.7" (
3125
set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2
3226
)

‎conda/pytorch-nightly/build.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,7 @@ if [[ -n "$build_with_cuda" ]]; then
5555
TORCH_CUDA_ARCH_LIST="3.7+PTX;5.0"
5656
export USE_STATIC_CUDNN=1 # links cudnn statically (driven by tools/setup_helpers/cudnn.py)
5757

58-
if [[ $CUDA_VERSION == 11.6* ]]; then
59-
TORCH_CUDA_ARCH_LIST="$TORCH_CUDA_ARCH_LIST;6.0;6.1;7.0;7.5;8.0;8.6"
60-
#for cuda 11.5 we use cudnn 8.3.2.44 https://docs.nvidia.com/deeplearning/cudnn/release-notes/rel_8.html
61-
#which does not have single static libcudnn_static.a deliverable to link with
62-
export USE_STATIC_CUDNN=0
63-
#for cuda 11.5 include all dynamic loading libraries
64-
DEPS_LIST=(/usr/local/cuda/lib64/libcudnn*.so.8 /usr/local/cuda-11.6/extras/CUPTI/lib64/libcupti.so.11.6)
65-
elif [[ $CUDA_VERSION == 11.7* ]]; then
58+
if [[ $CUDA_VERSION == 11.7* ]]; then
6659
TORCH_CUDA_ARCH_LIST="$TORCH_CUDA_ARCH_LIST;6.0;6.1;7.0;7.5;8.0;8.6"
6760
#for cuda 11.7 we use cudnn 8.5
6861
#which does not have single static libcudnn_static.a deliverable to link with

‎libtorch/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ ADD ./common/install_conda.sh install_conda.sh
4444
RUN bash ./install_conda.sh && rm install_conda.sh
4545
RUN /opt/conda/bin/conda install -y cmake=3.18
4646

47-
FROM cuda as cuda11.6
48-
RUN bash ./install_cuda.sh 11.6
49-
RUN bash ./install_magma.sh 11.6
50-
5147
FROM cuda as cuda11.7
5248
RUN bash ./install_cuda.sh 11.7
5349
RUN bash ./install_magma.sh 11.7

‎libtorch/build_all_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eou pipefail
44

55
TOPDIR=$(git rev-parse --show-toplevel)
66

7-
for cuda_version in 11.8 11.7 11.6; do
7+
for cuda_version in 11.8 11.7; do
88
GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/libtorch/build_docker.sh"
99
done
1010

‎manywheel/build_all_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MANYLINUX_VERSION=2014 GPU_ARCH_TYPE=cpu "${TOPDIR}/manywheel/build_docker.sh"
99

1010
GPU_ARCH_TYPE=cpu-cxx11-abi "${TOPDIR}/manywheel/build_docker.sh"
1111

12-
for cuda_version in 11.7 11.6; do
12+
for cuda_version in 11.8 11.7; do
1313
GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/manywheel/build_docker.sh"
1414
MANYLINUX_VERSION=2014 GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/manywheel/build_docker.sh"
1515
done

‎manywheel/build_cuda.sh

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -108,41 +108,7 @@ elif [[ "$OS_NAME" == *"Ubuntu"* ]]; then
108108
LIBGOMP_PATH="/usr/lib/x86_64-linux-gnu/libgomp.so.1"
109109
fi
110110

111-
if [[ $CUDA_VERSION == "11.6" ]]; then
112-
export USE_STATIC_CUDNN=0
113-
DEPS_LIST=(
114-
"/usr/local/cuda/lib64/libcudart.so.11.0"
115-
"/usr/local/cuda/lib64/libnvToolsExt.so.1"
116-
"/usr/local/cuda/lib64/libnvrtc.so.11.2" # this is not a mistake for 11.6
117-
"/usr/local/cuda/lib64/libnvrtc-builtins.so.11.6"
118-
"/usr/local/cuda/lib64/libcudnn_adv_infer.so.8"
119-
"/usr/local/cuda/lib64/libcudnn_adv_train.so.8"
120-
"/usr/local/cuda/lib64/libcudnn_cnn_infer.so.8"
121-
"/usr/local/cuda/lib64/libcudnn_cnn_train.so.8"
122-
"/usr/local/cuda/lib64/libcudnn_ops_infer.so.8"
123-
"/usr/local/cuda/lib64/libcudnn_ops_train.so.8"
124-
"/usr/local/cuda/lib64/libcudnn.so.8"
125-
"/usr/local/cuda/lib64/libcublas.so.11"
126-
"/usr/local/cuda/lib64/libcublasLt.so.11"
127-
"$LIBGOMP_PATH"
128-
)
129-
DEPS_SONAME=(
130-
"libcudart.so.11.0"
131-
"libnvToolsExt.so.1"
132-
"libnvrtc.so.11.2"
133-
"libnvrtc-builtins.so.11.6"
134-
"libcudnn_adv_infer.so.8"
135-
"libcudnn_adv_train.so.8"
136-
"libcudnn_cnn_infer.so.8"
137-
"libcudnn_cnn_train.so.8"
138-
"libcudnn_ops_infer.so.8"
139-
"libcudnn_ops_train.so.8"
140-
"libcudnn.so.8"
141-
"libcublas.so.11"
142-
"libcublasLt.so.11"
143-
"libgomp.so.1"
144-
)
145-
elif [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then
111+
if [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then
146112
export USE_STATIC_CUDNN=0
147113
# Try parallelizing nvcc as well
148114
export TORCH_NVCC_FLAGS="-Xfatbin -compress-all --threads 2"

‎windows/cuda116.bat

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎windows/internal/cuda_install.bat

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,40 +19,12 @@ set CUDNN_LIB_FOLDER="lib\x64"
1919
:: Skip all of this if we already have cuda installed
2020
if exist "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\bin\nvcc.exe" goto set_cuda_env_vars
2121

22-
if %CUDA_VER% EQU 116 goto cuda116
2322
if %CUDA_VER% EQU 117 goto cuda117
2423
if %CUDA_VER% EQU 118 goto cuda118
2524

2625
echo CUDA %CUDA_VERSION_STR% is not supported
2726
exit /b 1
2827

29-
:cuda116
30-
31-
set CUDA_INSTALL_EXE=cuda_11.6.0_511.23_windows.exe
32-
if not exist "%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%" (
33-
curl -k -L "https://ossci-windows.s3.amazonaws.com/%CUDA_INSTALL_EXE%" --output "%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%"
34-
if errorlevel 1 exit /b 1
35-
set "CUDA_SETUP_FILE=%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%"
36-
set "ARGS=thrust_11.6 nvcc_11.6 cuobjdump_11.6 nvprune_11.6 nvprof_11.6 cupti_11.6 cublas_11.6 cublas_dev_11.6 cudart_11.6 cufft_11.6 cufft_dev_11.6 curand_11.6 curand_dev_11.6 cusolver_11.6 cusolver_dev_11.6 cusparse_11.6 cusparse_dev_11.6 npp_11.6 npp_dev_11.6 nvrtc_11.6 nvrtc_dev_11.6 nvml_dev_11.6"
37-
)
38-
39-
set CUDNN_FOLDER=cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive
40-
set CUDNN_LIB_FOLDER="lib"
41-
set "CUDNN_INSTALL_ZIP=%CUDNN_FOLDER%.zip"
42-
if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" (
43-
curl -k -L "http://s3.amazonaws.com/ossci-windows/%CUDNN_INSTALL_ZIP%" --output "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%"
44-
if errorlevel 1 exit /b 1
45-
set "CUDNN_SETUP_FILE=%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%"
46-
)
47-
48-
@REM Cuda 8.3+ required zlib to be installed on the path
49-
echo Installing ZLIB dlls
50-
curl -k -L "http://s3.amazonaws.com/ossci-windows/zlib123dllx64.zip" --output "%SRC_DIR%\temp_build\zlib123dllx64.zip"
51-
7z x "%SRC_DIR%\temp_build\zlib123dllx64.zip" -o"%SRC_DIR%\temp_build\zlib"
52-
xcopy /Y "%SRC_DIR%\temp_build\zlib\dll_x64\*.dll" "C:\Windows\System32"
53-
54-
goto cuda_common
55-
5628
:cuda117
5729

5830
set CUDA_INSTALL_EXE=cuda_11.7.0_516.01_windows.exe

‎windows/internal/smoke_test.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ set "CONDA_HOME=%CD%\conda"
6565
set "tmp_conda=%CONDA_HOME%"
6666
set "miniconda_exe=%CD%\miniconda.exe"
6767
set "CONDA_EXTRA_ARGS=cpuonly -c pytorch-nightly"
68-
if "%CUDA_VERSION%" == "116" (
69-
set "CONDA_EXTRA_ARGS=pytorch-cuda=11.6 -c nvidia -c pytorch-nightly"
70-
)
7168
if "%CUDA_VERSION%" == "117" (
7269
set "CONDA_EXTRA_ARGS=pytorch-cuda=11.7 -c nvidia -c pytorch-nightly"
7370
)

0 commit comments

Comments
 (0)