Skip to content

Commit 8705ba4

Browse files
rbanka1rbanka1
committed
added dockers fix
Signed-off-by: rbanka1 <[email protected]>
1 parent 01cdf11 commit 8705ba4

File tree

5 files changed

+74
-97
lines changed

5 files changed

+74
-97
lines changed

‎.github/workflows/sycl-linux-precommit-aws.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ permissions:
2121

2222
jobs:
2323
create-check:
24-
if: false
2524
runs-on: [Linux, aux-tasks]
2625
permissions:
2726
checks: write
@@ -46,7 +45,6 @@ jobs:
4645
})
4746
4847
aws-start:
49-
if: false
5048
runs-on: ubuntu-latest
5149
environment: aws
5250
steps:
@@ -63,7 +61,6 @@ jobs:
6361
AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
6462

6563
e2e-cuda:
66-
if: false
6764
needs: [aws-start]
6865
uses: ./.github/workflows/sycl-linux-run-tests.yml
6966
with:
@@ -81,7 +78,6 @@ jobs:
8178
sycl_toolchain_decompress_command: zstd
8279

8380
update-check:
84-
if: false
8581
needs: [create-check, e2e-cuda]
8682
if: always()
8783
runs-on: [Linux, aux-tasks]
@@ -108,7 +104,6 @@ jobs:
108104
})
109105
110106
aws-stop:
111-
if: false
112107
needs: [aws-start, e2e-cuda]
113108
if: always()
114109
runs-on: ubuntu-latest

‎.github/workflows/sycl-linux-precommit.yml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ jobs:
4444

4545
build:
4646
needs: [detect_changes]
47-
# if: always() && success()
48-
if: false
47+
if: always() && success()
4948
uses: ./.github/workflows/sycl-linux-build.yml
5049
with:
5150
build_ref: ${{ github.sha }}
@@ -65,8 +64,7 @@ jobs:
6564
# The idea is to ensure that the code works with both CUDA versions.
6665
build_ubuntu2204:
6766
needs: [detect_changes]
68-
# if: always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur_cuda_adapter')
69-
if: false
67+
if: always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur_cuda_adapter')
7068
uses: ./.github/workflows/sycl-linux-build.yml
7169
with:
7270
build_ref: ${{ github.sha }}
@@ -78,8 +76,7 @@ jobs:
7876

7977
run_prebuilt_e2e_tests:
8078
needs: [build, detect_changes]
81-
# if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
82-
if: false
79+
if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
8380
strategy:
8481
fail-fast: false
8582
matrix:
@@ -163,12 +160,11 @@ jobs:
163160

164161
test-perf:
165162
needs: [build, detect_changes]
166-
# if: |
167-
# always() && !cancelled()
168-
# && needs.build.outputs.build_conclusion == 'success'
169-
# && (contains(github.event.pull_request.labels.*.name, 'run-perf-tests')
170-
# || contains(needs.detect_changes.outputs.filters, 'perf-tests'))
171-
if: false
163+
if: |
164+
always() && !cancelled()
165+
&& needs.build.outputs.build_conclusion == 'success'
166+
&& (contains(github.event.pull_request.labels.*.name, 'run-perf-tests')
167+
|| contains(needs.detect_changes.outputs.filters, 'perf-tests'))
172168
strategy:
173169
fail-fast: false
174170
matrix:

‎.github/workflows/sycl-windows-precommit.yml‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,20 @@ jobs:
4343

4444
build:
4545
needs: [detect_changes]
46-
# if: |
47-
# always() && success()
48-
# && github.repository == 'intel/llvm'
49-
if: false
46+
if: |
47+
always() && success()
48+
&& github.repository == 'intel/llvm'
5049
uses: ./.github/workflows/sycl-windows-build.yml
5150
with:
5251
changes: ${{ needs.detect_changes.outputs.filters }}
5352

