Further reduce windows build/test matrix (#40592)
Summary:
Switch windows CPU testers from `windows.xlarge` to `windows.medium` class.
Remove VS 14.16 CUDA build
Only do smoke force-on-cpu tests using VS2019+CUDA10.1 config.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/40592
Differential Revision: D22259351
Pulled By: malfet
fbshipit-source-id: f934ff774dfc7d47f12c3da836ca314c12d92208
diff --git a/.circleci/cimodel/data/windows_build_definitions.py b/.circleci/cimodel/data/windows_build_definitions.py
index 161151e..82a3d89 100644
--- a/.circleci/cimodel/data/windows_build_definitions.py
+++ b/.circleci/cimodel/data/windows_build_definitions.py
@@ -123,7 +123,6 @@
WindowsJob(None, VcSpec(2017, ["14", "13"]), CudaVersion(10, 1), master_only_pred=FalsePred),
WindowsJob(1, VcSpec(2017, ["14", "13"]), CudaVersion(10, 1)),
# VS2017 no-CUDA (builds only)
- WindowsJob(None, VcSpec(2017, ["14", "16"]), CudaVersion(10, 1)),
WindowsJob(None, VcSpec(2017, ["14", "16"]), None),
# VS2019 CUDA-10.1
WindowsJob(None, VcSpec(2019), CudaVersion(10, 1)),
@@ -131,10 +130,9 @@
WindowsJob(2, VcSpec(2019), CudaVersion(10, 1)),
# VS2019 CPU-only
WindowsJob(None, VcSpec(2019), None),
- WindowsJob(1, VcSpec(2019), None),
+ WindowsJob(1, VcSpec(2019), None, master_only_pred=TruePred),
WindowsJob(2, VcSpec(2019), None, master_only_pred=TruePred),
- WindowsJob(1, VcSpec(2019), CudaVersion(10, 1), force_on_cpu=True),
- WindowsJob(2, VcSpec(2019), CudaVersion(10, 1), force_on_cpu=True, master_only_pred=TruePred),
+ WindowsJob(1, VcSpec(2019), CudaVersion(10, 1), force_on_cpu=True, master_only_pred=TruePred),
]
diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf740d7..96a6001 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,12 +26,17 @@
image: windows-server-2019-nvidia:stable
shell: bash.exe
- windows-cpu-with-nvidia-cuda:
+ windows-xlarge-cpu-with-nvidia-cuda:
machine:
- # we will change to CPU host when it's ready
resource_class: windows.xlarge
image: windows-server-2019-vs2019:stable
shell: bash.exe
+
+ windows-medium-cpu-with-nvidia-cuda:
+ machine:
+ resource_class: windows.medium
+ image: windows-server-2019-vs2019:stable
+ shell: bash.exe
commands:
# Must be run after attaching workspace from previous steps
@@ -266,7 +271,7 @@
parameters:
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-xlarge-cpu-with-nvidia-cuda"
build_environment:
type: string
default: ""
@@ -391,7 +396,7 @@
default: ""
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-xlarge-cpu-with-nvidia-cuda"
environment:
BUILD_ENVIRONMENT: << parameters.build_environment >>
BUILD_FOR_SYSTEM: windows
@@ -581,7 +586,7 @@
parameters:
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-xlarge-cpu-with-nvidia-cuda"
build_environment:
type: string
default: ""
@@ -652,7 +657,7 @@
parameters:
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-medium-cpu-with-nvidia-cuda"
build_environment:
type: string
default: ""
@@ -1193,7 +1198,7 @@
default: ""
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-xlarge-cpu-with-nvidia-cuda"
executor: <<parameters.executor>>
steps:
# See Note [Workspace for CircleCI scripts] in job-specs-setup.yml
@@ -1222,7 +1227,7 @@
default: ""
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-medium-cpu-with-nvidia-cuda"
executor: <<parameters.executor>>
steps:
- checkout
@@ -1243,6 +1248,14 @@
binary_windows_upload:
<<: *binary_windows_params
+ parameters:
+ build_environment:
+ type: string
+ default: ""
+ executor:
+ type: string
+ default: "windows-medium-cpu-with-nvidia-cuda"
+ executor: <<parameters.executor>>
docker:
- image: continuumio/miniconda
steps:
@@ -1271,7 +1284,7 @@
default: ""
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-medium-cpu-with-nvidia-cuda"
executor: <<parameters.executor>>
steps:
- checkout
@@ -7804,21 +7817,6 @@
vc_version: "14.13"
vc_year: "2017"
- pytorch_windows_build:
- build_environment: pytorch-win-vs2017-14-16-cuda10-cudnn7-py3
- cuda_version: "10"
- filters:
- branches:
- only:
- - master
- - /ci-all\/.*/
- - /release\/.*/
- name: pytorch_windows_vs2017_14.16_py36_cuda10.1_build
- python_version: "3.6"
- use_cuda: "1"
- vc_product: BuildTools
- vc_version: "14.16"
- vc_year: "2017"
- - pytorch_windows_build:
build_environment: pytorch-win-vs2017-14-16-cpu-py3
cuda_version: cpu
filters:
@@ -7880,6 +7878,12 @@
- pytorch_windows_test:
build_environment: pytorch-win-vs2019-cpu-py3
cuda_version: cpu
+ filters:
+ branches:
+ only:
+ - master
+ - /ci-all\/.*/
+ - /release\/.*/
name: pytorch_windows_vs2019_py36_cpu_test1
python_version: "3.6"
requires:
@@ -7910,29 +7914,17 @@
- pytorch_windows_test:
build_environment: pytorch-win-vs2019-cuda10-cudnn7-py3
cuda_version: "10"
- name: pytorch_windows_vs2019_py36_cuda10.1_on_cpu_test1
- python_version: "3.6"
- requires:
- - pytorch_windows_vs2019_py36_cuda10.1_build
- test_name: pytorch-windows-test1
- use_cuda: "0"
- vc_product: Community
- vc_version: ""
- vc_year: "2019"
- - pytorch_windows_test:
- build_environment: pytorch-win-vs2019-cuda10-cudnn7-py3
- cuda_version: "10"
filters:
branches:
only:
- master
- /ci-all\/.*/
- /release\/.*/
- name: pytorch_windows_vs2019_py36_cuda10.1_on_cpu_test2
+ name: pytorch_windows_vs2019_py36_cuda10.1_on_cpu_test1
python_version: "3.6"
requires:
- pytorch_windows_vs2019_py36_cuda10.1_build
- test_name: pytorch-windows-test2
+ test_name: pytorch-windows-test1
use_cuda: "0"
vc_product: Community
vc_version: ""
diff --git a/.circleci/verbatim-sources/build-parameters/binary-build-params.yml b/.circleci/verbatim-sources/build-parameters/binary-build-params.yml
index c72fd73..ca1d148 100644
--- a/.circleci/verbatim-sources/build-parameters/binary-build-params.yml
+++ b/.circleci/verbatim-sources/build-parameters/binary-build-params.yml
@@ -59,7 +59,7 @@
default: ""
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-xlarge-cpu-with-nvidia-cuda"
environment:
BUILD_ENVIRONMENT: << parameters.build_environment >>
BUILD_FOR_SYSTEM: windows
diff --git a/.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml b/.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml
index 9e51d907..c6ef0d1 100644
--- a/.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml
+++ b/.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml
@@ -46,7 +46,7 @@
parameters:
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-xlarge-cpu-with-nvidia-cuda"
build_environment:
type: string
default: ""
diff --git a/.circleci/verbatim-sources/header-section.yml b/.circleci/verbatim-sources/header-section.yml
index b7d385e..26205a0 100644
--- a/.circleci/verbatim-sources/header-section.yml
+++ b/.circleci/verbatim-sources/header-section.yml
@@ -26,9 +26,14 @@
image: windows-server-2019-nvidia:stable
shell: bash.exe
- windows-cpu-with-nvidia-cuda:
+ windows-xlarge-cpu-with-nvidia-cuda:
machine:
- # we will change to CPU host when it's ready
resource_class: windows.xlarge
image: windows-server-2019-vs2019:stable
shell: bash.exe
+
+ windows-medium-cpu-with-nvidia-cuda:
+ machine:
+ resource_class: windows.medium
+ image: windows-server-2019-vs2019:stable
+ shell: bash.exe
diff --git a/.circleci/verbatim-sources/job-specs/binary-job-specs.yml b/.circleci/verbatim-sources/job-specs/binary-job-specs.yml
index 78c92d8..800b44e 100644
--- a/.circleci/verbatim-sources/job-specs/binary-job-specs.yml
+++ b/.circleci/verbatim-sources/job-specs/binary-job-specs.yml
@@ -276,7 +276,7 @@
default: ""
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-xlarge-cpu-with-nvidia-cuda"
executor: <<parameters.executor>>
steps:
# See Note [Workspace for CircleCI scripts] in job-specs-setup.yml
@@ -305,7 +305,7 @@
default: ""
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-medium-cpu-with-nvidia-cuda"
executor: <<parameters.executor>>
steps:
- checkout
@@ -326,6 +326,14 @@
binary_windows_upload:
<<: *binary_windows_params
+ parameters:
+ build_environment:
+ type: string
+ default: ""
+ executor:
+ type: string
+ default: "windows-medium-cpu-with-nvidia-cuda"
+ executor: <<parameters.executor>>
docker:
- image: continuumio/miniconda
steps:
@@ -354,7 +362,7 @@
default: ""
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-medium-cpu-with-nvidia-cuda"
executor: <<parameters.executor>>
steps:
- checkout
diff --git a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml
index cea4fd1..43cf3c5 100644
--- a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml
+++ b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml
@@ -166,7 +166,7 @@
parameters:
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-xlarge-cpu-with-nvidia-cuda"
build_environment:
type: string
default: ""
@@ -237,7 +237,7 @@
parameters:
executor:
type: string
- default: "windows-cpu-with-nvidia-cuda"
+ default: "windows-medium-cpu-with-nvidia-cuda"
build_environment:
type: string
default: ""
