Unverified Commit 0b009ae3 authored by Francisco Massa's avatar Francisco Massa Committed by GitHub
Browse files

Try enabling Windows CUDA CI (#1486)

* Try enabling Windows CUDA CI

* Cleanups

* Attempt 1

* Attempt 2

* Re-enable other tests
parent 7f526aa9
...@@ -9,6 +9,13 @@ version: 2.1 ...@@ -9,6 +9,13 @@ version: 2.1
orbs: orbs:
win: circleci/windows@2.0.0 win: circleci/windows@2.0.0
executors:
windows-gpu-prototype:
machine:
resource_class: windows.gpu.small.prototype
image: windows-server-2019-nvidia:201908-28
shell: bash.exe
commands: commands:
checkout_merge: checkout_merge:
description: "checkout merge branch" description: "checkout merge branch"
...@@ -184,6 +191,20 @@ jobs: ...@@ -184,6 +191,20 @@ jobs:
bash packaging/build_conda.sh bash packaging/build_conda.sh
shell: powershell.exe shell: powershell.exe
binary_win_conda_cuda:
<<: *binary_common
executor: windows-gpu-prototype
steps:
- checkout_merge
- run:
command: |
choco install miniconda3
(& "C:\tools\miniconda3\Scripts\conda.exe" "shell.powershell" "hook") | Out-String | Invoke-Expression
conda activate base
conda install -yq conda-build "conda-package-handling!=1.5.0"
bash packaging/build_conda.sh
shell: powershell.exe
binary_macos_wheel: binary_macos_wheel:
<<: *binary_common <<: *binary_common
macos: macos:
...@@ -485,6 +506,10 @@ workflows: ...@@ -485,6 +506,10 @@ workflows:
name: torchvision_win_py3.6_cpu name: torchvision_win_py3.6_cpu
python_version: "3.6" python_version: "3.6"
cu_version: "cpu" cu_version: "cpu"
- binary_win_conda_cuda:
name: torchvision_win_py3.6_cu101
python_version: "3.6"
cu_version: "cu101"
nightly: nightly:
jobs: jobs:
......
...@@ -9,6 +9,13 @@ version: 2.1 ...@@ -9,6 +9,13 @@ version: 2.1
orbs: orbs:
win: circleci/windows@2.0.0 win: circleci/windows@2.0.0
executors:
windows-gpu-prototype:
machine:
resource_class: windows.gpu.small.prototype
image: windows-server-2019-nvidia:201908-28
shell: bash.exe
commands: commands:
checkout_merge: checkout_merge:
description: "checkout merge branch" description: "checkout merge branch"
...@@ -184,6 +191,20 @@ jobs: ...@@ -184,6 +191,20 @@ jobs:
bash packaging/build_conda.sh bash packaging/build_conda.sh
shell: powershell.exe shell: powershell.exe
binary_win_conda_cuda:
<<: *binary_common
executor: windows-gpu-prototype
steps:
- checkout_merge
- run:
command: |
choco install miniconda3
(& "C:\tools\miniconda3\Scripts\conda.exe" "shell.powershell" "hook") | Out-String | Invoke-Expression
conda activate base
conda install -yq conda-build "conda-package-handling!=1.5.0"
bash packaging/build_conda.sh
shell: powershell.exe
binary_macos_wheel: binary_macos_wheel:
<<: *binary_common <<: *binary_common
macos: macos:
...@@ -284,6 +305,10 @@ workflows: ...@@ -284,6 +305,10 @@ workflows:
name: torchvision_win_py3.6_cpu name: torchvision_win_py3.6_cpu
python_version: "3.6" python_version: "3.6"
cu_version: "cpu" cu_version: "cpu"
- binary_win_conda_cuda:
name: torchvision_win_py3.6_cu101
python_version: "3.6"
cu_version: "cu101"
nightly: nightly:
{%- endif %} {%- endif %}
......
...@@ -50,21 +50,33 @@ setup_cuda() { ...@@ -50,21 +50,33 @@ setup_cuda() {
# Now work out the CUDA settings # Now work out the CUDA settings
case "$CU_VERSION" in case "$CU_VERSION" in
cu101) cu101)
export CUDA_HOME=/usr/local/cuda-10.1/ if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v10.1"
else
export CUDA_HOME=/usr/local/cuda-10.1/
fi
export FORCE_CUDA=1 export FORCE_CUDA=1
# Hard-coding gencode flags is temporary situation until # Hard-coding gencode flags is temporary situation until
# 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_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_50,code=compute_50"
;; ;;
cu100) cu100)
export CUDA_HOME=/usr/local/cuda-10.0/ if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v10.0"
else
export CUDA_HOME=/usr/local/cuda-10.0/
fi
export FORCE_CUDA=1 export FORCE_CUDA=1
# Hard-coding gencode flags is temporary situation until # Hard-coding gencode flags is temporary situation until
# 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_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_50,code=compute_50"
;; ;;
cu92) cu92)
export CUDA_HOME=/usr/local/cuda-9.2/ if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v9.2"
else
export CUDA_HOME=/usr/local/cuda-9.2/
fi
export FORCE_CUDA=1 export FORCE_CUDA=1
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_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_50,code=compute_50"
;; ;;
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
set TORCHVISION_BUILD_VERSION=%PKG_VERSION% set TORCHVISION_BUILD_VERSION=%PKG_VERSION%
set TORCHVISION_BUILD_NUMBER=%PKG_BUILDNUM% set TORCHVISION_BUILD_NUMBER=%PKG_BUILDNUM%
if not "%CUDA_VERSION%" == "None" ( set build_with_cuda=
set build_with_cuda=1
set desired_cuda=%CUDA_VERSION:~0,-1%.%CUDA_VERSION:~-1,1%
) else (
set build_with_cuda=
)
if "%build_with_cuda%" == "" goto cuda_flags_end if "%CUDA_VERSION%" == "None" goto cuda_flags_end
if "%CUDA_VERSION%" == "cpu" goto cuda_flags_end
if "%CUDA_VERSION%" == "" goto cuda_flags_end
set build_with_cuda=1
set desired_cuda=%CUDA_VERSION:~0,-1%.%CUDA_VERSION:~-1,1%
set CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%desired_cuda% set CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%desired_cuda%
set CUDA_BIN_PATH=%CUDA_PATH%\bin set CUDA_BIN_PATH=%CUDA_PATH%\bin
......
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