From 7c3c51079cfc309bc26bdffe15adcc7a590ea6f6 Mon Sep 17 00:00:00 2001 From: pbialecki Date: Wed, 29 Mar 2023 02:09:30 -0700 Subject: [PATCH] remove more 11.6 builds --- .github/workflows/build-libtorch-images.yml | 2 +- .github/workflows/build-manywheel-images.yml | 2 +- common/install_cuda.sh | 2 +- conda/Dockerfile | 5 -- conda/build_pytorch.sh | 3 - conda/pytorch-cuda/conda_build_config.yaml | 1 - conda/pytorch-cuda/meta.yaml | 8 --- conda/pytorch-nightly/bld.bat | 6 -- libtorch/Dockerfile | 4 -- libtorch/build_all_docker.sh | 2 +- manywheel/build_all_docker.sh | 2 +- manywheel/build_cuda.sh | 36 +----------- windows/cuda116.bat | 58 -------------------- windows/internal/smoke_test.bat | 3 - 14 files changed, 6 insertions(+), 128 deletions(-) delete mode 100644 windows/cuda116.bat diff --git a/.github/workflows/build-libtorch-images.yml b/.github/workflows/build-libtorch-images.yml index 49069557a..e2493679a 100644 --- a/.github/workflows/build-libtorch-images.yml +++ b/.github/workflows/build-libtorch-images.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - cuda_version: ["11.8", "11.7", "11.6"] + cuda_version: ["11.8", "11.7"] env: GPU_ARCH_TYPE: cuda GPU_ARCH_VERSION: ${{ matrix.cuda_version }} diff --git a/.github/workflows/build-manywheel-images.yml b/.github/workflows/build-manywheel-images.yml index 153f501bc..18511f027 100644 --- a/.github/workflows/build-manywheel-images.yml +++ b/.github/workflows/build-manywheel-images.yml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - cuda_version: ["11.8", "11.7", "11.6"] + cuda_version: ["11.8", "11.7"] env: GPU_ARCH_TYPE: cuda GPU_ARCH_VERSION: ${{ matrix.cuda_version }} diff --git a/common/install_cuda.sh b/common/install_cuda.sh index cc34adc67..ca432678d 100644 --- a/common/install_cuda.sh +++ b/common/install_cuda.sh @@ -120,7 +120,7 @@ function prune_117 { $NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublasLt_static.a -o $CUDA_LIB_DIR/libcublasLt_static.a ##################################################################################### - # CUDA 11.6 prune visual tools + # CUDA 11.7 prune visual tools ##################################################################################### export CUDA_BASE="/usr/local/cuda-11.7/" rm -rf $CUDA_BASE/libnvvp $CUDA_BASE/nsightee_plugins $CUDA_BASE/nsight-compute-2022.2.0 $CUDA_BASE/nsight-systems-2022.1.3 diff --git a/conda/Dockerfile b/conda/Dockerfile index a58a28511..5954f5b13 100644 --- a/conda/Dockerfile +++ b/conda/Dockerfile @@ -48,10 +48,6 @@ ENV CUDA_HOME=/usr/local/cuda-${CUDA_VERSION} # Make things in our path by default ENV PATH=/usr/local/cuda-${CUDA_VERSION}/bin:$PATH -FROM cuda as cuda11.6 -RUN bash ./install_cuda.sh 11.6 -ENV DESIRED_CUDA=11.6 - FROM cuda as cuda11.7 RUN bash ./install_cuda.sh 11.7 ENV DESIRED_CUDA=11.7 @@ -70,7 +66,6 @@ ADD ./common/install_mnist.sh install_mnist.sh RUN bash ./install_mnist.sh FROM base as all_cuda -COPY --from=cuda11.6 /usr/local/cuda-11.6 /usr/local/cuda-11.6 COPY --from=cuda11.7 /usr/local/cuda-11.7 /usr/local/cuda-11.7 COPY --from=cuda11.8 /usr/local/cuda-11.8 /usr/local/cuda-11.8 COPY --from=cuda12.1 /usr/local/cuda-12.1 /usr/local/cuda-12.1 diff --git a/conda/build_pytorch.sh b/conda/build_pytorch.sh index 30986b408..570c6df11 100755 --- a/conda/build_pytorch.sh +++ b/conda/build_pytorch.sh @@ -271,9 +271,6 @@ else elif [[ "$desired_cuda" == "11.7" ]]; then export CONDA_CUDATOOLKIT_CONSTRAINT=" - pytorch-cuda >=11.7,<11.8 # [not osx]" export MAGMA_PACKAGE=" - magma-cuda117 # [not osx and not win]" - elif [[ "$desired_cuda" == "11.6" ]]; then - export CONDA_CUDATOOLKIT_CONSTRAINT=" - pytorch-cuda >=11.6,<11.7 # [not osx]" - export MAGMA_PACKAGE=" - magma-cuda116 # [not osx and not win]" else echo "unhandled desired_cuda: $desired_cuda" exit 1 diff --git a/conda/pytorch-cuda/conda_build_config.yaml b/conda/pytorch-cuda/conda_build_config.yaml index 67d14f2b1..a343bc40c 100644 --- a/conda/pytorch-cuda/conda_build_config.yaml +++ b/conda/pytorch-cuda/conda_build_config.yaml @@ -1,5 +1,4 @@ version: - - 11.6 - 11.7 - 11.8 target_platform: diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index ecb438ca8..4c3ff4d8a 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -12,14 +12,6 @@ # https://conda.anaconda.org/pytorch/noarch/ # https://conda.anaconda.org/pytorch/noarch/repodata.json {% set build = 3 %} -{% set cuda_constraints=">=11.6,<11.7" %} -{% set libcufft_constraints=">=10.7.0.55,<10.7.2.50" %} -{% set libcublas_constraints=">=11.8.1.74,<11.10.1.25" %} -{% set libcusolver_constraints=">=11.3.2.55,<11.3.5.50" %} -{% set libcusparse_constraints=">=11.7.1.55,<11.7.3.50" %} -{% set libnpp_constraints=">=11.6.0.55,<11.7.3.21" %} -{% set libnvjpeg_constraints=">=11.6.0.55,<11.7.2.34" %} -{% if version == '11.7' %} {% set cuda_constraints=">=11.7,<11.8" %} {% set libcufft_constraints=">=10.7.2.50,<10.9.0.58" %} {% set libcublas_constraints=">=11.10.1.25,<11.11.3.6" %} diff --git a/conda/pytorch-nightly/bld.bat b/conda/pytorch-nightly/bld.bat index 18850f758..1b0909f13 100644 --- a/conda/pytorch-nightly/bld.bat +++ b/conda/pytorch-nightly/bld.bat @@ -21,12 +21,6 @@ set CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%desired_cuda% set CUDA_BIN_PATH=%CUDA_PATH%\bin set TORCH_NVCC_FLAGS=-Xfatbin -compress-all set TORCH_CUDA_ARCH_LIST=3.7+PTX;5.0;6.0;6.1;7.0;7.5;8.0;8.6 -if "%desired_cuda%" == "11.5" ( - set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2 -) -if "%desired_cuda%" == "11.6" ( - set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2 -) if "%desired_cuda%" == "11.7" ( set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2 ) diff --git a/libtorch/Dockerfile b/libtorch/Dockerfile index 3a116f8b5..6a461b808 100644 --- a/libtorch/Dockerfile +++ b/libtorch/Dockerfile @@ -44,10 +44,6 @@ ADD ./common/install_conda.sh install_conda.sh RUN bash ./install_conda.sh && rm install_conda.sh RUN /opt/conda/bin/conda install -y cmake=3.18 -FROM cuda as cuda11.6 -RUN bash ./install_cuda.sh 11.6 -RUN bash ./install_magma.sh 11.6 - FROM cuda as cuda11.7 RUN bash ./install_cuda.sh 11.7 RUN bash ./install_magma.sh 11.7 diff --git a/libtorch/build_all_docker.sh b/libtorch/build_all_docker.sh index 8d25da9bc..bebb1728a 100755 --- a/libtorch/build_all_docker.sh +++ b/libtorch/build_all_docker.sh @@ -4,7 +4,7 @@ set -eou pipefail TOPDIR=$(git rev-parse --show-toplevel) -for cuda_version in 11.8 11.7 11.6; do +for cuda_version in 11.8 11.7; do GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/libtorch/build_docker.sh" done diff --git a/manywheel/build_all_docker.sh b/manywheel/build_all_docker.sh index 395f71be3..7a695f51c 100644 --- a/manywheel/build_all_docker.sh +++ b/manywheel/build_all_docker.sh @@ -9,7 +9,7 @@ MANYLINUX_VERSION=2014 GPU_ARCH_TYPE=cpu "${TOPDIR}/manywheel/build_docker.sh" GPU_ARCH_TYPE=cpu-cxx11-abi "${TOPDIR}/manywheel/build_docker.sh" -for cuda_version in 11.7 11.6; do +for cuda_version in 11.8 11.7; do GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/manywheel/build_docker.sh" MANYLINUX_VERSION=2014 GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/manywheel/build_docker.sh" done diff --git a/manywheel/build_cuda.sh b/manywheel/build_cuda.sh index 6b5cd9111..83d3c6a3e 100644 --- a/manywheel/build_cuda.sh +++ b/manywheel/build_cuda.sh @@ -108,41 +108,7 @@ elif [[ "$OS_NAME" == *"Ubuntu"* ]]; then LIBGOMP_PATH="/usr/lib/x86_64-linux-gnu/libgomp.so.1" fi -if [[ $CUDA_VERSION == "11.6" ]]; then -export USE_STATIC_CUDNN=0 -DEPS_LIST=( - "/usr/local/cuda/lib64/libcudart.so.11.0" - "/usr/local/cuda/lib64/libnvToolsExt.so.1" - "/usr/local/cuda/lib64/libnvrtc.so.11.2" # this is not a mistake for 11.6 - "/usr/local/cuda/lib64/libnvrtc-builtins.so.11.6" - "/usr/local/cuda/lib64/libcudnn_adv_infer.so.8" - "/usr/local/cuda/lib64/libcudnn_adv_train.so.8" - "/usr/local/cuda/lib64/libcudnn_cnn_infer.so.8" - "/usr/local/cuda/lib64/libcudnn_cnn_train.so.8" - "/usr/local/cuda/lib64/libcudnn_ops_infer.so.8" - "/usr/local/cuda/lib64/libcudnn_ops_train.so.8" - "/usr/local/cuda/lib64/libcudnn.so.8" - "/usr/local/cuda/lib64/libcublas.so.11" - "/usr/local/cuda/lib64/libcublasLt.so.11" - "$LIBGOMP_PATH" -) -DEPS_SONAME=( - "libcudart.so.11.0" - "libnvToolsExt.so.1" - "libnvrtc.so.11.2" - "libnvrtc-builtins.so.11.6" - "libcudnn_adv_infer.so.8" - "libcudnn_adv_train.so.8" - "libcudnn_cnn_infer.so.8" - "libcudnn_cnn_train.so.8" - "libcudnn_ops_infer.so.8" - "libcudnn_ops_train.so.8" - "libcudnn.so.8" - "libcublas.so.11" - "libcublasLt.so.11" - "libgomp.so.1" -) -elif [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then +if [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then export USE_STATIC_CUDNN=0 # Try parallelizing nvcc as well export TORCH_NVCC_FLAGS="-Xfatbin -compress-all --threads 2" diff --git a/windows/cuda116.bat b/windows/cuda116.bat deleted file mode 100644 index 7a1613c5c..000000000 --- a/windows/cuda116.bat +++ /dev/null @@ -1,58 +0,0 @@ -@echo off - -set MODULE_NAME=pytorch - -IF NOT EXIST "setup.py" IF NOT EXIST "%MODULE_NAME%" ( - call internal\clone.bat - cd .. -) ELSE ( - call internal\clean.bat -) -IF ERRORLEVEL 1 goto :eof - -call internal\check_deps.bat -IF ERRORLEVEL 1 goto :eof - -REM Check for optional components - -set USE_CUDA= -set CMAKE_GENERATOR=Visual Studio 15 2017 Win64 - -IF "%NVTOOLSEXT_PATH%"=="" ( - IF EXIST "C:\Program Files\NVIDIA Corporation\NvToolsExt\lib\x64\nvToolsExt64_1.lib" ( - set NVTOOLSEXT_PATH=C:\Program Files\NVIDIA Corporation\NvToolsExt - ) ELSE ( - echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, failing - exit /b 1 - ) -) - -IF "%CUDA_PATH_V116%"=="" ( - IF EXIST "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6\bin\nvcc.exe" ( - set "CUDA_PATH_V116=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6" - ) ELSE ( - echo CUDA 11.6 not found, failing - exit /b 1 - ) -) - -IF "%BUILD_VISION%" == "" ( - set TORCH_CUDA_ARCH_LIST=3.7+PTX;5.0;6.0;6.1;7.0;7.5;8.0;8.6 - set TORCH_NVCC_FLAGS=-Xfatbin -compress-all -) ELSE ( - set NVCC_FLAGS=-D__CUDA_NO_HALF_OPERATORS__ --expt-relaxed-constexpr -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=compute_80 -gencode=arch=compute_86,code=compute_86 -) - -set "CUDA_PATH=%CUDA_PATH_V116%" -set "PATH=%CUDA_PATH_V116%\bin;%PATH%" - -:optcheck - -call internal\check_opts.bat -IF ERRORLEVEL 1 goto :eof - -call internal\copy.bat -IF ERRORLEVEL 1 goto :eof - -call internal\setup.bat -IF ERRORLEVEL 1 goto :eof diff --git a/windows/internal/smoke_test.bat b/windows/internal/smoke_test.bat index 2e1b1b243..afe285716 100644 --- a/windows/internal/smoke_test.bat +++ b/windows/internal/smoke_test.bat @@ -65,9 +65,6 @@ set "CONDA_HOME=%CD%\conda" set "tmp_conda=%CONDA_HOME%" set "miniconda_exe=%CD%\miniconda.exe" set "CONDA_EXTRA_ARGS=cpuonly -c pytorch-nightly" -if "%CUDA_VERSION%" == "116" ( - set "CONDA_EXTRA_ARGS=pytorch-cuda=11.6 -c nvidia -c pytorch-nightly" -) if "%CUDA_VERSION%" == "117" ( set "CONDA_EXTRA_ARGS=pytorch-cuda=11.7 -c nvidia -c pytorch-nightly" )