Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change CI cuda versions to 10.2 #3869

Merged
merged 6 commits into from
May 21, 2021
Merged

Change CI cuda versions to 10.2 #3869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d61ebd8
Change cuda versions.
datumbox May 21, 2021
2c7d4a9
Merge branch 'master' into cuda10.1_to_cuda10.2
datumbox May 21, 2021
f8ec9e6
changing cu_version
datumbox May 21, 2021
72569b1
Merge remote-tracking branch 'origin/cuda10.1_to_cuda10.2' into cuda1…
datumbox May 21, 2021
af664c7
patching regenerate.py
datumbox May 21, 2021
0020b68
more changes.
datumbox May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ binary_common: &binary_common
wheel_docker_image:
description: "Wheel only: what docker image to use"
type: string
default: "pytorch/manylinux-cuda101"
default: "pytorch/manylinux-cuda102"
conda_docker_image:
description: "Conda only: what docker image to use"
type: string
Expand Down Expand Up @@ -660,10 +660,10 @@ jobs:
unittest_linux_gpu:
<<: *binary_common
machine:
image: ubuntu-1604-cuda-10.1:201909-23
image: ubuntu-1604-cuda-10.2:202012-01
resource_class: gpu.small
environment:
image_name: "pytorch/manylinux-cuda101"
image_name: "pytorch/manylinux-cuda102"
PYTHON_VERSION: << parameters.python_version >>
steps:
- checkout
Expand Down Expand Up @@ -743,7 +743,7 @@ jobs:
executor:
name: windows-gpu
environment:
CUDA_VERSION: "10.1"
CUDA_VERSION: "10.2"
PYTHON_VERSION: << parameters.python_version >>
steps:
- checkout
Expand Down Expand Up @@ -839,7 +839,7 @@ jobs:
cmake_linux_gpu:
<<: *binary_common
machine:
image: ubuntu-1604-cuda-10.1:201909-23
image: ubuntu-1604-cuda-10.2:202012-01
resource_class: gpu.small
environment:
PYTHON_VERSION: << parameters.python_version >>
Expand Down Expand Up @@ -1468,7 +1468,7 @@ workflows:
name: unittest_linux_cpu_py3.9
python_version: '3.9'
- unittest_linux_gpu:
cu_version: cu101
cu_version: cu102
filters:
branches:
only:
Expand All @@ -1477,7 +1477,7 @@ workflows:
name: unittest_linux_gpu_py3.6
python_version: '3.6'
- unittest_linux_gpu:
cu_version: cu101
cu_version: cu102
filters:
branches:
only:
Expand All @@ -1486,11 +1486,11 @@ workflows:
name: unittest_linux_gpu_py3.7
python_version: '3.7'
- unittest_linux_gpu:
cu_version: cu101
cu_version: cu102
name: unittest_linux_gpu_py3.8
python_version: '3.8'
- unittest_linux_gpu:
cu_version: cu101
cu_version: cu102
filters:
branches:
only:
Expand All @@ -1515,7 +1515,7 @@ workflows:
name: unittest_windows_cpu_py3.9
python_version: '3.9'
- unittest_windows_gpu:
cu_version: cu101
cu_version: cu102
filters:
branches:
only:
Expand All @@ -1524,7 +1524,7 @@ workflows:
name: unittest_windows_gpu_py3.6
python_version: '3.6'
- unittest_windows_gpu:
cu_version: cu101
cu_version: cu102
filters:
branches:
only:
Expand All @@ -1533,11 +1533,11 @@ workflows:
name: unittest_windows_gpu_py3.7
python_version: '3.7'
- unittest_windows_gpu:
cu_version: cu101
cu_version: cu102
name: unittest_windows_gpu_py3.8
python_version: '3.8'
- unittest_windows_gpu:
cu_version: cu101
cu_version: cu102
filters:
branches:
only:
Expand Down Expand Up @@ -1569,16 +1569,16 @@ workflows:
name: cmake_linux_cpu
python_version: '3.8'
- cmake_linux_gpu:
cu_version: cu101
cu_version: cu102
name: cmake_linux_gpu
python_version: '3.8'
wheel_docker_image: pytorch/manylinux-cuda101
wheel_docker_image: pytorch/manylinux-cuda102
- cmake_windows_cpu:
cu_version: cpu
name: cmake_windows_cpu
python_version: '3.8'
- cmake_windows_gpu:
cu_version: cu101
cu_version: cu102
name: cmake_windows_gpu
python_version: '3.8'
- cmake_macos_cpu:
Expand Down
10 changes: 5 additions & 5 deletions .circleci/config.yml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ binary_common: &binary_common
wheel_docker_image:
description: "Wheel only: what docker image to use"
type: string
default: "pytorch/manylinux-cuda101"
default: "pytorch/manylinux-cuda102"
conda_docker_image:
description: "Conda only: what docker image to use"
type: string
Expand Down Expand Up @@ -660,10 +660,10 @@ jobs:
unittest_linux_gpu:
<<: *binary_common
machine:
image: ubuntu-1604-cuda-10.1:201909-23
image: ubuntu-1604-cuda-10.2:202012-01
resource_class: gpu.small
environment:
image_name: "pytorch/manylinux-cuda101"
image_name: "pytorch/manylinux-cuda102"
PYTHON_VERSION: << parameters.python_version >>
steps:
- checkout
Expand Down Expand Up @@ -743,7 +743,7 @@ jobs:
executor:
name: windows-gpu
environment:
CUDA_VERSION: "10.1"
CUDA_VERSION: "10.2"
PYTHON_VERSION: << parameters.python_version >>
steps:
- checkout
Expand Down Expand Up @@ -839,7 +839,7 @@ jobs:
cmake_linux_gpu:
<<: *binary_common
machine:
image: ubuntu-1604-cuda-10.1:201909-23
image: ubuntu-1604-cuda-10.2:202012-01
resource_class: gpu.small
environment:
PYTHON_VERSION: << parameters.python_version >>
Expand Down
6 changes: 3 additions & 3 deletions .circleci/regenerate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def unittest_workflows(indentation=6):
if device_type == 'gpu':
if python_version != "3.8":
job['filters'] = gen_filter_branch_tree('master', 'nightly')
job['cu_version'] = 'cu101'
job['cu_version'] = 'cu102'
else:
job['cu_version'] = 'cpu'

Expand All @@ -255,9 +255,9 @@ def cmake_workflows(indentation=6):
'python_version': python_version
}

job['cu_version'] = 'cu101' if device == 'gpu' else 'cpu'
job['cu_version'] = 'cu102' if device == 'gpu' else 'cpu'
if device == 'gpu' and os_type == 'linux':
job['wheel_docker_image'] = 'pytorch/manylinux-cuda101'
job['wheel_docker_image'] = 'pytorch/manylinux-cuda102'
jobs.append({f'cmake_{os_type}_{device}': job})
return indent(indentation, jobs)

Expand Down