[XPU]Unify xpu test dependencies in dockerfile.xpu#36477
[XPU]Unify xpu test dependencies in dockerfile.xpu#36477jikunshang merged 7 commits intovllm-project:mainfrom
Conversation
34b2265 to
b8bcaee
Compare
There was a problem hiding this comment.
Code Review
This pull request effectively unifies XPU test dependencies into a dedicated requirements/xpu-test.txt file and introduces a new vllm-test stage in the XPU Dockerfile. Additionally, it significantly enhances vllm/collect_env.py to gather comprehensive XPU environment details, which is a great improvement for debugging. While the changes are generally solid, I've identified a critical issue in vllm/collect_env.py that could lead to a crash, along with a couple of high-severity code quality issues. Please see my detailed comments for suggestions.
I am having trouble creating individual review comments. Click here to see my feedback.
vllm/collect_env.py (350-351)
If re.search does not find a match, it returns None, and calling .group(1) will raise an AttributeError, causing the script to crash. You should add a check to ensure a match is found before attempting to access a capture group.
if rc == 0:
match = re.search(r"Version: (.*)", out)
if match:
return match.group(1).strip()
vllm/collect_env.py (344-345)
This if block is a duplicate of the one on lines 336-337. It should be removed to avoid redundancy.
vllm/collect_env.py (1011)
The entry "intel_graphics_compiler_version" is a duplicate, as it also appears on line 1006. This redundant entry should be removed.
56810a9 to
5ec6b6d
Compare
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
0196d7a to
34fe4a8
Compare
Signed-off-by: sihao.li <sihao.li@intel.com>
|
thanks for fixing this. merged! |
Signed-off-by: sihao.li <sihao.li@intel.com> Signed-off-by: Ifta Khairul Alam Adil <ikaadil007@gmail.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com> Signed-off-by: Monishver Chandrasekaran <monishverchandrasekaran@gmail.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Signed-off-by: sihao.li <sihao.li@intel.com> Signed-off-by: Vinay Damodaran <vrdn@hey.com>
Signed-off-by: sihao.li <sihao.li@intel.com> Signed-off-by: EricccYang <yangyang4991@gmail.com>
Signed-off-by: sihao.li <sihao.li@intel.com>
Purpose
We unify xpu test dependencies into xpu-test.txt, and separately add the test phase build in dockerfile.xpu for developers and users to choose freely.
Test Plan
docker build -t docker_xpu_test:dev -f docker/Dockerfile.xpu .
Test Result
[+] Building 564.6s (27/27) FINISHED docker:default
=> [internal] load build definition from Dockerfile.xpu 0.1s
=> => transferring dockerfile: 6.82kB 0.0s
=> [internal] load metadata for docker.io/intel/deep-learning-essentials:2025.3.2-0-devel-ubuntu24.04 0.7s
=> [internal] load .dockerignore 0.0s
=> => transferring context: 387B 0.0s
=> [internal] load build context 1.5s
=> => transferring context: 20.00MB 1.4s
=> [vllm-base 1/15] FROM docker.io/intel/deep-learning-essentials:2025.3.2-0-devel-ubuntu24.04@sha256:4bdd1bf92a21d18411002dc43910d8296273c8ca1c0464f7c9a71420 0.0s
=> CACHED [vllm-base 2/15] WORKDIR /workspace/ 0.0s
=> CACHED [vllm-base 3/15] RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings 0.0s
=> CACHED [vllm-base 4/15] RUN apt clean && apt-get update -y && apt-get install -y --no-install-recommends --fix-missing curl ffmpeg git 0.0s
=> CACHED [vllm-base 5/15] RUN apt update && apt upgrade -y && apt install -y intel-oneapi-compiler-dpcpp-cpp-2025.3 0.0s
=> CACHED [vllm-base 6/15] RUN mkdir neo && cd neo && wget https://github.com/intel/intel-graphics-compiler/releases/download/v2.24.8/intel-igc-core-2 0.0s
=> CACHED [vllm-base 7/15] RUN curl -LsSf https://astral.sh/uv/install.sh | sh 0.0s
=> CACHED [vllm-base 8/15] RUN uv venv --python 3.12 --seed /opt/venv 0.0s
=> CACHED [vllm-base 9/15] RUN wget "https://github.com/uxlfoundation/oneCCL/releases/download/2021.15.7/intel-oneccl-2021.15.7.8_offline.sh" && bash "int 0.0s
=> CACHED [vllm-base 10/15] RUN rm -f /opt/intel/oneapi/ccl/latest && ln -s /opt/intel/oneapi/ccl/2021.15 /opt/intel/oneapi/ccl/latest 0.0s
=> CACHED [vllm-base 11/15] WORKDIR /workspace/vllm 0.0s
=> [vllm-base 12/15] RUN --mount=type=cache,target=/root/.cache/uv --mount=type=bind,src=requirements/common.txt,target=/workspace/vllm/requirements/comm 187.5s
=> [vllm-base 13/15] COPY . . 18.0s
=> [vllm-base 14/15] RUN --mount=type=bind,source=.git,target=.git if [ "0" != 0 ]; then bash tools/check_repo.sh; fi 1.0s
=> [vllm-base 15/15] RUN --mount=type=cache,target=/root/.cache/uv --mount=type=bind,source=.git,target=.git uv pip install --no-build-isolation . 19.0s
=> [vllm-openai 1/6] RUN --mount=type=cache,target=/root/.cache/uv uv pip install accelerate hf_transfer pytest pytest_asyncio lm_eval[api] modelscope 17.5s
=> [vllm-openai 2/6] RUN uv pip install -e tests/vllm_test_utils 3.1s
=> [vllm-openai 3/6] RUN apt-get update && apt-get install -y pciutils net-tools iproute2 hwloc numactl wget curl git buil 25.2s
=> [vllm-openai 4/6] RUN --mount=type=cache,target=/root/.cache/uv git clone https://github.com/openucx/ucx /tmp/ucx_source && cd /tmp/ucx_source && 183.9s
=> [vllm-openai 5/6] RUN --mount=type=cache,target=/root/.cache/uv uv pip uninstall triton triton-xpu && uv pip install triton-xpu==3.6.0 8.9s
=> [vllm-openai 6/6] RUN --mount=type=cache,target=/root/.cache/uv uv pip uninstall oneccl oneccl-devel 1.7s
=> [vllm-test 1/1] RUN --mount=type=cache,target=/root/.cache/uv --mount=type=bind,src=requirements/xpu-test.txt,target=/workspace/vllm/requirements/xpu-t 31.9s
=> exporting to image 64.1s
=> => exporting layers 64.1s
=> => writing image sha256:6f0c73ffe3c5c9b543a02f143aaec39514dc1dc077e2790290397197fa8d1264 0.0s
=> => naming to docker.io/library/docker_xpu_test:dev 0.0s
Essential Elements of an Effective PR Description Checklist
supported_models.mdandexamplesfor a new model.