diff --git a/common/install_cuda.sh b/common/install_cuda.sh index ad06342be..1c61a66fe 100644 --- a/common/install_cuda.sh +++ b/common/install_cuda.sh @@ -131,8 +131,8 @@ function prune_118 { export NVPRUNE="/usr/local/cuda-11.8/bin/nvprune" export CUDA_LIB_DIR="/usr/local/cuda-11.8/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 -gencode arch=compute_90,code=sm_90" - 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 -gencode arch=compute_90,code=sm_90" + export GENCODE="-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 -gencode arch=compute_90,code=sm_90" + export GENCODE_CUDNN="-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 -gencode arch=compute_90,code=sm_90" if [[ -n "$OVERRIDE_GENCODE" ]]; then export GENCODE=$OVERRIDE_GENCODE diff --git a/conda/.DS_Store b/conda/.DS_Store deleted file mode 100644 index 5008ddfcf..000000000 Binary files a/conda/.DS_Store and /dev/null differ diff --git a/conda/Dockerfile b/conda/Dockerfile index d73b8d60d..5d057b23e 100644 --- a/conda/Dockerfile +++ b/conda/Dockerfile @@ -44,7 +44,7 @@ RUN bash ./install_conda.sh && rm install_conda.sh # Install CUDA FROM base as cuda -ARG CUDA_VERSION=10.2 +ARG CUDA_VERSION=11.8 RUN rm -rf /usr/local/cuda-* ADD ./common/install_cuda.sh install_cuda.sh ENV CUDA_HOME=/usr/local/cuda-${CUDA_VERSION} diff --git a/magma/Makefile b/magma/Makefile index 54a9bc0e2..488dcb642 100644 --- a/magma/Makefile +++ b/magma/Makefile @@ -38,7 +38,6 @@ magma-cuda121: .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 magma-cuda118: $(DOCKER_RUN) diff --git a/windows/cuda118.bat b/windows/cuda118.bat index 02d91adc3..8b6214d6a 100644 --- a/windows/cuda118.bat +++ b/windows/cuda118.bat @@ -40,7 +40,7 @@ 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;9.0 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 -gencode=arch=compute_90,code=compute_90 + set NVCC_FLAGS=-D__CUDA_NO_HALF_OPERATORS__ --expt-relaxed-constexpr -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 -gencode=arch=compute_90,code=compute_90 ) set "CUDA_PATH=%CUDA_PATH_V118%" diff --git a/windows/internal/build_magma.bat b/windows/internal/build_magma.bat index e9fa3242b..c48f13414 100644 --- a/windows/internal/build_magma.bat +++ b/windows/internal/build_magma.bat @@ -39,7 +39,7 @@ if "%CUVER_NODOT%" == "121" ( set 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 ) 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 + set 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 ) set CC=cl.exe