Update

[ghstack-poisoned]

Author: GregoryComer

.github/workflows/_test_backend.yml

@@ -11,18 +11,6 @@ on:
         description: 'JSON array of flows to test'
         required: true
         type: string
-      runner:
-        description: 'Runner to use'
-        required: true
-        type: string
-      docker-image:
-        description: 'Docker image to use (Linux only)'
-        required: false
-        type: string
-      python-version:
-        description: 'Python version to use (macOS only)'
-        required: false
-        type: string
       ref:
         description: 'Git ref to checkout'
         required: false
@@ -33,31 +21,65 @@ on:
         required: false
         type: number
         default: 120
+      run-linux:
+        description: 'Whether to run Linux tests'
+        required: false
+        type: boolean
+        default: false
+      run-macos:
+        description: 'Whether to run macOS tests'
+        required: false
+        type: boolean
+        default: false
 
 jobs:
-  test-backend:
+  test-backend-linux:
+    if: ${{ inputs.run-linux }}
+    strategy:
+      fail-fast: false
+      matrix:
+        flow: ${{ fromJSON(inputs.flows) }}
+        suite: [models, operators]
+
+    uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
+    permissions:
+      id-token: write
+      contents: read
+    with:
+      ref: ${{ inputs.ref }}
+      runner: linux.4xlarge.memory
+      docker-image: ci-image:executorch-ubuntu-22.04-clang12
+      submodules: recursive
+      timeout: ${{ inputs.timeout }}
+      upload-artifact: test-report-${{ matrix.flow }}-${{ matrix.suite }}
+      script: |
+        set -eux
+
+        source .ci/scripts/test_backend_linux.sh "${{ matrix.suite }}" "${{ matrix.flow }}" "${RUNNER_ARTIFACT_DIR}"
+
+  test-backend-macos:
+    if: ${{ inputs.run-macos }}
     strategy:
       fail-fast: false
       matrix:
         flow: ${{ fromJSON(inputs.flows) }}
         suite: [models, operators]
 
-    uses: ${{ contains(inputs.runner, 'macos') && 'pytorch/test-infra/.github/workflows/macos_job.yml@main' || 'pytorch/test-infra/.github/workflows/linux_job_v2.yml@main' }}
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     permissions:
       id-token: write
       contents: read
     with:
       ref: ${{ inputs.ref }}
-      runner: ${{ inputs.runner }}
-      docker-image: ${{ inputs.docker-image }}
-      python-version: ${{ inputs.python-version }}
+      runner: macos-m1-stable
+      python-version: "3.12"
       submodules: recursive
       timeout: ${{ inputs.timeout }}
       upload-artifact: test-report-${{ matrix.flow }}-${{ matrix.suite }}
       script: |
         set -eux
 
-        ${{ contains(inputs.runner, 'macos') && '# This is needed to get the prebuilt PyTorch wheel from S3
+        # This is needed to get the prebuilt PyTorch wheel from S3
         ${CONDA_RUN} --no-capture-output pip install awscli==1.37.21
 
-        source .ci/scripts/test_backend_macos.sh "${{ matrix.suite }}" "${{ matrix.flow }}" "${RUNNER_ARTIFACT_DIR}"' || 'source .ci/scripts/test_backend_linux.sh "${{ matrix.suite }}" "${{ matrix.flow }}" "${RUNNER_ARTIFACT_DIR}"' }}
+        source .ci/scripts/test_backend_macos.sh "${{ matrix.suite }}" "${{ matrix.flow }}" "${RUNNER_ARTIFACT_DIR}"

.github/workflows/test-backend-coreml.yml

@@ -22,7 +22,6 @@ jobs:
     with:
       backend: coreml
       flows: '["coreml", "coreml_static_int8"]'
-      runner: macos-m1-stable
-      python-version: "3.12"
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 120
+      run-macos: true

.github/workflows/test-backend-qnn.yml

@@ -22,7 +22,6 @@ jobs:
     with:
       backend: qnn
       flows: '["qnn", "qnn_16a16w", "qnn_16a8w", "qnn_16a4w", "qnn_16a4w_block", "qnn_8a8w"]'
-      runner: linux.4xlarge.memory
-      docker-image: ci-image:executorch-ubuntu-22.04-clang12
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 120
+      run-linux: true

.github/workflows/test-backend-vulkan.yml

@@ -22,7 +22,6 @@ jobs:
     with:
       backend: vulkan
       flows: '["vulkan", "vulkan_static_int8_per_channel"]'
-      runner: linux.4xlarge.memory
-      docker-image: ci-image:executorch-ubuntu-22.04-clang12
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 120
+      run-linux: true

.github/workflows/test-backend-xnnpack.yml

@@ -22,7 +22,6 @@ jobs:
     with:
       backend: xnnpack
       flows: '["xnnpack", "xnnpack_dynamic_int8_per_channel", "xnnpack_static_int8_per_channel", "xnnpack_static_int8_per_tensor"]'
-      runner: linux.4xlarge.memory
-      docker-image: ci-image:executorch-ubuntu-22.04-clang12
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 120
+      run-linux: true