From bb93ea1113203e0e32823bf5b261c1e09004f709 Mon Sep 17 00:00:00 2001 From: pbialecki Date: Thu, 18 May 2023 22:13:05 -0700 Subject: [PATCH 1/4] remove CUDA 11.7 builds --- .github/workflows/build-conda-images.yml | 2 +- .github/workflows/build-libtorch-images.yml | 2 +- .github/workflows/build-manywheel-images.yml | 2 +- common/install_cuda.sh | 64 -------------------- conda/Dockerfile | 5 -- conda/build_all_docker.sh | 2 +- conda/build_pytorch.sh | 3 - conda/pytorch-cuda/conda_build_config.yaml | 1 - conda/pytorch-cuda/meta.yaml | 10 +-- conda/pytorch-nightly/bld.bat | 4 -- conda/pytorch-nightly/build.sh | 9 +-- libtorch/Dockerfile | 4 -- libtorch/build_all_docker.sh | 2 +- magma/Makefile | 17 ++---- manywheel/build_all_docker.sh | 2 +- manywheel/build_cuda.sh | 20 +----- windows/cuda117.bat | 58 ------------------ windows/internal/cuda_install.bat | 28 --------- windows/internal/smoke_test.bat | 3 - 19 files changed, 15 insertions(+), 223 deletions(-) delete mode 100644 windows/cuda117.bat diff --git a/.github/workflows/build-conda-images.yml b/.github/workflows/build-conda-images.yml index aed535473..8a394e38f 100644 --- a/.github/workflows/build-conda-images.yml +++ b/.github/workflows/build-conda-images.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - cuda_version: ["11.7", "11.8", "12.1", "cpu"] + cuda_version: ["11.8", "12.1", "cpu"] env: CUDA_VERSION: ${{ matrix.cuda_version }} steps: diff --git a/.github/workflows/build-libtorch-images.yml b/.github/workflows/build-libtorch-images.yml index d95f9208c..ff78033f5 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: ["12.1", "11.8", "11.7"] + cuda_version: ["12.1", "11.8"] 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 b171edb80..cc2a908fc 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: ["12.1", "11.8", "11.7"] + cuda_version: ["12.1", "11.8"] env: GPU_ARCH_TYPE: cuda GPU_ARCH_VERSION: ${{ matrix.cuda_version }} diff --git a/common/install_cuda.sh b/common/install_cuda.sh index ca432678d..68b84241c 100644 --- a/common/install_cuda.sh +++ b/common/install_cuda.sh @@ -2,37 +2,6 @@ set -ex -function install_117 { - echo "Installing CUDA 11.7 and CuDNN 8.5 and NCCL 2.14" - rm -rf /usr/local/cuda-11.7 /usr/local/cuda - # install CUDA 11.7.0 in the same container - wget -q https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run - chmod +x cuda_11.7.0_515.43.04_linux.run - ./cuda_11.7.0_515.43.04_linux.run --toolkit --silent - rm -f cuda_11.7.0_515.43.04_linux.run - rm -f /usr/local/cuda && ln -s /usr/local/cuda-11.7 /usr/local/cuda - - # cuDNN license: https://developer.nvidia.com/cudnn/license_agreement - mkdir tmp_cudnn && cd tmp_cudnn - 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 - tar xf cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz - cp -a cudnn-linux-x86_64-8.5.0.96_cuda11-archive/include/* /usr/local/cuda/include/ - cp -a cudnn-linux-x86_64-8.5.0.96_cuda11-archive/lib/* /usr/local/cuda/lib64/ - cd .. - rm -rf tmp_cudnn - ldconfig - - # NCCL license: https://docs.nvidia.com/deeplearning/nccl/#licenses - mkdir tmp_nccl && cd tmp_nccl - wget -q https://developer.download.nvidia.com/compute/redist/nccl/v2.14/nccl_2.14.3-1+cuda11.7_x86_64.txz - tar xf nccl_2.14.3-1+cuda11.7_x86_64.txz - cp -a nccl_2.14.3-1+cuda11.7_x86_64/include/* /usr/local/cuda/include/ - cp -a nccl_2.14.3-1+cuda11.7_x86_64/lib/* /usr/local/cuda/lib64/ - cd .. - rm -rf tmp_nccl - ldconfig -} - function install_118 { echo "Installing CUDA 11.8 and cuDNN 8.7 and NCCL 2.15" rm -rf /usr/local/cuda-11.8 /usr/local/cuda @@ -95,37 +64,6 @@ function install_121 { ldconfig } -function prune_117 { - echo "Pruning CUDA 11.7 and CuDNN" - ##################################################################################### - # CUDA 11.7 prune static libs - ##################################################################################### - export NVPRUNE="/usr/local/cuda-11.7/bin/nvprune" - export CUDA_LIB_DIR="/usr/local/cuda-11.7/lib64" - - 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" - 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" - - if [[ -n "$OVERRIDE_GENCODE" ]]; then - export GENCODE=$OVERRIDE_GENCODE - fi - - # all CUDA libs except CuDNN and CuBLAS (cudnn and cublas need arch 3.7 included) - ls $CUDA_LIB_DIR/ | grep "\.a" | grep -v "culibos" | grep -v "cudart" | grep -v "cudnn" | grep -v "cublas" | grep -v "metis" \ - | xargs -I {} bash -c \ - "echo {} && $NVPRUNE $GENCODE $CUDA_LIB_DIR/{} -o $CUDA_LIB_DIR/{}" - - # prune CuDNN and CuBLAS - $NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublas_static.a -o $CUDA_LIB_DIR/libcublas_static.a - $NVPRUNE $GENCODE_CUDNN $CUDA_LIB_DIR/libcublasLt_static.a -o $CUDA_LIB_DIR/libcublasLt_static.a - - ##################################################################################### - # 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 -} - function prune_118 { echo "Pruning CUDA 11.8 and cuDNN" ##################################################################################### @@ -192,8 +130,6 @@ function prune_121 { while test $# -gt 0 do case "$1" in - 11.7) install_117; prune_117 - ;; 11.8) install_118; prune_118 ;; 12.1) install_121; prune_121 diff --git a/conda/Dockerfile b/conda/Dockerfile index 5954f5b13..5728b9b97 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.7 -RUN bash ./install_cuda.sh 11.7 -ENV DESIRED_CUDA=11.7 - FROM cuda as cuda11.8 RUN bash ./install_cuda.sh 11.8 ENV DESIRED_CUDA=11.8 @@ -66,7 +62,6 @@ ADD ./common/install_mnist.sh install_mnist.sh RUN bash ./install_mnist.sh FROM base as all_cuda -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_all_docker.sh b/conda/build_all_docker.sh index 551098f5b..8a355bb48 100755 --- a/conda/build_all_docker.sh +++ b/conda/build_all_docker.sh @@ -4,6 +4,6 @@ set -eou pipefail TOPDIR=$(git rev-parse --show-toplevel) -for CUDA_VERSION in 12.1 11.8 11.7 cpu; do +for CUDA_VERSION in 12.1 11.8 cpu; do CUDA_VERSION="${CUDA_VERSION}" conda/build_docker.sh done diff --git a/conda/build_pytorch.sh b/conda/build_pytorch.sh index 3dc150c7b..1b3e13007 100755 --- a/conda/build_pytorch.sh +++ b/conda/build_pytorch.sh @@ -271,9 +271,6 @@ else elif [[ "$desired_cuda" == "11.8" ]]; then export CONDA_CUDATOOLKIT_CONSTRAINT=" - pytorch-cuda >=11.8,<11.9 # [not osx]" export MAGMA_PACKAGE=" - magma-cuda118 # [not osx and not win]" - 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]" 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 93e86f310..9030017ff 100644 --- a/conda/pytorch-cuda/conda_build_config.yaml +++ b/conda/pytorch-cuda/conda_build_config.yaml @@ -1,5 +1,4 @@ version: - - 11.7 - 11.8 - 12.1 target_platform: diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index 13284b580..062dba23d 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -11,15 +11,7 @@ # deployment: # https://conda.anaconda.org/pytorch/noarch/ # https://conda.anaconda.org/pytorch/noarch/repodata.json -{% set build = 5 %} -{% 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" %} -{% set libcusolver_constraints=">=11.3.5.50,<11.4.1.48" %} -{% set libcusparse_constraints=">=11.7.3.50,<11.7.5.86" %} -{% set libnpp_constraints=">=11.7.3.21,<11.8.0.86" %} -{% set libnvjpeg_constraints=">=11.7.2.34,<11.9.0.86" %} -{% if version == '11.8' %} +{% set build = 6 %} {% set cuda_constraints=">=11.8,<12.0" %} {% set libcufft_constraints=">=10.9.0.58,<11.0.0.21" %} {% set libcublas_constraints=">=11.11.3.6,<12.0.1.189" %} diff --git a/conda/pytorch-nightly/bld.bat b/conda/pytorch-nightly/bld.bat index 80da30807..972df7e9c 100644 --- a/conda/pytorch-nightly/bld.bat +++ b/conda/pytorch-nightly/bld.bat @@ -21,10 +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=5.0;6.0;6.1;7.0;7.5;8.0;8.6 -if "%desired_cuda%" == "11.7" ( - set TORCH_CUDA_ARCH_LIST=%TORCH_CUDA_ARCH_LIST%;3.7+PTX - set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2 -) if "%desired_cuda%" == "11.8" ( set TORCH_CUDA_ARCH_LIST=%TORCH_CUDA_ARCH_LIST%;3.7+PTX;9.0 set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2 diff --git a/conda/pytorch-nightly/build.sh b/conda/pytorch-nightly/build.sh index 97829df84..c649d3251 100755 --- a/conda/pytorch-nightly/build.sh +++ b/conda/pytorch-nightly/build.sh @@ -55,14 +55,7 @@ if [[ -n "$build_with_cuda" ]]; then TORCH_CUDA_ARCH_LIST="5.0;6.0;6.1;7.0;7.5;8.0;8.6" export USE_STATIC_CUDNN=1 # links cudnn statically (driven by tools/setup_helpers/cudnn.py) - if [[ $CUDA_VERSION == 11.7* ]]; then - TORCH_CUDA_ARCH_LIST="$TORCH_CUDA_ARCH_LIST;3.7+PTX" - #for cuda 11.7 we use cudnn 8.5 - #which does not have single static libcudnn_static.a deliverable to link with - export USE_STATIC_CUDNN=0 - #for cuda 11.7 include all dynamic loading libraries - DEPS_LIST=(/usr/local/cuda/lib64/libcudnn*.so.8 /usr/local/cuda-11.7/extras/CUPTI/lib64/libcupti.so.11.7) - elif [[ $CUDA_VERSION == 11.8* ]]; then + if [[ $CUDA_VERSION == 11.8* ]]; then TORCH_CUDA_ARCH_LIST="$TORCH_CUDA_ARCH_LIST;3.7+PTX;9.0" #for cuda 11.8 we use cudnn 8.7 #which does not have single static libcudnn_static.a deliverable to link with diff --git a/libtorch/Dockerfile b/libtorch/Dockerfile index cfe1208bd..c144da16e 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.7 -RUN bash ./install_cuda.sh 11.7 -RUN bash ./install_magma.sh 11.7 - FROM cuda as cuda11.8 RUN bash ./install_cuda.sh 11.8 RUN bash ./install_magma.sh 11.8 diff --git a/libtorch/build_all_docker.sh b/libtorch/build_all_docker.sh index 3c8aff9cb..13bd33220 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 12.1 11.8 11.7; do +for cuda_version in 12.1 11.8; do GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/libtorch/build_docker.sh" done diff --git a/magma/Makefile b/magma/Makefile index 334e89cd6..f7fb225b8 100644 --- a/magma/Makefile +++ b/magma/Makefile @@ -1,8 +1,8 @@ SHELL=/usr/bin/env bash -DESIRED_CUDA ?= 11.7 -PACKAGE_NAME ?= magma-cuda117 -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 +DESIRED_CUDA ?= 11.8 +PACKAGE_NAME ?= magma-cuda118 +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 DOCKER_RUN = set -eou pipefail; docker run --rm -i \ -v $(shell git rev-parse --show-toplevel):/builder \ @@ -16,7 +16,6 @@ DOCKER_RUN = set -eou pipefail; docker run --rm -i \ .PHONY: all all: magma-cuda121 all: magma-cuda118 -all: magma-cuda117 .PHONY: clean: @@ -26,21 +25,13 @@ clean: .PHONY: magma-cuda121 magma-cuda121: DESIRED_CUDA := 12.1 magma-cuda121: PACKAGE_NAME := magma-cuda121 -magma-cuda121: CUDA_ARCH_LIST += -gencode arch=compute_90,code=sm_90 magma-cuda121: $(DOCKER_RUN) .PHONY: magma-cuda118 magma-cuda118: DESIRED_CUDA := 11.8 magma-cuda118: PACKAGE_NAME := magma-cuda118 -magma-cuda118: CUDA_ARCH_LIST += -gencode arch=compute_37,code=sm_37 -gencode arch=compute_90,code=sm_90 +magma-cuda118: CUDA_ARCH_LIST += -gencode arch=compute_37,code=sm_37 magma-cuda118: $(DOCKER_RUN) -.PHONY: magma-cuda117 -magma-cuda117: DESIRED_CUDA := 11.7 -magma-cuda117: PACKAGE_NAME := magma-cuda117 -magma-cuda117: CUDA_ARCH_LIST += -gencode arch=compute_37,code=sm_37 -magma-cuda117: - $(DOCKER_RUN) - diff --git a/manywheel/build_all_docker.sh b/manywheel/build_all_docker.sh index 7a695f51c..94b1f0934 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.8 11.7; do +for cuda_version in 12.1 11.8; 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 3bc3a49f9..301c34c6c 100644 --- a/manywheel/build_cuda.sh +++ b/manywheel/build_cuda.sh @@ -182,7 +182,7 @@ if [[ $CUDA_VERSION == "12.1" ]]; then export NCCL_INCLUDE_DIR="/usr/local/cuda/include/" export NCCL_LIB_DIR="/usr/local/cuda/lib64/" fi -elif [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then +elif [[ $CUDA_VERSION == "11.8" ]]; then export USE_STATIC_CUDNN=0 # Try parallelizing nvcc as well export TORCH_NVCC_FLAGS="-Xfatbin -compress-all --threads 2" @@ -208,6 +208,7 @@ elif [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then "/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, it links to more specific cuda version + "/usr/local/cuda/lib64/libnvrtc-builtins.so.11.8" ) DEPS_SONAME+=( "libcudnn_adv_infer.so.8" @@ -222,23 +223,8 @@ elif [[ $CUDA_VERSION == "11.7" || $CUDA_VERSION == "11.8" ]]; then "libcudart.so.11.0" "libnvToolsExt.so.1" "libnvrtc.so.11.2" + "libnvrtc-builtins.so.11.8" ) - if [[ $CUDA_VERSION == "11.7" ]]; then - DEPS_LIST+=( - "/usr/local/cuda/lib64/libnvrtc-builtins.so.11.7" - ) - DEPS_SONAME+=( - "libnvrtc-builtins.so.11.7" - ) - fi - if [[ $CUDA_VERSION == "11.8" ]]; then - DEPS_LIST+=( - "/usr/local/cuda/lib64/libnvrtc-builtins.so.11.8" - ) - DEPS_SONAME+=( - "libnvrtc-builtins.so.11.8" - ) - fi else echo "Using nvidia libs from pypi." CUDA_RPATHS=( diff --git a/windows/cuda117.bat b/windows/cuda117.bat deleted file mode 100644 index fe1de8911..000000000 --- a/windows/cuda117.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_V117%"=="" ( - IF EXIST "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7\bin\nvcc.exe" ( - set "CUDA_PATH_V117=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7" - ) ELSE ( - echo CUDA 11.7 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_V117%" -set "PATH=%CUDA_PATH_V117%\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/cuda_install.bat b/windows/internal/cuda_install.bat index 2c2a55bf0..b8587fb99 100644 --- a/windows/internal/cuda_install.bat +++ b/windows/internal/cuda_install.bat @@ -19,40 +19,12 @@ set CUDNN_LIB_FOLDER="lib\x64" :: Skip all of this if we already have cuda installed if exist "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\bin\nvcc.exe" goto set_cuda_env_vars -if %CUDA_VER% EQU 117 goto cuda117 if %CUDA_VER% EQU 118 goto cuda118 if %CUDA_VER% EQU 121 goto cuda121 echo CUDA %CUDA_VERSION_STR% is not supported exit /b 1 -:cuda117 - -set CUDA_INSTALL_EXE=cuda_11.7.0_516.01_windows.exe -if not exist "%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%" ( - curl -k -L "https://ossci-windows.s3.amazonaws.com/%CUDA_INSTALL_EXE%" --output "%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%" - if errorlevel 1 exit /b 1 - set "CUDA_SETUP_FILE=%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%" - set "ARGS=thrust_11.7 nvcc_11.7 cuobjdump_11.7 nvprune_11.7 nvprof_11.7 cupti_11.7 cublas_11.7 cublas_dev_11.7 cudart_11.7 cufft_11.7 cufft_dev_11.7 curand_11.7 curand_dev_11.7 cusolver_11.7 cusolver_dev_11.7 cusparse_11.7 cusparse_dev_11.7 npp_11.7 npp_dev_11.7 nvrtc_11.7 nvrtc_dev_11.7 nvml_dev_11.7" -) - -set CUDNN_FOLDER=cudnn-windows-x86_64-8.5.0.96_cuda11-archive -set CUDNN_LIB_FOLDER="lib" -set "CUDNN_INSTALL_ZIP=%CUDNN_FOLDER%.zip" -if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" ( - curl -k -L "http://s3.amazonaws.com/ossci-windows/%CUDNN_INSTALL_ZIP%" --output "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" - if errorlevel 1 exit /b 1 - set "CUDNN_SETUP_FILE=%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" -) - -@REM cuDNN 8.3+ required zlib to be installed on the path -echo Installing ZLIB dlls -curl -k -L "http://s3.amazonaws.com/ossci-windows/zlib123dllx64.zip" --output "%SRC_DIR%\temp_build\zlib123dllx64.zip" -7z x "%SRC_DIR%\temp_build\zlib123dllx64.zip" -o"%SRC_DIR%\temp_build\zlib" -xcopy /Y "%SRC_DIR%\temp_build\zlib\dll_x64\*.dll" "C:\Windows\System32" - -goto cuda_common - :cuda118 set CUDA_INSTALL_EXE=cuda_11.8.0_522.06_windows.exe diff --git a/windows/internal/smoke_test.bat b/windows/internal/smoke_test.bat index 66d7bb2e1..decb2cfb1 100644 --- a/windows/internal/smoke_test.bat +++ b/windows/internal/smoke_test.bat @@ -69,9 +69,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%" == "117" ( - set "CONDA_EXTRA_ARGS=pytorch-cuda=11.7 -c nvidia -c pytorch-nightly" -) if "%CUDA_VERSION%" == "118" ( set "CONDA_EXTRA_ARGS=pytorch-cuda=11.8 -c nvidia -c pytorch-nightly" ) From a3bd9e0c0298ffbcbabf987d46f901fae14e920d Mon Sep 17 00:00:00 2001 From: pbialecki Date: Thu, 18 May 2023 22:17:46 -0700 Subject: [PATCH 2/4] remove CUDA 11.7 from MAGMA builds --- .github/workflows/build-magma-linux.yml | 2 +- .github/workflows/build-magma-windows.yml | 2 +- windows/internal/build_magma.bat | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-magma-linux.yml b/.github/workflows/build-magma-linux.yml index cf1162c39..80316f7f6 100644 --- a/.github/workflows/build-magma-linux.yml +++ b/.github/workflows/build-magma-linux.yml @@ -30,7 +30,7 @@ jobs: runs-on: linux.2xlarge strategy: matrix: - cuda_version: ["121", "118", "117"] + cuda_version: ["121", "118"] steps: - name: Checkout PyTorch builder uses: actions/checkout@v3 diff --git a/.github/workflows/build-magma-windows.yml b/.github/workflows/build-magma-windows.yml index d6e6a6762..c3c8f6964 100644 --- a/.github/workflows/build-magma-windows.yml +++ b/.github/workflows/build-magma-windows.yml @@ -17,7 +17,7 @@ jobs: runs-on: windows-2019 strategy: matrix: - cuda_version: ["121", "118", "117"] + cuda_version: ["121", "118"] config: ["Release", "Debug"] env: CUDA_VERSION: ${{ matrix.cuda_version }} diff --git a/windows/internal/build_magma.bat b/windows/internal/build_magma.bat index b2fcb976c..e9fa3242b 100644 --- a/windows/internal/build_magma.bat +++ b/windows/internal/build_magma.bat @@ -41,9 +41,6 @@ if "%CUVER_NODOT%" == "121" ( if "%CUVER_NODOT%" == "118" ( 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 ) -if "%CUVER_NODOT%" == "117" ( - 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 -) set CC=cl.exe set CXX=cl.exe From 4a4f828a9ec62649481dd089846a3aad37228a48 Mon Sep 17 00:00:00 2001 From: pbialecki Date: Fri, 19 May 2023 09:37:41 -0700 Subject: [PATCH 3/4] add pytorch-cuda back for 11.7 --- conda/pytorch-cuda/meta.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/conda/pytorch-cuda/meta.yaml b/conda/pytorch-cuda/meta.yaml index 062dba23d..13284b580 100644 --- a/conda/pytorch-cuda/meta.yaml +++ b/conda/pytorch-cuda/meta.yaml @@ -11,7 +11,15 @@ # deployment: # https://conda.anaconda.org/pytorch/noarch/ # https://conda.anaconda.org/pytorch/noarch/repodata.json -{% set build = 6 %} +{% set build = 5 %} +{% 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" %} +{% set libcusolver_constraints=">=11.3.5.50,<11.4.1.48" %} +{% set libcusparse_constraints=">=11.7.3.50,<11.7.5.86" %} +{% set libnpp_constraints=">=11.7.3.21,<11.8.0.86" %} +{% set libnvjpeg_constraints=">=11.7.2.34,<11.9.0.86" %} +{% if version == '11.8' %} {% set cuda_constraints=">=11.8,<12.0" %} {% set libcufft_constraints=">=10.9.0.58,<11.0.0.21" %} {% set libcublas_constraints=">=11.11.3.6,<12.0.1.189" %} From 93335c18dbfc684cf9a172604a85db827407f4d0 Mon Sep 17 00:00:00 2001 From: pbialecki Date: Tue, 20 Jun 2023 11:09:54 -0700 Subject: [PATCH 4/4] add 11.7 back to pytorch-cuda --- conda/pytorch-cuda/conda_build_config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/pytorch-cuda/conda_build_config.yaml b/conda/pytorch-cuda/conda_build_config.yaml index 9030017ff..93e86f310 100644 --- a/conda/pytorch-cuda/conda_build_config.yaml +++ b/conda/pytorch-cuda/conda_build_config.yaml @@ -1,4 +1,5 @@ version: + - 11.7 - 11.8 - 12.1 target_platform: