From d5c31237bd46d036a389aaf79b126842f5f1a9a2 Mon Sep 17 00:00:00 2001 From: "Kornev, Nikita" Date: Fri, 26 Sep 2025 18:30:08 +0200 Subject: [PATCH 1/3] [Devops] Small containers clean-up - get_release.py is unused and likely can be removed - we don't test fpga anymore, so I guess we don't need to install the runtime, so change all -> igfx, cpu. May be this part of script may be removed as well. - there is some leftover after drivers install. Do not download .deb.gpg assets & also remove .ddeb --- devops/containers/ubuntu2204_intel_drivers.Dockerfile | 3 +-- devops/containers/ubuntu2404_intel_drivers.Dockerfile | 3 +-- devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile | 3 +-- devops/scripts/install_drivers.sh | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/devops/containers/ubuntu2204_intel_drivers.Dockerfile b/devops/containers/ubuntu2204_intel_drivers.Dockerfile index d8eb12fa5c82f..221bf4dfea0f2 100644 --- a/devops/containers/ubuntu2204_intel_drivers.Dockerfile +++ b/devops/containers/ubuntu2204_intel_drivers.Dockerfile @@ -9,14 +9,13 @@ USER root RUN apt update && apt install -yqq wget -COPY scripts/get_release.py / COPY scripts/install_drivers.sh / COPY dependencies.json / RUN mkdir /runtimes ENV INSTALL_LOCATION=/runtimes RUN --mount=type=secret,id=github_token \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all + GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --igfx --cpu COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh diff --git a/devops/containers/ubuntu2404_intel_drivers.Dockerfile b/devops/containers/ubuntu2404_intel_drivers.Dockerfile index b61a2a5c10162..5d5a15510c42e 100644 --- a/devops/containers/ubuntu2404_intel_drivers.Dockerfile +++ b/devops/containers/ubuntu2404_intel_drivers.Dockerfile @@ -9,14 +9,13 @@ USER root RUN apt update && apt install -yqq wget -COPY scripts/get_release.py / COPY scripts/install_drivers.sh / COPY dependencies.json / RUN mkdir /runtimes ENV INSTALL_LOCATION=/runtimes RUN --mount=type=secret,id=github_token \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all + GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --igfx --cpu COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh diff --git a/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile b/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile index 99f2ed19fc328..dde27cab9c57d 100644 --- a/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile +++ b/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile @@ -9,7 +9,6 @@ USER root RUN apt update && apt install -yqq libllvm14 libllvm15 libz3-4 -COPY scripts/get_release.py / COPY scripts/install_drivers.sh / COPY dependencies.json / COPY dependencies-igc-dev.json / @@ -18,7 +17,7 @@ RUN mkdir /runtimes ENV INSTALL_LOCATION=/runtimes RUN --mount=type=secret,id=github_token \ install_driver_opt="dependencies.json dependencies-igc-dev.json --use-dev-igc"; \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all + GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --igfx --cpu COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh diff --git a/devops/scripts/install_drivers.sh b/devops/scripts/install_drivers.sh index cb2ebb4775264..699ebf9c5970e 100755 --- a/devops/scripts/install_drivers.sh +++ b/devops/scripts/install_drivers.sh @@ -127,9 +127,9 @@ InstallIGFX () { | grep -v "u18" \ | wget -qi - get_release oneapi-src/level-zero $L0_TAG \ - | grep ".*$UBUNTU_VER.*deb" \ + | grep ".*$UBUNTU_VER.*deb$" \ | wget -qi - - dpkg -i --force-all *.deb && rm *.deb *.sum + dpkg -i --force-all *.deb && rm *.deb *.ddeb *.sum mkdir -p /usr/local/lib/igc/ echo "$IGC_TAG" > /usr/local/lib/igc/IGCTAG.txt if [ "$IS_IGC_DEV" == "Yes" ]; then From a5b3108cb956a4e5a37aa694485d7073bd701121 Mon Sep 17 00:00:00 2001 From: "Kornev, Nikita" Date: Fri, 26 Sep 2025 21:21:35 +0200 Subject: [PATCH 2/3] don't download .ddeb files --- devops/scripts/install_drivers.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/devops/scripts/install_drivers.sh b/devops/scripts/install_drivers.sh index 699ebf9c5970e..4c99ae02f1866 100755 --- a/devops/scripts/install_drivers.sh +++ b/devops/scripts/install_drivers.sh @@ -114,14 +114,10 @@ InstallIGFX () { | grep ".*deb" \ | wget -qi - get_release intel/compute-runtime $CR_TAG \ - | grep -E ".*((deb)|(sum))" \ + | grep -E ".*((\.deb)|(sum))" \ | wget -qi - - # Perform the checksum conditionally and then get the release - # Skip the ww45 checksum because the igc_dev driver was manually updated - # so the package versions don't exactly match. - if [ ! -f "ww45.sum" ]; then - sha256sum -c *.sum - fi + # We don't download .ddeb packages, so ignore missing ones. + sha256sum -c *.sum --ignore-missing get_release intel/cm-compiler $CM_TAG \ | grep ".*deb" \ | grep -v "u18" \ @@ -129,7 +125,7 @@ InstallIGFX () { get_release oneapi-src/level-zero $L0_TAG \ | grep ".*$UBUNTU_VER.*deb$" \ | wget -qi - - dpkg -i --force-all *.deb && rm *.deb *.ddeb *.sum + dpkg -i --force-all *.deb && rm *.deb *.sum mkdir -p /usr/local/lib/igc/ echo "$IGC_TAG" > /usr/local/lib/igc/IGCTAG.txt if [ "$IS_IGC_DEV" == "Yes" ]; then From 9af729b8abd9d0c04b1a4887b88c437a036ee9d9 Mon Sep 17 00:00:00 2001 From: "Kornev, Nikita" Date: Fri, 26 Sep 2025 21:45:19 +0200 Subject: [PATCH 3/3] remove fpga part --- .../ubuntu2204_intel_drivers.Dockerfile | 2 +- .../ubuntu2404_intel_drivers.Dockerfile | 2 +- ...buntu2404_intel_drivers_igc_dev.Dockerfile | 2 +- devops/scripts/get_release.py | 23 ---------------- devops/scripts/install_drivers.sh | 26 ------------------- 5 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 devops/scripts/get_release.py diff --git a/devops/containers/ubuntu2204_intel_drivers.Dockerfile b/devops/containers/ubuntu2204_intel_drivers.Dockerfile index 221bf4dfea0f2..e04cc15c147c7 100644 --- a/devops/containers/ubuntu2204_intel_drivers.Dockerfile +++ b/devops/containers/ubuntu2204_intel_drivers.Dockerfile @@ -15,7 +15,7 @@ COPY dependencies.json / RUN mkdir /runtimes ENV INSTALL_LOCATION=/runtimes RUN --mount=type=secret,id=github_token \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --igfx --cpu + GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh diff --git a/devops/containers/ubuntu2404_intel_drivers.Dockerfile b/devops/containers/ubuntu2404_intel_drivers.Dockerfile index 5d5a15510c42e..8450e523f57da 100644 --- a/devops/containers/ubuntu2404_intel_drivers.Dockerfile +++ b/devops/containers/ubuntu2404_intel_drivers.Dockerfile @@ -15,7 +15,7 @@ COPY dependencies.json / RUN mkdir /runtimes ENV INSTALL_LOCATION=/runtimes RUN --mount=type=secret,id=github_token \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --igfx --cpu + GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh dependencies.json --all COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh diff --git a/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile b/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile index dde27cab9c57d..95fd841b5d007 100644 --- a/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile +++ b/devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile @@ -17,7 +17,7 @@ RUN mkdir /runtimes ENV INSTALL_LOCATION=/runtimes RUN --mount=type=secret,id=github_token \ install_driver_opt="dependencies.json dependencies-igc-dev.json --use-dev-igc"; \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --igfx --cpu + GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh diff --git a/devops/scripts/get_release.py b/devops/scripts/get_release.py deleted file mode 100644 index 5ce5eccf72083..0000000000000 --- a/devops/scripts/get_release.py +++ /dev/null @@ -1,23 +0,0 @@ -from urllib.request import urlopen -import json -import sys - -def get_release_by_tag(repo, tag): - release = urlopen("https://api.github.com/repos/" + repo + "/releases/tags/" + tag).read() - return json.loads(release) - -def get_latest_release(repo): - release = urlopen("https://api.github.com/repos/" + repo + "/releases/latest").read() - return json.loads(release) - -repo = sys.argv[1] -tag = sys.argv[2] - -if tag == "latest": - release = get_latest_release(repo) -else: - release = get_release_by_tag(repo, tag) - -for item in release["assets"]: - print(item["browser_download_url"]) - diff --git a/devops/scripts/install_drivers.sh b/devops/scripts/install_drivers.sh index 4c99ae02f1866..5aef43582d219 100755 --- a/devops/scripts/install_drivers.sh +++ b/devops/scripts/install_drivers.sh @@ -173,33 +173,12 @@ InstallCPURT () { fi } -InstallFPGAEmu () { - echo "Installing Intel FPGA Fast Emulator..." - echo "FPGA Emulator version $FPGA_TAG" - mkdir -p $INSTALL_LOCATION - cd $INSTALL_LOCATION - if [ -d "$INSTALL_LOCATION/fpgaemu" ]; then - echo "$INSTALL_LOCATION/fpgaemu exists and will be removed!" - rm -Rf $INSTALL_LOCATION/fpgaemu; - fi - get_release intel/llvm $FPGA_TAG \ - | grep -E ".*fpgaemu.*tar.gz" \ - | wget -qi - && \ - mkdir fpgaemu && tar -xf *.tar.gz -C fpgaemu && rm *.tar.gz - if [ -e /runtimes/fpgaemu/install.sh ]; then - bash -x /runtimes/fpgaemu/install.sh - else - echo /runtimes/fpgaemu/x64/libintelocl_emu.so > /etc/OpenCL/vendors/intel_fpgaemu.icd - fi -} - if [[ $# -eq 0 ]] ; then echo "No options were specified. Please, specify one or more of the following:" echo "--all - Install all Intel drivers" echo "--igfx - Install Intel Graphics drivers" echo "--use-dev-igc - Install development version of Intel Graphics drivers instead" echo "--cpu - Install Intel CPU OpenCL runtime" - echo "--fpga-emu - Install Intel FPGA Fast emulator" echo "Set INSTALL_LOCATION env variable to specify install location" exit 0 fi @@ -217,7 +196,6 @@ while [ "${1:-}" != "" ]; do InstallIGFX InstallTBB InstallCPURT - InstallFPGAEmu ;; "--igfx") InstallIGFX @@ -226,10 +204,6 @@ while [ "${1:-}" != "" ]; do InstallTBB InstallCPURT ;; - "--fpga-emu") - InstallTBB - InstallFPGAEmu - ;; esac shift done