Skip to content

Commit 58d681a

Browse files
authored
[CI][Devops] Remove unstable driver containers (#18813)
None of CI is using the unstable driver containers, the container driver build is private, and the script building it was failing for a long time and nobody noticed. `igc-dev` doesn't use it either. Just remove it. --------- Signed-off-by: Sarnie, Nick <[email protected]>
1 parent 2758b1b commit 58d681a

File tree

6 files changed

+9
-44
lines changed

6 files changed

+9
-44
lines changed

.github/workflows/sycl-containers-igc-dev.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
imagefile: ubuntu2404_intel_drivers
3636
tag: devigc
3737
build_args: |
38-
"use_unstable_driver=false"
3938
"use_igc_dev=true"
4039
steps:
4140
- name: Checkout

.github/workflows/sycl-containers.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,23 @@ jobs:
5454
- name: Intel Drivers Ubuntu 22.04 Docker image
5555
file: ubuntu2204_intel_drivers
5656
tag: latest
57-
build_args: "use_unstable_driver=false"
57+
build_args: ""
5858
- name: Intel Drivers Ubuntu 24.04 Docker image
5959
file: ubuntu2404_intel_drivers
6060
tag: latest
61-
build_args: "use_unstable_driver=false"
62-
- name: Intel Drivers (unstable) Ubuntu 24.04 Docker image
63-
file: ubuntu2404_intel_drivers
64-
tag: unstable
65-
build_args: "use_unstable_driver=true"
61+
build_args: ""
6662
- name: Build + Intel Drivers Ubuntu 22.04 Docker image
6763
file: ubuntu2204_intel_drivers
6864
tag: alldeps
6965
build_args: |
7066
base_image=ghcr.io/intel/llvm/ubuntu2204_build
7167
base_tag=latest
72-
use_unstable_driver=false
7368
- name: Build + Intel Drivers Ubuntu 24.04 Docker image
7469
file: ubuntu2404_intel_drivers
7570
tag: alldeps
7671
build_args: |
7772
base_image=ghcr.io/intel/llvm/ubuntu2404_build
7873
base_tag=latest
79-
use_unstable_driver=false
8074
steps:
8175
- name: Checkout
8276
uses: actions/checkout@v4

devops/containers/ubuntu2204_intel_drivers.Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ FROM $base_image:$base_tag
55

66
ENV DEBIAN_FRONTEND=noninteractive
77

8-
ARG use_unstable_driver=true
9-
108
USER root
119

1210
RUN apt update && apt install -yqq wget
@@ -18,12 +16,7 @@ COPY dependencies.json /
1816
RUN mkdir /runtimes
1917
ENV INSTALL_LOCATION=/runtimes
2018
RUN --mount=type=secret,id=github_token \
21-
if [ "$use_unstable_driver" = "true" ]; then \
22-
install_driver_opt=" --use-latest"; \
23-
else \
24-
install_driver_opt=" dependencies.json"; \
25-
fi && \
26-
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
19+
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all
2720

2821
COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
2922

devops/containers/ubuntu2404_intel_drivers.Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ FROM $base_image:$base_tag
55

66
ENV DEBIAN_FRONTEND=noninteractive
77

8-
ARG use_unstable_driver=true
9-
108
USER root
119

1210
RUN apt update && apt install -yqq wget
@@ -18,12 +16,7 @@ COPY dependencies.json /
1816
RUN mkdir /runtimes
1917
ENV INSTALL_LOCATION=/runtimes
2018
RUN --mount=type=secret,id=github_token \
21-
if [ "$use_unstable_driver" = "true" ]; then \
22-
install_driver_opt=" --use-latest"; \
23-
else \
24-
install_driver_opt=" dependencies.json"; \
25-
fi && \
26-
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all
19+
GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all
2720

2821
COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
2922

devops/scripts/install_drivers.sh

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ if [ -f "$1" ]; then
1919
IGC_DEV_VER=$(jq -r '.linux.igc_dev.version' $CONFIG_FILE_IGC_DEV)
2020
IGC_DEV_URL=$(jq -r '.linux.igc_dev.url' $CONFIG_FILE_IGC_DEV)
2121
fi
22-
elif [[ "$*" == *"--use-latest"* ]]; then
23-
CR_TAG=latest
24-
IGC_TAG=latest
25-
CM_TAG=latest
26-
L0_TAG=latest
27-
TBB_TAG=latest
28-
FPGA_TAG=latest
29-
CPU_TAG=latest
3022
else
3123
CR_TAG=$compute_runtime_tag
3224
IGC_TAG=$igc_tag
@@ -43,11 +35,7 @@ fi
4335
function get_release() {
4436
REPO=$1
4537
TAG=$2
46-
if [ "$TAG" == "latest" ]; then
47-
URL="https://api.github.com/repos/${REPO}/releases/latest"
48-
else
49-
URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}"
50-
fi
38+
URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}"
5139
HEADER=""
5240
if [ "$GITHUB_TOKEN" != "" ]; then
5341
HEADER="Authorization: Bearer $GITHUB_TOKEN"
@@ -149,7 +137,7 @@ InstallIGFX () {
149137
# Backup and install it from release igc as a temporarily workaround
150138
# while we working to resolve the issue.
151139
echo "Backup libopencl-clang"
152-
cp -d /usr/local/lib/libopencl-clang2.so.14* .
140+
cp -d /usr/local/lib/libopencl-clang2.so.15* .
153141
echo "Download IGC dev git hash $IGC_DEV_VER"
154142
get_pre_release_igfx $IGC_DEV_URL $IGC_DEV_VER
155143
echo "Install IGC dev git hash $IGC_DEV_VER"
@@ -158,12 +146,12 @@ InstallIGFX () {
158146
dpkg -i --force-all *.deb
159147
echo "Install libopencl-clang"
160148
# Workaround only, will download deb and install with dpkg once fixed.
161-
cp -d libopencl-clang2.so.14* /usr/local/lib/
149+
cp -d libopencl-clang2.so.15* /usr/local/lib/
162150
rm /usr/local/lib/libigc.so /usr/local/lib/libigc.so.1* && \
163151
ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so && \
164152
ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so.1
165153
echo "Clean up"
166-
rm *.deb libopencl-clang2.so.14*
154+
rm *.deb libopencl-clang2.so.15*
167155
echo "$IGC_DEV_TAG" > /usr/local/lib/igc/IGCTAG.txt
168156
fi
169157
}
@@ -215,7 +203,6 @@ if [[ $# -eq 0 ]] ; then
215203
echo "--use-dev-igc - Install development version of Intel Graphics drivers instead"
216204
echo "--cpu - Install Intel CPU OpenCL runtime"
217205
echo "--fpga-emu - Install Intel FPGA Fast emulator"
218-
echo "--use-latest - Use latest for all tags"
219206
echo "Set INSTALL_LOCATION env variable to specify install location"
220207
exit 0
221208
fi

sycl/doc/developer/DockerBKMs.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,12 @@ development containers:
6060
setup for building DPC++ compiler from source.
6161
- `devops/containers/ubuntu2404_intel_drivers`: contains everything from the
6262
base Dockerfile + pre-installed Intel drivers.
63-
The Dockerfile comes in four flavors/tags:
63+
The Dockerfile comes in three flavors/tags:
6464
* `latest`: Intel drivers are downloaded from release/tag and saved in
6565
dependencies.json. The drivers are tested/validated everytime we upgrade
6666
the driver.
6767
* `devigc`: Intel Graphics Compiler driver from github actions artifacts,
6868
other drivers are downloaded from release/tag and saved in dependencies.json.
69-
* `unstable`: Intel drivers are downloaded from release/latest.
7069
* `alldeps`: Includes the same Intel drivers as `latest`, as well as the
7170
development kits for NVidia/AMD from the `ubuntu2404_build` Dockerfile.
7271
The drivers are installed as it is, not tested or validated.

0 commit comments

Comments
 (0)