Skip to content

Commit c703a52

Browse files
committed
Adding support for multiple archs
1 parent 06b7349 commit c703a52

File tree

3 files changed

+45
-10
lines changed

3 files changed

+45
-10
lines changed

.github/workflows/therock-ci-linux.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
type: string
1010
test_type:
1111
type: string
12+
amdgpu_families:
13+
type: string
14+
test_runs_on:
15+
type: string
1216

1317
permissions:
1418
contents: read
@@ -19,6 +23,10 @@ jobs:
1923
runs-on: azure-linux-scale-rocm
2024
permissions:
2125
id-token: write
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
target_bundle: ${{ fromJSON(needs.setup_metadata.outputs.package_targets) }}
2230
container:
2331
image: ghcr.io/rocm/therock_build_manylinux_x86_64@sha256:2f3ebd0beb04c449fdb36933e54bdc69483b914fb9005594d3fc9444c206b54b
2432
options: -v /runner/config:/home/awsconfig/
@@ -27,7 +35,7 @@ jobs:
2735
env:
2836
CACHE_DIR: ${{ github.workspace }}/.container-cache
2937
CCACHE_CONFIGPATH: ${{ github.workspace }}/.ccache/ccache.conf
30-
AMDGPU_FAMILIES: "gfx94X-dcgpu"
38+
AMDGPU_FAMILIES: ${{ inputs.amdgpu_families }}
3139
TEATIME_FORCE_INTERACTIVE: 0
3240
AWS_SHARED_CREDENTIALS_FILE: /home/awsconfig/credentials.ini
3341
steps:
@@ -142,7 +150,7 @@ jobs:
142150
uses: ./.github/workflows/therock-test-packages.yml
143151
with:
144152
project_to_test: ${{ inputs.project_to_test }}
145-
amdgpu_families: "gfx94X-dcgpu"
146-
test_runs_on: "linux-mi325-1gpu-ossci-rocm"
153+
amdgpu_families: ${{ inputs.amdgpu_families }}
154+
test_runs_on: ${{ inputs.test_runs_on }}
147155
platform: "linux"
148156
test_type: ${{ inputs.test_type }}

.github/workflows/therock-ci-windows.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
type: string
1010
test_type:
1111
type: string
12+
amdgpu_families:
13+
type: string
14+
test_runs_on:
15+
type: string
1216

1317
permissions:
1418
contents: read
@@ -19,8 +23,6 @@ jobs:
1923
runs-on: azure-windows-scale-rocm
2024
# Skip hipDNN build on Windows since it's not supported yet https://github.com/ROCm/TheRock/issues/1822
2125
if: ${{ !contains(inputs.project_to_test, 'hipdnn') }}
22-
outputs:
23-
AMDGPU_FAMILIES: ${{ env.AMDGPU_FAMILIES }}
2426
permissions:
2527
contents: read
2628
id-token: write
@@ -31,9 +33,7 @@ jobs:
3133
BUILD_DIR: B:\build
3234
CCACHE_DIR: "${{ github.workspace }}/.container-cache/ccache"
3335
CCACHE_MAXSIZE: "700M"
34-
# TODO(geomin12): Add matrix of families
35-
# To get a fast signal of windows building for TheRock, adding gfx1151
36-
AMDGPU_FAMILIES: "gfx1151"
36+
AMDGPU_FAMILIES: ${{ inputs.amdgpu_families }}
3737
steps:
3838
- name: Configure GitHub longpath
3939
run: |
@@ -168,7 +168,7 @@ jobs:
168168
uses: ./.github/workflows/therock-test-packages.yml
169169
with:
170170
project_to_test: ${{ inputs.project_to_test }}
171-
amdgpu_families: ${{ needs.therock-build-windows.outputs.AMDGPU_FAMILIES }}
172-
test_runs_on: "windows-strix-halo-gpu-rocm"
171+
amdgpu_families: ${{ inputs.amdgpu_families }}
172+
test_runs_on: ${{ inputs.test_runs_on }}
173173
platform: "windows"
174174
test_type: ${{ inputs.test_type }}

.github/workflows/therock-ci.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
outputs:
3636
projects: ${{ steps.projects.outputs.projects }}
3737
test_type: ${{ steps.projects.outputs.test_type }}
38+
linux_package_targets: ${{ steps.configure_linux.outputs.package_targets }}
39+
windows_package_targets: ${{ steps.configure_windows.outputs.package_targets }}
3840
steps:
3941
- name: Checkout code
4042
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -43,6 +45,13 @@ jobs:
4345
sparse-checkout-cone-mode: true
4446
fetch-depth: 2
4547

48+
- name: Checkout TheRock repository
49+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
50+
with:
51+
repository: "ROCm/TheRock"
52+
path: TheRock
53+
ref: f3f77a3161922df3eee006b888b439d75b2b4668 # 2025-10-29 commit
54+
4655
- name: Set up Python
4756
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
4857
with:
@@ -59,6 +68,18 @@ jobs:
5968
PROJECTS: ${{ inputs.projects }}
6069
run: |
6170
python .github/scripts/therock_configure_ci.py
71+
72+
- name: Fetch Linux targets for build and test
73+
env:
74+
THEROCK_PACKAGE_PLATFORM: "linux"
75+
id: configure_linux
76+
run: python ./TheRock/build_tools/github_actions/fetch_package_targets.py
77+
78+
- name: Fetch Windows targets for build and test
79+
env:
80+
THEROCK_PACKAGE_PLATFORM: "windows"
81+
id: configure_windows
82+
run: python ./TheRock/build_tools/github_actions/fetch_package_targets.py
6283

6384
therock-ci-linux:
6485
name: Linux (${{ matrix.projects.project_to_test }})
@@ -71,12 +92,15 @@ jobs:
7192
fail-fast: false
7293
matrix:
7394
projects: ${{ fromJSON(needs.setup.outputs.projects) }}
95+
target_bundle: ${{ fromJSON(needs.setup.outputs.linux_package_targets) }}
7496
uses: ./.github/workflows/therock-ci-linux.yml
7597
secrets: inherit
7698
with:
7799
cmake_options: ${{ matrix.projects.cmake_options }}
78100
project_to_test: ${{ matrix.projects.project_to_test }}
79101
test_type: ${{ needs.setup.outputs.test_type }}
102+
amdgpu_families: ${{ matrix.target_bundle.amdgpu_families }}
103+
test_runs_on: ${{ matrix.target_bundle.test_machine }}
80104

81105
therock-ci-windows:
82106
name: Windows (${{ matrix.projects.project_to_test }})
@@ -89,12 +113,15 @@ jobs:
89113
fail-fast: false
90114
matrix:
91115
projects: ${{ fromJSON(needs.setup.outputs.projects) }}
116+
target_bundle: ${{ fromJSON(needs.setup.outputs.windows_package_targets) }}
92117
uses: ./.github/workflows/therock-ci-windows.yml
93118
secrets: inherit
94119
with:
95120
cmake_options: ${{ matrix.projects.cmake_options }}
96121
project_to_test: ${{ matrix.projects.project_to_test }}
97122
test_type: ${{ needs.setup.outputs.test_type }}
123+
amdgpu_families: ${{ matrix.target_bundle.amdgpu_families }}
124+
test_runs_on: ${{ matrix.target_bundle.test_machine }}
98125

99126
therock_ci_summary:
100127
name: TheRock CI Summary

0 commit comments

Comments
 (0)