Skip to content

Commit cc59d77

Browse files
author
Pavel Chupin
authored
[CI] Update drivers installation process into containers (#7730)
* Install level_zero loader and headers as part of the drivers installation. Should be installed as dependency into containers, rather than built and shipped with the compiler. * Add level_zero to update_drivers.py * Fix CM install. Takes version from dependencies.json rather than always the latest. * Exclude u18 CM package from consideration. Before it was installing u18 then u20 and produced a warning. * Update "unstable" containers build by always taking the "latest" packages rather than relying on prior definition of staging versions. * Clean up dependencies.json and erase specific staging versions. We stopped updating these earlier.
1 parent 4e5f3f2 commit cc59d77

File tree

7 files changed

+33
-57
lines changed

7 files changed

+33
-57
lines changed

‎.github/workflows/sycl_containers.yaml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ jobs:
9494
build-args: |
9595
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
9696
igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
97+
cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
98+
level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
9799
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
98100
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
99101
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
@@ -128,12 +130,8 @@ jobs:
128130
tags: |
129131
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable-${{ github.sha }}
130132
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable
131-
build-args: |
132-
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.compute_runtime.github_tag}}
133-
igc_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.igc.github_tag}}
134-
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.tbb.github_tag}}
135-
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.fpgaemu.github_tag}}
136-
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.oclcpu.github_tag}}
133+
# build-args:empty , so we automatically take the "latest" tags as
134+
# unstable
137135

138136
base_image_ubuntu2204:
139137
if: github.repository == 'intel/llvm'
@@ -207,10 +205,11 @@ jobs:
207205
build-args: |
208206
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
209207
igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
208+
cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
209+
level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
210210
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
211211
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
212212
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
213-
214213
# This job produces a Docker container with the latest versions of Intel
215214
# drivers, that can be found on GitHub.
216215
drivers_image_ubuntu2204_unstable:
@@ -241,10 +240,5 @@ jobs:
241240
tags: |
242241
ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:unstable-${{ github.sha }}
243242
ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:unstable
244-
build-args: |
245-
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.compute_runtime.github_tag}}
246-
igc_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.igc.github_tag}}
247-
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.tbb.github_tag}}
248-
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.fpgaemu.github_tag}}
249-
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.oclcpu.github_tag}}
250-
243+
# build-args:empty, so we automatically take the "latest" tags as
244+
# unstable

‎devops/containers/ubuntu2004_intel_drivers.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
88
ARG compute_runtime_tag=latest
99
ARG igc_tag=latest
1010
ARG cm_tag=latest
11+
ARG level_zero_tag=latest
1112
ARG tbb_tag=latest
1213
ARG fpgaemu_tag=latest
1314
ARG cpu_tag=latest

‎devops/containers/ubuntu2204_intel_drivers.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
88
ARG compute_runtime_tag=latest
99
ARG igc_tag=latest
1010
ARG cm_tag=latest
11+
ARG level_zero_tag=latest
1112
ARG tbb_tag=latest
1213
ARG fpgaemu_tag=latest
1314
ARG cpu_tag=latest

‎devops/dependencies.json

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
"url": "https://github.com/intel/cm-compiler/releases/tag/cmclang-1.0.144",
1919
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
2020
},
21+
"level_zero": {
22+
"github_tag": "v1.8.8",
23+
"version": "v1.8.8",
24+
"url": "https://github.com/oneapi-src/level-zero/releases/tag/v1.8.8",
25+
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
26+
},
2127
"tbb": {
2228
"github_tag": "v2021.5.0",
2329
"version": "2021.5.0",
@@ -40,47 +46,6 @@
4046
"root": "{ARCHIVE_ROOT}/comp/oclfpga/linux"
4147
}
4248
},
43-
"linux_staging": {
44-
"compute_runtime": {
45-
"github_tag": "22.31.23852",
46-
"version": "22.31.23852",
47-
"url": "https://github.com/intel/compute-runtime/releases/tag/22.31.23852",
48-
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
49-
},
50-
"igc": {
51-
"github_tag": "igc-1.0.11485",
52-
"version": "1.0.11485",
53-
"url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.11485",
54-
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
55-
},
56-
"cm": {
57-
"github_tag": "cmclang-1.0.144",
58-
"version": "1.0.144",
59-
"url": "https://github.com/intel/cm-compiler/releases/tag/cmclang-1.0.144",
60-
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
61-
},
62-
"tbb": {
63-
"github_tag": "v2021.5.0",
64-
"version": "2021.5.0",
65-
"url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.5.0/oneapi-tbb-2021.5.0-lin.tgz",
66-
"root": "{DEPS_ROOT}/tbb/lin"
67-
},
68-
"oclcpu": {
69-
"github_tag": "2021-WW50",
70-
"version": "2021.13.11.0.23",
71-
"url": "https://github.com/intel/llvm/releases/download/2021-WW50/oclcpuexp-2021.13.11.0.23_rel.tar.gz",
72-
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclcpu"
73-
},
74-
"fpgaemu": {
75-
"github_tag": "2021-WW50",
76-
"version": "2021.13.11.0.23",
77-
"url": "https://github.com/intel/llvm/releases/download/2021-WW50/fpgaemu-2021.13.11.0.23_rel.tar.gz",
78-
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclfpgaemu"
79-
},
80-
"fpga": {
81-
"root": "{ARCHIVE_ROOT}/comp/oclfpga/linux"
82-
}
83-
},
8449
"windows": {
8550
"compute_runtime": {
8651
"version": "101.1191",
@@ -109,4 +74,4 @@
10974
"root": "{ARCHIVE_ROOT}/comp/oclfpga/win"
11075
}
11176
}
112-
}
77+
}

