Skip to content

Commit fff9381

Browse files
alan-forbes-cpalan-forbes-cp
committed
Reinstate some jobs previously suppressed for development
1 parent 0fe395d commit fff9381

File tree

3 files changed

+15
-23
lines changed

3 files changed

+15
-23
lines changed

‎.github/actions/run_sycl_cts/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ runs:
114114
PREPEND_PATH: '' # TODO: have qemu as input and set up this
115115
SYCL_CTS_TIMEOUT: '02:00:00'
116116
run: |
117-
echo running sycl cts
117+
echo running sycl cts expected fails
118118
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install_dpcpp/lib:$GITHUB_WORKSPACE/install_ock/lib
119119
export ONEAPI_DEVICE_SELECTOR=opencl:0
120120
python3 $GITHUB_WORKSPACE/scripts/testing/run_cities.py \

‎.github/workflows/planned_testing.yml

+13-22
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,8 @@ jobs:
124124
fail-fast: false # let all matrix jobs complete
125125
matrix:
126126
target: ${{ fromJson(inputs.target_list) }}
127-
#exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
128-
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
127+
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
129128

130-
# ALAN TODO: fix comment
131129
# risc-v needs ubuntu 24.04 so we get the latest qemu as well as how we
132130
# build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
133131
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
@@ -151,8 +149,8 @@ jobs:
151149
with:
152150
target: ${{ matrix.target }}
153151
llvm_version: ${{ inputs.llvm_version }}
154-
#download_ock_artefact: ${{ inputs.download_ock_artefact }}
155-
download_ock_artefact: ${{ matrix.target }}=13455746029
152+
download_ock_artefact: ${{ inputs.download_ock_artefact }}
153+
#download_ock_artefact: ${{ matrix.target }}=13455746029
156154

157155
build_icd:
158156
if: inputs.test_tornado || inputs.test_opencl_cts || inputs.test_sycl_cts
@@ -161,8 +159,7 @@ jobs:
161159
fail-fast: false # let all matrix jobs complete
162160
matrix:
163161
target: ${{ fromJson(inputs.target_list) }}
164-
#exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
165-
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
162+
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
166163

167164
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
168165
container:
@@ -257,7 +254,6 @@ jobs:
257254
target: ${{ fromJson(inputs.target_list) }}
258255
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
259256

260-
# ALAN TODO: Fix comment: Extend if we decide to enable for windows or build natively on another target
261257
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
262258
container:
263259
image: ${{ contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
@@ -278,13 +274,13 @@ jobs:
278274
uses: ./.github/actions/do_build_dpcpp
279275
with:
280276
target: ${{ matrix.target }}
281-
#download_dpcpp_artefact: ${{ inputs.download_dpcpp_artefact }} # ALAN TODO ADD ID
282-
download_dpcpp_artefact: ${{ matrix.target }}=13455746029
277+
download_dpcpp_artefact: ${{ inputs.download_dpcpp_artefact }}
278+
#download_dpcpp_artefact: ${{ matrix.target }}=13455746029
283279

284280
build_dpcpp_cross:
285281
needs: [workflow_vars, build_dpcpp_native] # cross builds need pre-built native artefact
286282
strategy:
287-
fail-fast: false # let all matrix jobs complete ALAN TODO: for now
283+
fail-fast: false # let all matrix jobs complete
288284
matrix:
289285
target: ${{ fromJson(inputs.target_list) }}
290286
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_riscv64) }}
@@ -308,20 +304,18 @@ jobs:
308304
uses: ./.github/actions/do_build_dpcpp
309305
with:
310306
target: ${{ matrix.target }}
311-
#download_dpcpp_artefact: ${{ inputs.download_dpcpp_artefact }} # ALAN TODO: ADD ID
312-
download_dpcpp_artefact: ${{ matrix.target }}=13455746029
307+
download_dpcpp_artefact: ${{ inputs.download_dpcpp_artefact }}
308+
#download_dpcpp_artefact: ${{ matrix.target }}=13455746029
313309

314310
build_sycl_cts:
315311
needs: [workflow_vars, build_icd, build_dpcpp_native]
316312
strategy:
317-
fail-fast: false # let all matrix jobs complete ALAN TODO: for now
313+
fail-fast: false # let all matrix jobs complete
318314
matrix:
319315
target: ${{ fromJson(inputs.target_list) }}
320316
# TODO: For now just linux x86_64 & aarch64
321-
#exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64) }}
322317
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
323318

324-
# ALAN TODO: Fix comment: Extend if we decide to enable for windows or build natively on another target
325319
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
326320
container:
327321
image: ${{ contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
@@ -342,18 +336,16 @@ jobs:
342336
uses: ./.github/actions/do_build_sycl_cts
343337
with:
344338
target: ${{ matrix.target }}
345-
#download_sycl_cts_artefact: ${{ inputs.download_sycl_cts_artefact }} # ALAN TODO: ADD ID
346-
download_sycl_cts_artefact: ${{ matrix.target }}=13455746029
339+
download_sycl_cts_artefact: ${{ inputs.download_sycl_cts_artefact }}
340+
#download_sycl_cts_artefact: ${{ matrix.target }}=13455746029
347341

348342
run_sycl_cts:
349-
# ALAN TODO: Check needs reqs here - what if cross also needed ??
350343
needs: [workflow_vars, create_ock_artefacts_ubuntu, build_dpcpp_native, build_sycl_cts]
351344
strategy:
352-
fail-fast: false # let all matrix jobs complete ALAN TODO: for now
345+
fail-fast: false # let all matrix jobs complete
353346
matrix:
354347
target: ${{ fromJson(inputs.target_list) }}
355348
# TODO: For now just linux x86_64 and aarch64
356-
#exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64) }}
357349
exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
358350

359351
runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
@@ -362,7 +354,6 @@ jobs:
362354
|| 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}
363355
volumes:
364356
- ${{github.workspace}}:${{github.workspace}}
365-
# ALAN TODO: Check if reqs here - what if cross also needed ??
366357
if: inputs.test_sycl_cts
367358
steps:
368359
- name: Checkout repo

‎.github/workflows/planned_testing_caller.yml

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
# "host_refsi_linux",
3131
# "host_x86_64_windows" ]'
3232
target_list: '[ "host_x86_64_linux",
33+
"host_riscv64_linux",
3334
"host_aarch64_linux" ]'
3435
ock: true
3536
test_tornado: false

0 commit comments

Comments
 (0)