Revert D29642893: .github: Add force_on_cpu tests for windows
Test Plan: revert-hammer
Differential Revision:
D29642893 (https://github.com/pytorch/pytorch/commit/a52de0dfec4eeb288882cdea683a212f03cf3fc7)
Original commit changeset: 2dd2b295c71d
fbshipit-source-id: c01c421689f6d01cdfb3fe60a8c6428253249c5f
diff --git a/.github/scripts/generate_ci_workflows.py b/.github/scripts/generate_ci_workflows.py
index a6a6f1b..056dabe 100755
--- a/.github/scripts/generate_ci_workflows.py
+++ b/.github/scripts/generate_ci_workflows.py
@@ -28,7 +28,6 @@
test_runner_type: str,
cuda_version: str,
on_pull_request: bool = False,
- enable_force_on_cpu_test: YamlShellBool = "''",
only_build_on_pull_request: bool = False,
num_test_shards: int = 1,
is_scheduled: Optional[str] = None,
@@ -38,7 +37,6 @@
"test_runner_type": test_runner_type,
"cuda_version": cuda_version,
"on_pull_request": on_pull_request,
- "enable_force_on_cpu_test": enable_force_on_cpu_test,
"only_build_on_pull_request": only_build_on_pull_request and on_pull_request,
"is_scheduled": is_scheduled,
"num_test_shards": num_test_shards,
@@ -108,7 +106,6 @@
test_runner_type=WINDOWS_CUDA_TEST_RUNNER,
on_pull_request=True,
num_test_shards=2,
- enable_force_on_cpu_test=1,
),
PyTorchWindowsWorkflow(
build_environment="pytorch-win-vs2019-cuda11-cudnn8-py3",
diff --git a/.github/scripts/generate_pytorch_test_matrix.py b/.github/scripts/generate_pytorch_test_matrix.py
index 193d1c7..70707c4 100755
--- a/.github/scripts/generate_pytorch_test_matrix.py
+++ b/.github/scripts/generate_pytorch_test_matrix.py
@@ -30,13 +30,10 @@
configs['jit_legacy'] = {'num_shards': 1, 'runner': TEST_RUNNER_TYPE}
if MULTIGPU_RUNNER_TYPE is not None and os.getenv('ENABLE_MULTIGPU_TEST'):
configs['multigpu'] = {'num_shards': 1, 'runner': MULTIGPU_RUNNER_TYPE}
- if NOGPU_RUNNER_TYPE is not None:
- if os.getenv('ENABLE_NOGPU_NO_AVX_TEST'):
- configs['nogpu_NO_AVX'] = {'num_shards': 1, 'runner': NOGPU_RUNNER_TYPE}
- if os.getenv('ENABLE_NOGPU_NO_AVX2_TEST'):
- configs['nogpu_NO_AVX2'] = {'num_shards': 1, 'runner': NOGPU_RUNNER_TYPE}
- if os.getenv('ENABLE_FORCE_ON_CPU_TEST'):
- configs['force_on_cpu'] = {'num_shards': 1, 'runner': NOGPU_RUNNER_TYPE}
+ if NOGPU_RUNNER_TYPE is not None and os.getenv('ENABLE_NOGPU_NO_AVX_TEST'):
+ configs['nogpu_NO_AVX'] = {'num_shards': 1, 'runner': NOGPU_RUNNER_TYPE}
+ if NOGPU_RUNNER_TYPE is not None and os.getenv('ENABLE_NOGPU_NO_AVX2_TEST'):
+ configs['nogpu_NO_AVX2'] = {'num_shards': 1, 'runner': NOGPU_RUNNER_TYPE}
if os.getenv('ENABLE_SLOW_TEST'):
configs['slow'] = {'num_shards': 1, 'runner': TEST_RUNNER_TYPE}
matrix = {
diff --git a/.github/templates/windows_ci_workflow.yml.j2 b/.github/templates/windows_ci_workflow.yml.j2
index df2bff1..47234cc 100644
--- a/.github/templates/windows_ci_workflow.yml.j2
+++ b/.github/templates/windows_ci_workflow.yml.j2
@@ -108,8 +108,6 @@
env:
TEST_RUNNER_TYPE: !{{ test_runner_type }}
NUM_TEST_SHARDS: !{{ num_test_shards }}
- NOGPU_RUNNER_TYPE: windows.4xlarge
- ENABLE_FORCE_ON_CPU_TEST: !{{ enable_force_on_cpu_test }}
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
render-matrix: ${{ steps.set-matrix.outputs.render-matrix }}
diff --git a/.github/workflows/periodic-pytorch-win-vs2019-cuda11-cudnn8-py3.yml b/.github/workflows/periodic-pytorch-win-vs2019-cuda11-cudnn8-py3.yml
index 21aa5dd..3af28a3 100644
--- a/.github/workflows/periodic-pytorch-win-vs2019-cuda11-cudnn8-py3.yml
+++ b/.github/workflows/periodic-pytorch-win-vs2019-cuda11-cudnn8-py3.yml
@@ -91,8 +91,6 @@
env:
TEST_RUNNER_TYPE: windows.8xlarge.nvidia.gpu
NUM_TEST_SHARDS: 2
- NOGPU_RUNNER_TYPE: windows.4xlarge
- ENABLE_FORCE_ON_CPU_TEST: ''
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
render-matrix: ${{ steps.set-matrix.outputs.render-matrix }}
diff --git a/.github/workflows/pytorch-win-vs2019-cpu-py3.yml b/.github/workflows/pytorch-win-vs2019-cpu-py3.yml
index 792ac2c..753c053 100644
--- a/.github/workflows/pytorch-win-vs2019-cpu-py3.yml
+++ b/.github/workflows/pytorch-win-vs2019-cpu-py3.yml
@@ -84,8 +84,6 @@
env:
TEST_RUNNER_TYPE: windows.4xlarge
NUM_TEST_SHARDS: 2
- NOGPU_RUNNER_TYPE: windows.4xlarge
- ENABLE_FORCE_ON_CPU_TEST: ''
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
render-matrix: ${{ steps.set-matrix.outputs.render-matrix }}
diff --git a/.github/workflows/pytorch-win-vs2019-cuda10-cudnn7-py3.yml b/.github/workflows/pytorch-win-vs2019-cuda10-cudnn7-py3.yml
index d3f8f15..ef6e69c 100644
--- a/.github/workflows/pytorch-win-vs2019-cuda10-cudnn7-py3.yml
+++ b/.github/workflows/pytorch-win-vs2019-cuda10-cudnn7-py3.yml
@@ -94,8 +94,6 @@
env:
TEST_RUNNER_TYPE: windows.8xlarge.nvidia.gpu
NUM_TEST_SHARDS: 2
- NOGPU_RUNNER_TYPE: windows.4xlarge
- ENABLE_FORCE_ON_CPU_TEST: 1
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
render-matrix: ${{ steps.set-matrix.outputs.render-matrix }}
diff --git a/.github/workflows/pytorch-win-vs2019-cuda11-cudnn8-py3.yml b/.github/workflows/pytorch-win-vs2019-cuda11-cudnn8-py3.yml
index 2ed58c4..7580ba1 100644
--- a/.github/workflows/pytorch-win-vs2019-cuda11-cudnn8-py3.yml
+++ b/.github/workflows/pytorch-win-vs2019-cuda11-cudnn8-py3.yml
@@ -93,8 +93,6 @@
env:
TEST_RUNNER_TYPE: windows.8xlarge.nvidia.gpu
NUM_TEST_SHARDS: 2
- NOGPU_RUNNER_TYPE: windows.4xlarge
- ENABLE_FORCE_ON_CPU_TEST: ''
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
render-matrix: ${{ steps.set-matrix.outputs.render-matrix }}
