Skip to content

Commit 9fa63ce

Browse files
ptrblckptrblck
authored
Remove CUDA 11.7 builds (#1408)
* remove CUDA 11.7 builds * remove CUDA 11.7 from MAGMA builds * add pytorch-cuda back for 11.7 * add 11.7 back to pytorch-cuda
1 parent bc35eba commit 9fa63ce

20 files changed

+16
-218
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-22.04
2727
strategy:
2828
matrix:
29-
cuda_version: ["11.7", "11.8", "12.1", "cpu"]
29+
cuda_version: ["11.8", "12.1", "cpu"]
3030
env:
3131
CUDA_VERSION: ${{ matrix.cuda_version }}
3232
steps:

‎.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: ["12.1", "11.8", "11.7"]
31+
cuda_version: ["12.1", "11.8"]
3232
env:
3333
GPU_ARCH_TYPE: cuda
3434
GPU_ARCH_VERSION: ${{ matrix.cuda_version }}

‎.github/workflows/build-magma-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: linux.2xlarge
3131
strategy:
3232
matrix:
33-
cuda_version: ["121", "118", "117"]
33+
cuda_version: ["121", "118"]
3434
steps:
3535
- name: Checkout PyTorch builder
3636
uses: actions/checkout@v3

‎.github/workflows/build-magma-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: windows-2019
1818
strategy:
1919
matrix:
20-
cuda_version: ["121", "118", "117"]
20+
cuda_version: ["121", "118"]
2121
config: ["Release", "Debug"]
2222
env:
2323
CUDA_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: ["12.1", "11.8", "11.7"]
33+
cuda_version: ["12.1", "11.8"]
3434
env:
3535
GPU_ARCH_TYPE: cuda
3636
GPU_ARCH_VERSION: ${{ matrix.cuda_version }}

‎common/install_cuda.sh

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,6 @@
22

33
set -ex
44

5-
function install_117 {
6-
echo "Installing CUDA 11.7 and CuDNN 8.5 and NCCL 2.14"
7-
rm -rf /usr/local/cuda-11.7 /usr/local/cuda
8-
# install CUDA 11.7.0 in the same container
9-
wget -q https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run
10-
chmod +x cuda_11.7.0_515.43.04_linux.run
11-
./cuda_11.7.0_515.43.04_linux.run --toolkit --silent
12-
rm -f cuda_11.7.0_515.43.04_linux.run
13-
rm -f /usr/local/cuda && ln -s /usr/local/cuda-11.7 /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://ossci-linux.s3.amazonaws.com/cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz -O cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz
18-
tar xf cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz
19-
cp -a cudnn-linux-x86_64-8.5.0.96_cuda11-archive/include/* /usr/local/cuda/include/
20-
cp -a cudnn-linux-x86_64-8.5.0.96_cuda11-archive/lib/* /usr/local/cuda/lib64/
21-
cd ..
22-
rm -rf tmp_cudnn
23-
ldconfig
24-
25-
# NCCL license: https://docs.nvidia.com/deeplearning/nccl/#licenses
26-
mkdir tmp_nccl && cd tmp_nccl
27-
wget -q https://developer.download.nvidia.com/compute/redist/nccl/v2.14/nccl_2.14.3-1+cuda11.7_x86_64.txz
28-
tar xf nccl_2.14.3-1+cuda11.7_x86_64.txz
29-
cp -a nccl_2.14.3-1+cuda11.7_x86_64/include/* /usr/local/cuda/include/
30-
cp -a nccl_2.14.3-1+cuda11.7_x86_64/lib/* /usr/local/cuda/lib64/
31-
cd ..
32-
rm -rf tmp_nccl
33-
ldconfig
34-
}
35-
365
function install_118 {
376
echo "Installing CUDA 11.8 and cuDNN 8.7 and NCCL 2.15"
387
rm -rf /usr/local/cuda-11.8 /usr/local/cuda
@@ -95,37 +64,6 @@ function install_121 {
9564
ldconfig
9665
}
9766

98-
function prune_117 {
99-
echo "Pruning CUDA 11.7 and CuDNN"
100-
#####################################################################################
101-
# CUDA 11.7 prune static libs
102-
#####################################################################################
103-
export NVPRUNE="/usr/local/cuda-11.7/bin/nvprune"
104-
export CUDA_LIB_DIR="/usr/local/cuda-11.7/lib64"
105-
106-
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"
107-
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"
108-
109-
if [[ -n "$OVERRIDE_GENCODE" ]]; then
110-
export GENCODE=$OVERRIDE_GENCODE
111-
fi
112-
113-
# all CUDA libs except CuDNN and CuBLAS (cudnn and cublas need arch 3.7 included)
114-
ls $CUDA_LIB_DIR/ | grep "\.a" | grep -v "culibos" | grep -v "cudart" | grep -v "cudnn" | grep -v "cublas" | grep -v "metis" \
115-
| xargs -I {} bash -c \
116-
"echo {} && $NVPRUNE $GENCODE $CUDA_LIB_DIR/{} -o $CUDA_LIB_DIR/{}"
117-
118-
# prune CuDNN and CuBLAS
119-
$NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublas_static.a -o $CUDA_LIB_DIR/libcublas_static.a
120-
$NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublasLt_static.a -o $CUDA_LIB_DIR/libcublasLt_static.a
121-
122-
#####################################################################################
123-
# CUDA 11.7 prune visual tools
124-
#####################################################################################
125-
export CUDA_BASE="/usr/local/cuda-11.7/"
126-
rm -rf $CUDA_BASE/libnvvp $CUDA_BASE/nsightee_plugins $CUDA_BASE/nsight-compute-2022.2.0 $CUDA_BASE/nsight-systems-2022.1.3
127-
}
128-
12967
function prune_118 {
13068
echo "Pruning CUDA 11.8 and cuDNN"
13169
#####################################################################################
@@ -192,8 +130,6 @@ function prune_121 {
192130
while test $# -gt 0
193131
do
194132
case "$1" in
195-
11.7) install_117; prune_117
196-
;;
197133
11.8) install_118; prune_118
198134
;;
199135
12.1) install_121; prune_121

‎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.7
52-
RUN bash ./install_cuda.sh 11.7
53-
ENV DESIRED_CUDA=11.7
54-
5551
FROM cuda as cuda11.8
5652
RUN bash ./install_cuda.sh 11.8
5753
ENV DESIRED_CUDA=11.8
@@ -66,7 +62,6 @@ ADD ./common/install_mnist.sh install_mnist.sh
6662
RUN bash ./install_mnist.sh
6763

6864
FROM base as all_cuda
69-
COPY --from=cuda11.7 /usr/local/cuda-11.7 /usr/local/cuda-11.7
7065
COPY --from=cuda11.8 /usr/local/cuda-11.8 /usr/local/cuda-11.8
7166
COPY --from=cuda12.1 /usr/local/cuda-12.1 /usr/local/cuda-12.1
7267

‎conda/build_all_docker.sh

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

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

7-
for CUDA_VERSION in 12.1 11.8 11.7 cpu; do
7+
for CUDA_VERSION in 12.1 11.8 cpu; do
88
CUDA_VERSION="${CUDA_VERSION}" conda/build_docker.sh
99
done

‎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.8" ]]; then
272272
export CONDA_CUDATOOLKIT_CONSTRAINT=" - pytorch-cuda >=11.8,<11.9 # [not osx]"
273273
export MAGMA_PACKAGE=" - magma-cuda118 # [not osx and not win]"
274-
elif [[ "$desired_cuda" == "11.7" ]]; then
275-
export CONDA_CUDATOOLKIT_CONSTRAINT=" - pytorch-cuda >=11.7,<11.8 # [not osx]"
276-
export MAGMA_PACKAGE=" - magma-cuda117 # [not osx and not win]"
277274
else
278275
echo "unhandled desired_cuda: $desired_cuda"
279276
exit 1

‎conda/pytorch-nightly/bld.bat

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +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=5.0;6.0;6.1;7.0;7.5;8.0;8.6
24-
if "%desired_cuda%" == "11.7" (
25-
set TORCH_CUDA_ARCH_LIST=%TORCH_CUDA_ARCH_LIST%;3.7+PTX
26-
set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2
27-
)
2824
if "%desired_cuda%" == "11.8" (
2925
set TORCH_CUDA_ARCH_LIST=%TORCH_CUDA_ARCH_LIST%;3.7+PTX;9.0
3026
set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2

‎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="5.0;6.0;6.1;7.0;7.5;8.0;8.6"
5656
export USE_STATIC_CUDNN=1 # links cudnn statically (driven by tools/setup_helpers/cudnn.py)
5757

58-
if [[ $CUDA_VERSION == 11.7* ]]; then
59-
TORCH_CUDA_ARCH_LIST="$TORCH_CUDA_ARCH_LIST;3.7+PTX"
60-
#for cuda 11.7 we use cudnn 8.5
61-
#which does not have single static libcudnn_static.a deliverable to link with
62-
export USE_STATIC_CUDNN=0
63-
#for cuda 11.7 include all dynamic loading libraries
64-
DEPS_LIST=(/usr/local/cuda/lib64/libcudnn*.so.8 /usr/local/cuda-11.7/extras/CUPTI/lib64/libcupti.so.11.7)
65-
elif [[ $CUDA_VERSION == 11.8* ]]; then
58+
if [[ $CUDA_VERSION == 11.8* ]]; then
6659
TORCH_CUDA_ARCH_LIST="$TORCH_CUDA_ARCH_LIST;3.7+PTX;9.0"
6760
#for cuda 11.8 we use cudnn 8.7
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.7
48-
RUN bash ./install_cuda.sh 11.7
49-
RUN bash ./install_magma.sh 11.7
50-
5147
FROM cuda as cuda11.8
5248
RUN bash ./install_cuda.sh 11.8
5349
RUN bash ./install_magma.sh 11.8

‎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 12.1 11.8 11.7; do
7+
for cuda_version in 12.1 11.8; do
88
GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/libtorch/build_docker.sh"
99
done
1010

‎magma/Makefile

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
SHELL=/usr/bin/env bash
22

3-
DESIRED_CUDA ?= 11.7
4-
PACKAGE_NAME ?= magma-cuda117
5-
CUDA_ARCH_LIST ?= -gencode arch=compute_50,code=sm_50 -gencode arch=compute_60,code=sm_60 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86
3+
DESIRED_CUDA ?= 11.8
4+
PACKAGE_NAME ?= magma-cuda118
5+
CUDA_ARCH_LIST ?= -gencode arch=compute_50,code=sm_50 -gencode arch=compute_60,code=sm_60 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86 -gencode arch=compute_90,code=sm_90
66

77
DOCKER_RUN = set -eou pipefail; docker run --rm -i \
88
-v $(shell git rev-parse --show-toplevel):/builder \
@@ -16,7 +16,6 @@ DOCKER_RUN = set -eou pipefail; docker run --rm -i \
1616
.PHONY: all
1717
all: magma-cuda121
1818
all: magma-cuda118
19-
all: magma-cuda117
2019

2120
.PHONY:
2221
clean:
@@ -26,21 +25,13 @@ clean:
2625
.PHONY: magma-cuda121
2726
magma-cuda121: DESIRED_CUDA := 12.1
2827
magma-cuda121: PACKAGE_NAME := magma-cuda121
29-
magma-cuda121: CUDA_ARCH_LIST += -gencode arch=compute_90,code=sm_90
3028
magma-cuda121:
3129
$(DOCKER_RUN)
3230

3331
.PHONY: magma-cuda118
3432
magma-cuda118: DESIRED_CUDA := 11.8
3533
magma-cuda118: PACKAGE_NAME := magma-cuda118
36-
magma-cuda118: CUDA_ARCH_LIST += -gencode arch=compute_37,code=sm_37 -gencode arch=compute_90,code=sm_90
34+
magma-cuda118: CUDA_ARCH_LIST += -gencode arch=compute_37,code=sm_37
3735
magma-cuda118:
3836
$(DOCKER_RUN)
3937

40-
.PHONY: magma-cuda117
41-
magma-cuda117: DESIRED_CUDA := 11.7
42-
magma-cuda117: PACKAGE_NAME := magma-cuda117
43-
magma-cuda117: CUDA_ARCH_LIST += -gencode arch=compute_37,code=sm_37
44-
magma-cuda117:
45-
$(DOCKER_RUN)
46-

‎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.8 11.7; do
12+
for cuda_version in 12.1 11.8; 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: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ if [[ $CUDA_VERSION == "12.1" ]]; then
182182
export NCCL_INCLUDE_DIR="/usr/local/cuda/include/"
183183
export NCCL_LIB_DIR="/usr/local/cuda/lib64/"
184184
fi
185-
elif [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then
185+
elif [[ $CUDA_VERSION == "11.8" ]]; then
186186
export USE_STATIC_CUDNN=0
187187
# Try parallelizing nvcc as well
188188
export TORCH_NVCC_FLAGS="-Xfatbin -compress-all --threads 2"
@@ -208,6 +208,7 @@ elif [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then
208208
"/usr/local/cuda/lib64/libcudart.so.11.0"
209209
"/usr/local/cuda/lib64/libnvToolsExt.so.1"
210210
"/usr/local/cuda/lib64/libnvrtc.so.11.2" # this is not a mistake, it links to more specific cuda version
211+
"/usr/local/cuda/lib64/libnvrtc-builtins.so.11.8"
211212
)
212213
DEPS_SONAME+=(
213214
"libcudnn_adv_infer.so.8"
@@ -222,23 +223,8 @@ elif [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then
222223
"libcudart.so.11.0"
223224
"libnvToolsExt.so.1"
224225
"libnvrtc.so.11.2"
226+
"libnvrtc-builtins.so.11.8"
225227
)
226-
if [[ $CUDA_VERSION == "11.7" ]]; then
227-
DEPS_LIST+=(
228-
"/usr/local/cuda/lib64/libnvrtc-builtins.so.11.7"
229-
)
230-
DEPS_SONAME+=(
231-
"libnvrtc-builtins.so.11.7"
232-
)
233-
fi
234-
if [[ $CUDA_VERSION == "11.8" ]]; then
235-
DEPS_LIST+=(
236-
"/usr/local/cuda/lib64/libnvrtc-builtins.so.11.8"
237-
)
238-
DEPS_SONAME+=(
239-
"libnvrtc-builtins.so.11.8"
240-
)
241-
fi
242228
else
243229
echo "Using nvidia libs from pypi."
244230
CUDA_RPATHS=(

‎windows/cuda117.bat

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

‎windows/internal/build_magma.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ if "%CUVER_NODOT%" == "121" (
4141
if "%CUVER_NODOT%" == "118" (
4242
set CUDA_ARCH_LIST= -gencode arch=compute_37,code=sm_37 -gencode arch=compute_50,code=sm_50 -gencode arch=compute_60,code=sm_60 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86 -gencode arch=compute_90,code=sm_90
4343
)
44-
if "%CUVER_NODOT%" == "117" (
45-
set CUDA_ARCH_LIST= -gencode arch=compute_37,code=sm_37 -gencode arch=compute_50,code=sm_50 -gencode arch=compute_60,code=sm_60 -gencode arch=compute_70,code=sm_70 -gencode arch=compute_80,code=sm_80 -gencode arch=compute_86,code=sm_86
46-
)
4744

4845
set CC=cl.exe
4946
set CXX=cl.exe

0 commit comments

Comments
 (0)