5453
build-e2e:
5554
needs: build
5655
# Continue if build was successful.
57-
# if: |
58-
# always()
59-
# && !cancelled()
60-
# && needs.build.outputs.build_conclusion == 'success'
61-
if: false
56+
if: |
57+
always()
58+
&& !cancelled()
59+
&& needs.build.outputs.build_conclusion == 'success'
6260
uses: ./.github/workflows/sycl-windows-run-tests.yml
6361
with:
6462
name: Build Windows E2E tests
@@ -71,11 +69,10 @@ jobs:
7169
run_prebuilt_e2e_tests:
7270
needs: [build, build-e2e]
7371
# Continue if build was successful.
74-
# if: |
75-
# always()
76-
# && !cancelled()
77-
# && needs.build.outputs.build_conclusion == 'success'
78-
if: false
72+
if: |
73+
always()
74+
&& !cancelled()
75+
&& needs.build.outputs.build_conclusion == 'success'
7976
strategy:
8077
fail-fast: false
8178
matrix:

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,12 @@ env:
7676
UR_LOG_LEVEL_ZERO: "level:error;flush:error"
7777
UR_LOG_NATIVE_CPU: "level:error;flush:error"
7878
UR_LOG_OPENCL: "level:error;flush:error"
79-
CURRENT_DIR: $(pwd)
8079

8180
jobs:
8281
adapter_build_hw:
8382
name: Build & CTS
8483
# run only on upstream; forks won't have the HW
85-
# if: github.repository == 'intel/llvm'
84+
if: github.repository == 'intel/llvm'
8685
strategy:
8786
fail-fast: false
8887
matrix:
@@ -113,18 +112,19 @@ jobs:
113112
- name: Checkout LLVM
114113
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
115114

