diff --git a/.github/workflows/sycl-containers-igc-dev.yaml b/.github/workflows/sycl-containers-igc-dev.yaml index 0f35ea8015fbd..9ee0251e17f7f 100644 --- a/.github/workflows/sycl-containers-igc-dev.yaml +++ b/.github/workflows/sycl-containers-igc-dev.yaml @@ -35,7 +35,6 @@ jobs: imagefile: ubuntu2404_intel_drivers tag: devigc build_args: | - "use_unstable_driver=false" "use_igc_dev=true" steps: - name: Checkout diff --git a/.github/workflows/sycl-containers.yaml b/.github/workflows/sycl-containers.yaml index 7ba768a79701c..16239cc9d9f23 100644 --- a/.github/workflows/sycl-containers.yaml +++ b/.github/workflows/sycl-containers.yaml @@ -54,29 +54,23 @@ jobs: - name: Intel Drivers Ubuntu 22.04 Docker image file: ubuntu2204_intel_drivers tag: latest - build_args: "use_unstable_driver=false" + build_args: "" - name: Intel Drivers Ubuntu 24.04 Docker image file: ubuntu2404_intel_drivers tag: latest - build_args: "use_unstable_driver=false" - - name: Intel Drivers (unstable) Ubuntu 24.04 Docker image - file: ubuntu2404_intel_drivers - tag: unstable - build_args: "use_unstable_driver=true" + build_args: "" - name: Build + Intel Drivers Ubuntu 22.04 Docker image file: ubuntu2204_intel_drivers tag: alldeps build_args: | base_image=ghcr.io/intel/llvm/ubuntu2204_build base_tag=latest - use_unstable_driver=false - name: Build + Intel Drivers Ubuntu 24.04 Docker image file: ubuntu2404_intel_drivers tag: alldeps build_args: | base_image=ghcr.io/intel/llvm/ubuntu2404_build base_tag=latest - use_unstable_driver=false steps: - name: Checkout uses: actions/checkout@v4 diff --git a/devops/containers/ubuntu2204_intel_drivers.Dockerfile b/devops/containers/ubuntu2204_intel_drivers.Dockerfile index b27aee1b633b0..d8eb12fa5c82f 100644 --- a/devops/containers/ubuntu2204_intel_drivers.Dockerfile +++ b/devops/containers/ubuntu2204_intel_drivers.Dockerfile @@ -5,8 +5,6 @@ FROM $base_image:$base_tag ENV DEBIAN_FRONTEND=noninteractive -ARG use_unstable_driver=true - USER root RUN apt update && apt install -yqq wget @@ -18,12 +16,7 @@ COPY dependencies.json / RUN mkdir /runtimes ENV INSTALL_LOCATION=/runtimes RUN --mount=type=secret,id=github_token \ - if [ "$use_unstable_driver" = "true" ]; then \ - install_driver_opt=" --use-latest"; \ - else \ - install_driver_opt=" dependencies.json"; \ - fi && \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all + 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 a0970f3900141..b61a2a5c10162 100644 --- a/devops/containers/ubuntu2404_intel_drivers.Dockerfile +++ b/devops/containers/ubuntu2404_intel_drivers.Dockerfile @@ -5,8 +5,6 @@ FROM $base_image:$base_tag ENV DEBIAN_FRONTEND=noninteractive -ARG use_unstable_driver=true - USER root RUN apt update && apt install -yqq wget @@ -18,12 +16,7 @@ COPY dependencies.json / RUN mkdir /runtimes ENV INSTALL_LOCATION=/runtimes RUN --mount=type=secret,id=github_token \ - if [ "$use_unstable_driver" = "true" ]; then \ - install_driver_opt=" --use-latest"; \ - else \ - install_driver_opt=" dependencies.json"; \ - fi && \ - GITHUB_TOKEN=$(cat /run/secrets/github_token) /install_drivers.sh $install_driver_opt --all + 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/scripts/install_drivers.sh b/devops/scripts/install_drivers.sh index 01c2dde54d6d0..1a1fd785a0d9b 100755 --- a/devops/scripts/install_drivers.sh +++ b/devops/scripts/install_drivers.sh @@ -19,14 +19,6 @@ if [ -f "$1" ]; then IGC_DEV_VER=$(jq -r '.linux.igc_dev.version' $CONFIG_FILE_IGC_DEV) IGC_DEV_URL=$(jq -r '.linux.igc_dev.url' $CONFIG_FILE_IGC_DEV) fi -elif [[ "$*" == *"--use-latest"* ]]; then - CR_TAG=latest - IGC_TAG=latest - CM_TAG=latest - L0_TAG=latest - TBB_TAG=latest - FPGA_TAG=latest - CPU_TAG=latest else CR_TAG=$compute_runtime_tag IGC_TAG=$igc_tag @@ -43,11 +35,7 @@ fi function get_release() { REPO=$1 TAG=$2 - if [ "$TAG" == "latest" ]; then - URL="https://api.github.com/repos/${REPO}/releases/latest" - else - URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}" - fi + URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}" HEADER="" if [ "$GITHUB_TOKEN" != "" ]; then HEADER="Authorization: Bearer $GITHUB_TOKEN" @@ -149,7 +137,7 @@ InstallIGFX () { # Backup and install it from release igc as a temporarily workaround # while we working to resolve the issue. echo "Backup libopencl-clang" - cp -d /usr/local/lib/libopencl-clang2.so.14* . + cp -d /usr/local/lib/libopencl-clang2.so.15* . echo "Download IGC dev git hash $IGC_DEV_VER" get_pre_release_igfx $IGC_DEV_URL $IGC_DEV_VER echo "Install IGC dev git hash $IGC_DEV_VER" @@ -158,12 +146,12 @@ InstallIGFX () { dpkg -i --force-all *.deb echo "Install libopencl-clang" # Workaround only, will download deb and install with dpkg once fixed. - cp -d libopencl-clang2.so.14* /usr/local/lib/ + cp -d libopencl-clang2.so.15* /usr/local/lib/ rm /usr/local/lib/libigc.so /usr/local/lib/libigc.so.1* && \ ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so && \ ln -s /usr/local/lib/libigc.so.2 /usr/local/lib/libigc.so.1 echo "Clean up" - rm *.deb libopencl-clang2.so.14* + rm *.deb libopencl-clang2.so.15* echo "$IGC_DEV_TAG" > /usr/local/lib/igc/IGCTAG.txt fi } @@ -215,7 +203,6 @@ if [[ $# -eq 0 ]] ; then 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 "--use-latest - Use latest for all tags" echo "Set INSTALL_LOCATION env variable to specify install location" exit 0 fi diff --git a/sycl/doc/developer/DockerBKMs.md b/sycl/doc/developer/DockerBKMs.md index 6f1db70e37ffa..59cdc8ef207fb 100644 --- a/sycl/doc/developer/DockerBKMs.md +++ b/sycl/doc/developer/DockerBKMs.md @@ -60,13 +60,12 @@ development containers: setup for building DPC++ compiler from source. - `devops/containers/ubuntu2404_intel_drivers`: contains everything from the base Dockerfile + pre-installed Intel drivers. - The Dockerfile comes in four flavors/tags: + The Dockerfile comes in three flavors/tags: * `latest`: Intel drivers are downloaded from release/tag and saved in dependencies.json. The drivers are tested/validated everytime we upgrade the driver. * `devigc`: Intel Graphics Compiler driver from github actions artifacts, other drivers are downloaded from release/tag and saved in dependencies.json. - * `unstable`: Intel drivers are downloaded from release/latest. * `alldeps`: Includes the same Intel drivers as `latest`, as well as the development kits for NVidia/AMD from the `ubuntu2404_build` Dockerfile. The drivers are installed as it is, not tested or validated.