Skip to content

Commit fbebbd6

Browse files
committed
Refactor macos-arm64 into separate group
1 parent 2946b23 commit fbebbd6

6 files changed

+73
-32
lines changed

.github/workflows/validate-binaries.yml

+7
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,10 @@ jobs:
7171
with:
7272
channel: ${{ inputs.channel }}
7373
ref: ${{ inputs.ref || github.ref }}
74+
75+
mac-arm64:
76+
if: inputs.os == 'macos' || inputs.os == 'all'
77+
uses: ./.github/workflows/validate-macos-arm64-binaries.yml
78+
with:
79+
channel: ${{ inputs.channel }}
80+
ref: ${{ inputs.ref || github.ref }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Validate MacOS ARM64 Binaries
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
channel:
7+
description: "Channel to use (nightly, test, release, all)"
8+
required: true
9+
type: string
10+
ref:
11+
description: 'Reference to checkout, defaults to empty'
12+
default: ""
13+
required: false
14+
type: string
15+
workflow_dispatch:
16+
inputs:
17+
channel:
18+
description: "Channel to use (nightly, test, release, all)"
19+
required: true
20+
type: choice
21+
options:
22+
- release
23+
- nightly
24+
- test
25+
- all
26+
ref:
27+
description: 'Reference to checkout, defaults to empty'
28+
default: ""
29+
required: false
30+
type: string
31+
32+
jobs:
33+
generate-macos-arm64-matrix:
34+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
35+
with:
36+
package-type: all
37+
os: macos-arm64
38+
channel: ${{ inputs.channel }}
39+
macos-arm64:
40+
needs: generate-macos-arm64-matrix
41+
strategy:
42+
matrix: ${{ fromJson(needs.generate-macos-arm64-matrix.outputs.matrix) }}
43+
fail-fast: false
44+
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
45+
name: ${{ matrix.build_name }}
46+
with:
47+
runner: ${{ matrix.validation_runner }}
48+
repository: "pytorch/builder"
49+
ref: ${{ inputs.ref || github.ref }}
50+
job-name: ${{ matrix.build_name }}
51+
script: |
52+
set -ex
53+
export ENV_NAME="conda-env-${{ github.run_id }}"
54+
export GPU_ARCH_VER="${{ matrix.gpu_arch_version }}"
55+
export GPU_ARCH_TYPE="${{ matrix.gpu_arch_type }}"
56+
export INSTALLATION="${{ matrix.installation }}"
57+
export CUDA_VER="${{ matrix.desired_cuda }}"
58+
export DESIRED_PYTHON="${{ matrix.python_version }}"
59+
export DESIRED_CUDA="${{ matrix.desired_cuda }}"
60+
export PACKAGE_TYPE="${{ matrix.package_type }}"
61+
export TARGET_OS="macos-arm64"
62+
./.github/scripts/validate_binaries.sh

.github/workflows/validate-macos-binaries.yml

-32
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ jobs:
3636
package-type: all
3737
os: macos
3838
channel: ${{ inputs.channel }}
39-
generate-macos-arm64-matrix:
40-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
41-
with:
42-
package-type: all
43-
os: macos-arm64
44-
channel: ${{ inputs.channel }}
45-
4639
macos:
4740
needs: generate-macos-matrix
4841
strategy:
@@ -68,28 +61,3 @@ jobs:
6861
export PACKAGE_TYPE="${{ matrix.package_type }}"
6962
export TARGET_OS="macos"
7063
./.github/scripts/validate_binaries.sh
71-
72-
macos-arm64:
73-
needs: generate-macos-arm64-matrix
74-
strategy:
75-
matrix: ${{ fromJson(needs.generate-macos-arm64-matrix.outputs.matrix) }}
76-
fail-fast: false
77-
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
78-
name: ${{ matrix.build_name }}
79-
with:
80-
runner: ${{ matrix.validation_runner }}
81-
repository: "pytorch/builder"
82-
ref: ${{ inputs.ref || github.ref }}
83-
job-name: ${{ matrix.build_name }}
84-
script: |
85-
set -ex
86-
export ENV_NAME="conda-env-${{ github.run_id }}"
87-
export GPU_ARCH_VER="${{ matrix.gpu_arch_version }}"
88-
export GPU_ARCH_TYPE="${{ matrix.gpu_arch_type }}"
89-
export INSTALLATION="${{ matrix.installation }}"
90-
export CUDA_VER="${{ matrix.desired_cuda }}"
91-
export DESIRED_PYTHON="${{ matrix.python_version }}"
92-
export DESIRED_CUDA="${{ matrix.desired_cuda }}"
93-
export PACKAGE_TYPE="${{ matrix.package_type }}"
94-
export TARGET_OS="macos-arm64"
95-
./.github/scripts/validate_binaries.sh

.github/workflows/validate-nightly-binaries.yml

+2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ on:
1515
- .github/workflows/validate-linux-binaries.yml
1616
- .github/workflows/validate-windows-binaries.yml
1717
- .github/workflows/validate-macos-binaries.yml
18+
- .github/workflows/validate-macos-arm64-binaries.yml
1819
- test/smoke_test/*
1920
pull_request:
2021
paths:
2122
- .github/workflows/validate-nightly-binaries.yml
2223
- .github/workflows/validate-linux-binaries.yml
2324
- .github/workflows/validate-windows-binaries.yml
2425
- .github/workflows/validate-macos-binaries.yml
26+
- .github/workflows/validate-macos-arm64-binaries.yml
2527
- test/smoke_test/*
2628

2729
jobs:

.github/workflows/validate-release-binaries.yml

+2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ on:
1515
- .github/workflows/validate-linux-binaries.yml
1616
- .github/workflows/validate-windows-binaries.yml
1717
- .github/workflows/validate-macos-binaries.yml
18+
- .github/workflows/validate-macos-arm64-binaries.yml
1819
- test/smoke_test/*
1920
pull_request:
2021
paths:
2122
- .github/workflows/validate-release-binaries.yml
2223
- .github/workflows/validate-linux-binaries.yml
2324
- .github/workflows/validate-windows-binaries.yml
2425
- .github/workflows/validate-macos-binaries.yml
26+
- .github/workflows/validate-macos-arm64-binaries.yml
2527
- test/smoke_test/*
2628

2729
jobs:

release/cut-release-branch.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)