116-
- name: Set up Python 3.10
115+
# for some reason it's required to re-configure python for venv to work properly.
116+
- name: Set up Python 3.12
117117
if: ${{ inputs.docker_image == 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps' }}
118-
uses: actions/setup-python@v5
118+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
119119
with:
120-
python-version: '3.10'
120+
python-version: '3.12'
121121

122122
- name: Install UR python dependencies in venv
123123
working-directory: ./unified-runtime
124124
run: |
125125
python3 -m venv .venv
126126
. .venv/bin/activate
127-
echo "${PWD}/.venv/bin" >> $GITHUB_PATH
127+
echo "$PATH" >> $GITHUB_PATH
128128
pip install -r third_party/requirements.txt
129129
pip install -r third_party/requirements_testing.txt
130130
@@ -177,17 +177,15 @@ jobs:
177177
- name: Test adapter specific
178178
env:
179179
ZE_ENABLE_LOADER_DEBUG_TRACE: 1
180-
ZE_DEBUG: 1
181-
run: ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "adapter-specific" -E "memcheck" --timeout 600
180+
run: ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "adapter-specific" -E "memcheck" --timeout 600 -VV
182181
# Don't run adapter specific tests when building multiple adapters
183182
if: ${{ matrix.adapter.other_name == '' }}
184183

185184
- name: Test adapters
186185
env:
187186
ZE_ENABLE_LOADER_DEBUG_TRACE: 1
188-
ZE_DEBUG: 1
189-
run: env UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "conformance" --timeout 600
187+
run: env UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --test-dir build --output-on-failure -L "conformance" --timeout 600 -VV
190188

191189
- name: Get information about platform
192190
if: ${{ always() }}
193-
run: ./unified-runtime/.github/scripts/get_system_info.sh
191+
run: ./unified-runtime/.github/scripts/get_system_info.sh

‎.github/workflows/ur-precommit.yml‎

Lines changed: 46 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ name: Unified Runtime Pre Commit
55

66
# Note: the trigger is copy-pasted from sycl-linux-precommit.yml - probably to be fine-tuned.
77
on:
8-
push:
9-
branches-ignore:
10-
- 'dependabot/**'
118
# We rely on "Fork pull request workflows from outside collaborators" -
129
# "Require approval for all outside collaborators" at
1310
# https://github.com/intel/llvm/settings/actions for security.
@@ -43,46 +40,40 @@ jobs:
4340
name: Detect Changes
4441
uses: ./.github/workflows/sycl-detect-changes.yml
4542

46-
# source_checks:
47-
# name: Source Checks
48-
# needs: [detect_changes]
49-
# if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
50-
# uses: ./.github/workflows/ur-source-checks.yml
43+
source_checks:
44+
name: Source Checks
45+
needs: [detect_changes]
46+
if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
47+
uses: ./.github/workflows/ur-source-checks.yml
5148

5249
adapters:
5350
name: Adapters
54-
# needs: [detect_changes, source_checks]
55-
# if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
56-
# needs: [detect_changes, source_checks]
57-
# if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
51+
needs: [detect_changes, source_checks]
52+
if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
5853
strategy:
5954
matrix:
55+
# Extra native CPU jobs are here to force the loader to be used.
56+
# UR will not use the loader if there is only one target.
6057
include:
6158
- name: L0
6259
runner: UR_L0
63-
docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
6460
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6561
- name: L0_V2
6662
runner: UR_L0
67-
docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
6863
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6964
- name: L0
7065
runner: UR_L0
71-
docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
72-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7366
static: ON
67+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7468
- name: L0
7569
runner: UR_L0
76-
docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
77-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7870
other_adapter: NATIVE_CPU
71+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7972
- name: HIP
8073
runner: UR_HIP
81-
docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
8274
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --cap-add=SYS_ADMIN
8375
- name: CUDA
8476
runner: UR_CUDA
85-
docker_image: "ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps"
8677
image_options: -u 1001 --privileged --cap-add SYS_ADMIN --gpus all
8778
- name: OPENCL
8879
runner: UR_OPENCL
@@ -92,9 +83,9 @@ jobs:
9283
- name: OPENCL
9384
runner: UR_OPENCL
9485
platform: "OPENCL:Intel(R) OpenCL"
86+
other_adapter: NATIVE_CPU
9587
docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
9688
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN
97-
other_adapter: NATIVE_CPU
9889
- name: NATIVE_CPU
9990
runner: UR_NATIVE_CPU
10091
docker_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
@@ -107,45 +98,45 @@ jobs:
10798
static_adapter: ${{ matrix.static || 'OFF' }}
10899
platform: ${{ matrix.platform || '' }}
109100
other_adapter_name: ${{ matrix.other_adapter || '' }}
110-
docker_image: ${{ matrix.docker_image }}
101+
docker_image: ${{ matrix.docker_image || 'ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps'}}
111102
image_options: ${{ matrix.image_options || '' }}
112103

113-
# macos:
114-
# name: MacOS build only
115-
# needs: [detect_changes, source_checks]
116-
# if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
117-
# strategy:
118-
# matrix:
119-
# os: ['macos-13']
120-
# runs-on: ${{matrix.os}}
104+
macos:
105+
name: MacOS build only
106+
needs: [detect_changes, source_checks]
107+
if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
108+
strategy:
109+
matrix:
110+
os: ['macos-13']
111+
runs-on: ${{matrix.os}}
121112

122-
# steps:
123-
# - name: Checkout LLVM
124-
# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
113+
steps:
114+
- name: Checkout LLVM
115+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
125116

126-
# - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.0.0
127-
# with:
128-
# python-version: "3.10"
117+
- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.0.0
118+
with:
119+
python-version: "3.10"
129120

130-
# - name: Install prerequisites
131-
# working-directory: ${{github.workspace}}/unified-runtime
132-
# run: |
133-
# python3 -m pip install -r third_party/requirements.txt
134-
# python3 -m pip install -r third_party/requirements_testing.txt
121+
- name: Install prerequisites
122+
working-directory: ${{github.workspace}}/unified-runtime
123+
run: |
124+
python3 -m pip install -r third_party/requirements.txt
125+
python3 -m pip install -r third_party/requirements_testing.txt
135126
136-
# - name: Install hwloc
137-
# run: brew install hwloc
127+
- name: Install hwloc
128+
run: brew install hwloc
138129

139-
# - name: Configure Unified Runtime project
140-
# working-directory: ${{github.workspace}}/unified-runtime
141-
# run: >
142-
# cmake
143-
# -B${{github.workspace}}/build
144-
# -DUR_ENABLE_TRACING=ON
145-
# -DUR_DEVELOPER_MODE=ON
146-
# -DCMAKE_BUILD_TYPE=Release
147-
# -DUR_BUILD_TESTS=ON
148-
# -DUR_FORMAT_CPP_STYLE=ON
130+
- name: Configure Unified Runtime project
131+
working-directory: ${{github.workspace}}/unified-runtime
132+
run: >
133+
cmake
134+
-B${{github.workspace}}/build
135+
-DUR_ENABLE_TRACING=ON
136+
-DUR_DEVELOPER_MODE=ON
137+
-DCMAKE_BUILD_TYPE=Release
138+
-DUR_BUILD_TESTS=ON
139+
-DUR_FORMAT_CPP_STYLE=ON
149140
150-
# - name: Build
151-
# run: cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)
141+
- name: Build
142+
run: cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)

0 commit comments

Comments
 (0)