Skip to content

Commit 079ba70

Browse files
committed
changed syntax
1 parent c1515e8 commit 079ba70

File tree

2 files changed

+34
-19
lines changed

2 files changed

+34
-19
lines changed

.github/workflows/ur-build-hw.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ on:
3030
required: true
3131
type: string
3232
default: ""
33+
image_options:
34+
required: true
35+
type: string
36+
default: ""
3337
workflow_dispatch:
3438
inputs:
3539
adapter_name:
@@ -59,6 +63,10 @@ on:
5963
required: true
6064
type: string
6165
default: ""
66+
image_options:
67+
required: true
68+
type: string
69+
default: ""
6270

6371
permissions: read-all
6472

@@ -94,7 +102,8 @@ jobs:
94102
container:
95103
image: ${{ inputs.docker_image }}
96104
# TODO: options may differ for other GPU cards
97-
options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
105+
options: ${{ imputs,image_options }}
106+
# options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
98107

99108
steps:
100109
# TODO:

.github/workflows/ur-precommit.yml

+24-18
Original file line numberDiff line numberDiff line change
@@ -57,28 +57,34 @@ jobs:
5757
# if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
5858
strategy:
5959
matrix:
60+
include:
61+
- name: L0
62+
runner: UR_L0
63+
docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
64+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6065
# Extra native CPU jobs are here to force the loader to be used.
6166
# UR will not use the loader if there is only one target.
62-
adapter: [
63-
{name: L0, runner: UR_L0, docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"},
64-
# {name: L0_V2, runner: UR_L0},
65-
# {name: L0, runner: UR_L0, static: ON},
66-
# {name: OPENCL, runner: UR_OPENCL, platform: "Intel(R) OpenCL"},
67-
# {name: CUDA, runner: UR_CUDA},
68-
# {name: HIP, runner: UR_HIP},
69-
# {name: NATIVE_CPU, runner: UR_NATIVE_CPU},
70-
# {name: OPENCL, runner: UR_OPENCL, other_adapter: NATIVE_CPU, platform: "OPENCL:Intel(R) OpenCL"},
71-
# {name: L0, runner: UR_L0, other_adapter: NATIVE_CPU},
72-
]
67+
# adapter: [
68+
# {name: L0, runner: UR_L0, docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"},
69+
# # {name: L0_V2, runner: UR_L0},
70+
# # {name: L0, runner: UR_L0, static: ON},
71+
# # {name: OPENCL, runner: UR_OPENCL, platform: "Intel(R) OpenCL"},
72+
# # {name: CUDA, runner: UR_CUDA},
73+
# # {name: HIP, runner: UR_HIP},
74+
# # {name: NATIVE_CPU, runner: UR_NATIVE_CPU},
75+
# # {name: OPENCL, runner: UR_OPENCL, other_adapter: NATIVE_CPU, platform: "OPENCL:Intel(R) OpenCL"},
76+
# # {name: L0, runner: UR_L0, other_adapter: NATIVE_CPU},
77+
# ]
7378
uses: ./.github/workflows/ur-build-hw.yml
7479
with:
75-
adapter_name: ${{ matrix.adapter.name }}
76-
runner_name: ${{ matrix.adapter.runner }}
77-
static_loader: ${{ matrix.adapter.static || 'OFF' }}
78-
static_adapter: ${{ matrix.adapter.static || 'OFF' }}
79-
platform: ${{ matrix.adapter.platform || '' }}
80-
other_adapter_name: ${{ matrix.adapter.other_adapter || '' }}
81-
docker_image: ${{ matrix.adapter.docker_image }}
80+
adapter_name: ${{ matrix.name }}
81+
runner_name: ${{ matrix.runner }}
82+
static_loader: ${{ matrix.static || 'OFF' }}
83+
static_adapter: ${{ matrix.static || 'OFF' }}
84+
platform: ${{ matrix.platform || '' }}
85+
other_adapter_name: ${{ matrix.other_adapter || '' }}
86+
docker_image: ${{ matrix.docker_image }}
87+
image_options: ${{ matrix.image_options || '' }}
8288

8389
# macos:
8490
# name: MacOS build only

0 commit comments

Comments
 (0)