Unverified Commit 0e32a12c authored by Eli Uriegas's avatar Eli Uriegas Committed by GitHub
Browse files

.circleci: Downgrade CUDA 11.2 -> 11.1 (#3418)

parent 433283eb
This diff is collapsed.
...@@ -216,6 +216,7 @@ jobs: ...@@ -216,6 +216,7 @@ jobs:
- designate_upload_channel - designate_upload_channel
- run: - run:
name: Build conda packages name: Build conda packages
no_output_timeout: 20m
command: | command: |
set -ex set -ex
source packaging/windows/internal/vc_install_helper.sh source packaging/windows/internal/vc_install_helper.sh
......
...@@ -20,7 +20,6 @@ import os.path ...@@ -20,7 +20,6 @@ import os.path
PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"] PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
CUDA_VERSION = ["10.1", "10.2", "11.2"]
RC_PATTERN = r"/v[0-9]+(\.[0-9]+)*-rc[0-9]+/" RC_PATTERN = r"/v[0-9]+(\.[0-9]+)*-rc[0-9]+/"
...@@ -30,8 +29,8 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6, ...@@ -30,8 +29,8 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6,
for btype in ["wheel", "conda"]: for btype in ["wheel", "conda"]:
for os_type in ["linux", "macos", "win"]: for os_type in ["linux", "macos", "win"]:
python_versions = PYTHON_VERSIONS python_versions = PYTHON_VERSIONS
cu_versions_dict = {"linux": ["cpu", "cu101", "cu102", "cu112"], cu_versions_dict = {"linux": ["cpu", "cu101", "cu102", "cu111"],
"win": ["cpu", "cu101", "cu102", "cu112"], "win": ["cpu", "cu101", "cu102", "cu111"],
"macos": ["cpu"]} "macos": ["cpu"]}
cu_versions = cu_versions_dict[os_type] cu_versions = cu_versions_dict[os_type]
for python_version in python_versions: for python_version in python_versions:
...@@ -103,6 +102,7 @@ manylinux_images = { ...@@ -103,6 +102,7 @@ manylinux_images = {
"cu101": "pytorch/manylinux-cuda101", "cu101": "pytorch/manylinux-cuda101",
"cu102": "pytorch/manylinux-cuda102", "cu102": "pytorch/manylinux-cuda102",
"cu110": "pytorch/manylinux-cuda110", "cu110": "pytorch/manylinux-cuda110",
"cu111": "pytorch/manylinux-cuda111",
"cu112": "pytorch/manylinux-cuda112", "cu112": "pytorch/manylinux-cuda112",
} }
......
...@@ -60,6 +60,17 @@ setup_cuda() { ...@@ -60,6 +60,17 @@ setup_cuda() {
# https://github.com/pytorch/pytorch/pull/23408 lands # https://github.com/pytorch/pytorch/pull/23408 lands
export NVCC_FLAGS="-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_50,code=compute_50" export NVCC_FLAGS="-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_50,code=compute_50"
;; ;;
cu111)
if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.1"
else
export CUDA_HOME=/usr/local/cuda-11.1/
fi
export FORCE_CUDA=1
# Hard-coding gencode flags is temporary situation until
# https://github.com/pytorch/pytorch/pull/23408 lands
export NVCC_FLAGS="-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_50,code=compute_50"
;;
cu110) cu110)
if [[ "$OSTYPE" == "msys" ]]; then if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.0" export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.0"
...@@ -293,6 +304,9 @@ setup_conda_cudatoolkit_constraint() { ...@@ -293,6 +304,9 @@ setup_conda_cudatoolkit_constraint() {
cu112) cu112)
export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=11.2,<11.3 # [not osx]" export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=11.2,<11.3 # [not osx]"
;; ;;
cu111)
export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=11.1,<11.2 # [not osx]"
;;
cu110) cu110)
export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=11.0,<11.1 # [not osx]" export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=11.0,<11.1 # [not osx]"
;; ;;
...@@ -331,6 +345,9 @@ setup_conda_cudatoolkit_plain_constraint() { ...@@ -331,6 +345,9 @@ setup_conda_cudatoolkit_plain_constraint() {
cu112) cu112)
export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit=11.2" export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit=11.2"
;; ;;
cu111)
export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit=11.1"
;;
cu102) cu102)
export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit=10.2" export CONDA_CUDATOOLKIT_CONSTRAINT="cudatoolkit=10.2"
;; ;;
......
...@@ -16,8 +16,7 @@ requirements: ...@@ -16,8 +16,7 @@ requirements:
host: host:
- python - python
- setuptools - setuptools
- numpy >=1.20 # [py>=39] - defaults::numpy >=1.11
- numpy >=1.11 # [py!=39]
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }} {{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
{{ environ.get('CONDA_CPUONLY_FEATURE') }} {{ environ.get('CONDA_CPUONLY_FEATURE') }}
...@@ -28,8 +27,7 @@ requirements: ...@@ -28,8 +27,7 @@ requirements:
- ffmpeg >=4.2 # [not win] - ffmpeg >=4.2 # [not win]
- jpeg <=9b - jpeg <=9b
- pillow >=4.1.1 - pillow >=4.1.1
- numpy >=1.20 # [py>=39] - defaults::numpy >=1.11
- numpy >=1.11 # [py!=39]
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
......
...@@ -19,6 +19,7 @@ if %CUDA_VER% EQU 100 goto cuda100 ...@@ -19,6 +19,7 @@ if %CUDA_VER% EQU 100 goto cuda100
if %CUDA_VER% EQU 101 goto cuda101 if %CUDA_VER% EQU 101 goto cuda101
if %CUDA_VER% EQU 102 goto cuda102 if %CUDA_VER% EQU 102 goto cuda102
if %CUDA_VER% EQU 110 goto cuda110 if %CUDA_VER% EQU 110 goto cuda110
if %CUDA_VER% EQU 111 goto cuda111
if %CUDA_VER% EQU 112 goto cuda112 if %CUDA_VER% EQU 112 goto cuda112
echo CUDA %CUDA_VERSION_STR% is not supported echo CUDA %CUDA_VERSION_STR% is not supported
...@@ -108,6 +109,27 @@ if not exist "%SRC_DIR%\temp_build\cudnn-11.0-windows-x64-v8.0.4.30.zip" ( ...@@ -108,6 +109,27 @@ if not exist "%SRC_DIR%\temp_build\cudnn-11.0-windows-x64-v8.0.4.30.zip" (
goto cuda_common goto cuda_common
:cuda111
if not exist "%SRC_DIR%\temp_build\cuda_11.1.0_456.43_win10.exe" (
curl -k -L https://ossci-windows.s3.amazonaws.com/cuda_11.1.0_456.43_win10.exe --output "%SRC_DIR%\temp_build\cuda_11.1.0_456.43_win10.exe"
if errorlevel 1 exit /b 1
set "CUDA_SETUP_FILE=%SRC_DIR%\temp_build\cuda_11.1.0_456.43_win10.exe"
set "ARGS=nvcc_11.1 cuobjdump_11.1 nvprune_11.1 nvprof_11.1 cupti_11.1 cublas_11.1 cublas_dev_11.1 cudart_11.1 cufft_11.1 cufft_dev_11.1 curand_11.1 curand_dev_11.1 cusolver_11.1 cusolver_dev_11.1 cusparse_11.1 cusparse_dev_11.1 npp_11.1 npp_dev_11.1 nvrtc_11.1 nvrtc_dev_11.1 nvml_dev_11.1"
)
@REM There is no downloadable driver for Tesla on CUDA 11.1 yet. We will use
@REM the driver inside CUDA
if "%JOB_EXECUTOR%" == "windows-with-nvidia-gpu" set "ARGS=%ARGS% Display.Driver"
if not exist "%SRC_DIR%\temp_build\cudnn-11.1-windows-x64-v8.0.5.39.zip" (
curl -k -L https://ossci-windows.s3.amazonaws.com/cudnn-11.1-windows-x64-v8.0.5.39.zip --output "%SRC_DIR%\temp_build\cudnn-11.1-windows-x64-v8.0.5.39.zip"
if errorlevel 1 exit /b 1
set "CUDNN_SETUP_FILE=%SRC_DIR%\temp_build\cudnn-11.1-windows-x64-v8.0.5.39.zip"
)
goto cuda_common
:cuda112 :cuda112
if not exist "%SRC_DIR%\temp_build\cuda_11.2.0_460.89_win10.exe" ( if not exist "%SRC_DIR%\temp_build\cuda_11.2.0_460.89_win10.exe" (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment