From d4448b511d75449cc5ee4c3f292f685209e8b777 Mon Sep 17 00:00:00 2001 From: Kunshang Ji Date: Wed, 24 Jun 2026 20:39:20 +0800 Subject: [PATCH] [XPU][Docker] switch to ubuntu 24.04 as base image (#45973) Signed-off-by: Kunshang Ji --- .../scripts/hardware_ci/run-intel-test.sh | 2 +- docker/Dockerfile.xpu | 30 ++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.buildkite/scripts/hardware_ci/run-intel-test.sh b/.buildkite/scripts/hardware_ci/run-intel-test.sh index 246ea7de50..c85d0f243f 100755 --- a/.buildkite/scripts/hardware_ci/run-intel-test.sh +++ b/.buildkite/scripts/hardware_ci/run-intel-test.sh @@ -369,7 +369,7 @@ export HF_TOKEN ZE_AFFINITY_MASK -e CMDS \ --name "${container_name}" \ "${IMAGE}" \ - bash -c 'set -e; echo "ZE_AFFINITY_MASK is ${ZE_AFFINITY_MASK:-}"; eval "$CMDS"' \ + bash -c 'set -e; source /opt/intel/oneapi/setvars.sh --force; source /opt/intel/oneapi/ccl/2021.15/env/vars.sh --force; echo "ZE_AFFINITY_MASK is ${ZE_AFFINITY_MASK:-}"; eval "$CMDS"' \ >/dev/null } 9>/tmp/docker-pull.lock diff --git a/docker/Dockerfile.xpu b/docker/Dockerfile.xpu index a7bc9ae7d5..7b87f20276 100644 --- a/docker/Dockerfile.xpu +++ b/docker/Dockerfile.xpu @@ -32,18 +32,22 @@ RUN --mount=type=cache,target=/root/.cargo/registry \ --mount=type=cache,target=/root/.cargo/git \ bash build_rust.sh -FROM intel/deep-learning-essentials:2025.3.2-0-devel-ubuntu24.04 AS vllm-base +FROM ubuntu:24.04 AS vllm-base + +ENV DEBIAN_FRONTEND=noninteractive WORKDIR /workspace/ ARG PYTHON_VERSION=3.12 ARG PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/xpu" -RUN apt clean && apt-get update -y && \ - apt-get install -y --no-install-recommends --fix-missing \ +RUN apt-get update -y && \ + apt-get install -y --no-install-recommends \ + build-essential \ curl \ ffmpeg \ git \ + gpg \ libsndfile1 \ libsm6 \ libxext6 \ @@ -53,9 +57,11 @@ RUN apt clean && apt-get update -y && \ numactl \ wget \ vim \ + ca-certificates \ python3.12 \ python3.12-dev \ - python3-pip + python3-pip && \ + rm -rf /var/lib/apt/lists/* # Add oneAPI repo, pin oneAPI to 2025.3, then install pinned packages in one layer. RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \ @@ -82,6 +88,7 @@ RUN mkdir neo && \ wget https://github.com/intel/compute-runtime/releases/download/26.18.38308.1/libigdgmm12_22.10.0_amd64.deb && \ wget https://github.com/intel/compute-runtime/releases/download/26.18.38308.1/libze-intel-gpu1_26.18.38308.1-0_amd64.deb && \ wget https://github.com/oneapi-src/level-zero/releases/download/v1.28.2/level-zero_1.28.2+u24.04_amd64.deb && \ + wget https://github.com/oneapi-src/level-zero/releases/download/v1.28.2/level-zero-devel_1.28.2+u24.04_amd64.deb && \ dpkg -i *.deb && \ cd .. && \ rm -rf neo @@ -101,7 +108,13 @@ RUN wget "https://github.com/uxlfoundation/oneCCL/releases/download/2021.15.9/${ echo "source /opt/intel/oneapi/setvars.sh --force" >> /root/.bashrc && \ echo "source /opt/intel/oneapi/ccl/2021.15/env/vars.sh --force" >> /root/.bashrc && \ rm -f /opt/intel/oneapi/ccl/latest && \ - ln -s /opt/intel/oneapi/ccl/2021.15 /opt/intel/oneapi/ccl/latest + ln -s /opt/intel/oneapi/ccl/2021.15 /opt/intel/oneapi/ccl/latest && \ + printf '%s\n' \ + '/opt/intel/oneapi/ccl/2021.15/lib' \ + '/opt/intel/oneapi/mpi/2021.15/lib' \ + '/opt/intel/oneapi/compiler/2025.3/lib' \ + > /etc/ld.so.conf.d/oneapi-ccl.conf && \ + ldconfig SHELL ["bash", "-c"] CMD ["bash", "-c", "source /root/.bashrc && exec bash"] @@ -123,7 +136,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \ -ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib/" +ENV LD_LIBRARY_PATH=/opt/intel/oneapi/ccl/2021.15/lib:/opt/intel/oneapi/mpi/2021.15/lib:/opt/intel/oneapi/compiler/2025.3/lib:/usr/local/lib CMD ["/bin/bash"] ######################### UCX + NIXL BUILD STAGE ######################### @@ -204,10 +217,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \ uv pip install --no-build-isolation -r /workspace/vllm/requirements/test/xpu.txt && \ uv pip uninstall triton triton-xpu && \ uv pip install triton-xpu==3.7.1 && \ - uv pip uninstall oneccl oneccl-devel && \ - source /opt/intel/oneapi/setvars.sh --force && \ - source /opt/intel/oneapi/ccl/2021.15/env/vars.sh --force && \ - export CMAKE_PREFIX_PATH="$(python3 -c 'import site; print(site.getsitepackages()[0])'):${CMAKE_PREFIX_PATH}" + uv pip uninstall oneccl oneccl-devel # Keep source-dependent layers near the end so frequent code-only changes # don't invalidate heavy dependency and UCX/NIXL layers.