‎devops/scripts/generate_test_matrix.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ module.exports = ({core, process}) => {
1717
driverOld["linux"]["igc"]["version"] ||
1818
driverNew["linux"]["cm"]["version"] !==
1919
driverOld["linux"]["cm"]["version"] ||
20+
driverNew["linux"]["level_zero"]["version"] !==
21+
driverOld["linux"]["level_zero"]["version"] ||
2022
driverNew["linux"]["tbb"]["version"] !==
2123
driverOld["linux"]["tbb"]["version"] ||
2224
driverNew["linux"]["oclcpu"]["version"] !==
@@ -37,6 +39,7 @@ module.exports = ({core, process}) => {
3739
driverNew["linux"]["compute_runtime"]["github_tag"],
3840
"igc_tag" : driverNew["linux"]["igc"]["github_tag"],
3941
"cm_tag" : driverNew["linux"]["cm"]["github_tag"],
42+
"level_zero_tag" : driverNew["linux"]["level_zero"]["github_tag"],
4043
"tbb_tag" : driverNew["linux"]["tbb"]["github_tag"],
4144
"cpu_tag" : driverNew["linux"]["oclcpu"]["github_tag"],
4245
"fpgaemu_tag" : driverNew["linux"]["fpgaemu"]["github_tag"],
@@ -82,6 +85,7 @@ module.exports = ({core, process}) => {
8285
driverNew["linux"]["compute_runtime"]["github_tag"],
8386
"igc_tag" : driverNew["linux"]["igc"]["github_tag"],
8487
"cm_tag" : driverNew["linux"]["cm"]["github_tag"],
88+
"level_zero_tag" : driverNew["linux"]["level_zero"]["github_tag"],
8589
"tbb_tag" : driverNew["linux"]["tbb"]["github_tag"],
8690
"cpu_tag" : driverNew["linux"]["oclcpu"]["github_tag"],
8791
"fpgaemu_tag" : driverNew["linux"]["fpgaemu"]["github_tag"],

‎devops/scripts/install_drivers.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
CR_TAG=$compute_runtime_tag
44
IGC_TAG=$igc_tag
55
CM_TAG=$cm_tag
6+
L0_TAG=$level_zero_tag
67
TBB_TAG=$tbb_tag
78
FPGA_TAG=$fpgaemu_tag
89
CPU_TAG=$cpu_tag
@@ -39,6 +40,7 @@ InstallIGFX () {
3940
echo "Compute Runtime version $CR_TAG"
4041
echo "IGC version $IGC_TAG"
4142
echo "CM compiler version $CM_TAG"
43+
echo "Level Zero version $L0_TAG"
4244
python3 $LOCATION/get_release.py intel/intel-graphics-compiler $IGC_TAG \
4345
| grep ".*deb" \
4446
| wget -qi -
@@ -47,6 +49,10 @@ InstallIGFX () {
4749
| wget -qi -
4850
sha256sum -c *.sum && \
4951
python3 $LOCATION/get_release.py intel/cm-compiler $CM_TAG \
52+
| grep ".*deb" \
53+
| grep -v "u18" \
54+
| wget -qi -
55+
python3 $LOCATION/get_release.py oneapi-src/level-zero $L0_TAG \
5056
| grep ".*deb" \
5157
| wget -qi -
5258
dpkg -i *.deb && rm *.deb *.sum

‎devops/scripts/update_drivers.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ def uplift_linux_igfx_driver(config, platform_tag):
3333
config[platform_tag]['cm']['version'] = cm['tag_name'].replace('cmclang-', '')
3434
config[platform_tag]['cm']['url'] = 'https://github.com/intel/cm-compiler/releases/tag/' + cm['tag_name']
3535

36+
level_zero = get_latest_release('oneapi-src/level-zero')
37+
config[platform_tag]['level_zero']['github_tag'] = level_zero['tag_name']
38+
config[platform_tag]['level_zero']['version'] = level_zero['tag_name']
39+
config[platform_tag]['level_zero']['url'] = 'https://github.com/oneapi-src/level-zero/releases/tag/' + level_zero['tag_name']
40+
3641
return config
3742

3843

@@ -52,5 +57,5 @@ def main(platform_tag):
5257

5358

5459
if __name__ == '__main__':
55-
platform_tag = sys.argv[1] if len(sys.argv) > 1 else 'linux_staging'
60+
platform_tag = sys.argv[1] if len(sys.argv) > 1 else "ERROR_PLATFORM"
5661
sys.stdout.write(main(platform_tag) + '\n')

0 commit comments

Comments
 (0)