Skip to content

Commit

Permalink
Fix planned testing github CI
Browse files Browse the repository at this point in the history
There has been some failures since the move to the new docker. The first
is because we are running 24.04 instead of 22.04 for create_ock_artefact
and using pip. The second is that we no longer set up python3 as python
binary.
  • Loading branch information
coldav committed Jan 17, 2025
1 parent 47df6fd commit 726e7c4
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/actions/do_build_dpcpp/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ runs:
if: inputs.create_dpcpp_artefact_method == 'build'
shell: bash
run:
cd llvm; python buildbot/configure.py
cd llvm; python3 buildbot/configure.py
-o build
--host-target="X86;AArch64;RISCV"
--native_cpu
Expand All @@ -56,7 +56,7 @@ runs:
if: inputs.create_dpcpp_artefact_method == 'build'
shell: bash
run:
python llvm/buildbot/compile.py -o llvm/build -v -j 8
python3 llvm/buildbot/compile.py -o llvm/build -v -j 8

- name: build extra utilties
if: inputs.create_dpcpp_artefact_method == 'build'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run_opencl_cts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ runs:
fi
set -x
# Note: use 'eval' built-in to handle quoting/escaping/splitting reqs
RUN_CITIES="python -u $GITHUB_WORKSPACE/scripts/testing/run_cities.py -v \
RUN_CITIES="python3 -u $GITHUB_WORKSPACE/scripts/testing/run_cities.py -v \
--color=always --timeout $CTS_TIMEOUT \
$QEMU_SETTING \
-b $GITHUB_WORKSPACE/test_conformance \
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run_sycl_cts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ runs:
export ONEAPI_DEVICE_SELECTOR=opencl:0
export CTS_CSV_FILE=$GITHUB_WORKSPACE/.github/scripts/sycl-cts.csv
set -x
python $GITHUB_WORKSPACE/scripts/testing/run_cities.py \
python3 $GITHUB_WORKSPACE/scripts/testing/run_cities.py \
--color=always \
--timeout $SYCL_CTS_TIMEOUT \
$PREPEND_PATH \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/planned_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
# build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
runs-on: cp-ubuntu-24.04
container:
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' }}
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest' }}
volumes:
- ${{github.workspace}}:${{github.workspace}}
if : inputs.ock && contains(inputs.target_list, 'linux')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -457,9 +457,9 @@ jobs:
hal_refsi_thread_mode: WI
debug_support: ON
# For now DO NOT include run_cities.py testing. Run commands generated by the import tool are:
#- run: python -u scripts/storage.py pull artefact.ca-opencl-cts --verbose --clean --path CA-OpenCL-CTS Ubuntu20 x86_64 14 Release
#- run: python3 -u scripts/storage.py pull artefact.ca-opencl-cts --verbose --clean --path CA-OpenCL-CTS Ubuntu20 x86_64 14 Release
#- run: echo 'Subgroups,subgroups/test_subgroups barrier_functions_core' >> skipped.txt
#- run: python scripts/testing/run_cities.py -s scripts/jenkins/cts_summary/opencl_conformance_tests_wimpy_very_quick.csv -i skipped.txt -b CA-OpenCL-CTS/bin -L build/lib -e OCL_ICD_FILENAMES=$PWD/build/lib/libCL.so -e OCL_ICD_VENDORS=/dev/null --timeout 00:10:00 --verbose -l build/cts.log -f build/cts.fail -r build/cts_refsi_g1_wi.xml
#- run: python3 scripts/testing/run_cities.py -s scripts/jenkins/cts_summary/opencl_conformance_tests_wimpy_very_quick.csv -i skipped.txt -b CA-OpenCL-CTS/bin -L build/lib -e OCL_ICD_FILENAMES=$PWD/build/lib/libCL.so -e OCL_ICD_VENDORS=/dev/null --timeout 00:10:00 --verbose -l build/cts.log -f build/cts.fail -r build/cts_refsi_g1_wi.xml
- run: ninja -C build check-ock
- run: ninja -C build check-ock-UnitCL-half
# For now DO NOT include upload of run_cities.py testing logs. Action commands generated by the import tool are:
Expand Down

0 comments on commit 726e7c4

Please sign in to comment.