Skip to content

Commit 7c3c510

Browse files
ptrblckptrblck
committed
remove more 11.6 builds
1 parent cb84e6f commit 7c3c510

File tree

14 files changed

+6
-128
lines changed

14 files changed

+6
-128
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 }}

‎common/install_cuda.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function prune_117 {
120120
$NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublasLt_static.a -o $CUDA_LIB_DIR/libcublasLt_static.a
121121

122122
#####################################################################################
123-
# CUDA 11.6 prune visual tools
123+
# CUDA 11.7 prune visual tools
124124
#####################################################################################
125125
export CUDA_BASE="/usr/local/cuda-11.7/"
126126
rm -rf $CUDA_BASE/libnvvp $CUDA_BASE/nsightee_plugins $CUDA_BASE/nsight-compute-2022.2.0 $CUDA_BASE/nsight-systems-2022.1.3

‎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
)

‎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/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)