Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bugfix] fix docker build for xpu #8652

Merged
merged 2 commits into from
Sep 23, 2024
Merged

[Bugfix] fix docker build for xpu #8652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5cf19e
update docker build for xpu
yma11 Sep 20, 2024
87a436f
address comments
yma11 Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Dockerfile.xpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,11 @@ RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRO
RUN apt-get update -y \
&& apt-get install -y curl libicu70 lsb-release git wget vim numactl python3 python3-pip ffmpeg libsm6 libxext6 libgl1

RUN git clone https://github.com/intel/pti-gpu && \
cd pti-gpu/sdk && \
mkdir build && \
cd build && \
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/icpx_toolchain.cmake -DBUILD_TESTING=OFF .. && \
make -j && \
cmake --install . --config Release --prefix "/usr/local"

COPY ./ /workspace/vllm

WORKDIR /workspace/vllm

RUN pip install -v -r requirements-xpu.txt
RUN pip install -v -r requirements-xpu.txt --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/

RUN VLLM_TARGET_DEVICE=xpu python3 setup.py install

Expand Down
6 changes: 3 additions & 3 deletions docs/source/getting_started/xpu-installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Requirements
------------

* OS: Linux
* Supported Hardware: Intel Data Center GPU (Intel ARC GPU WIP)
* OneAPI requirements: oneAPI 2024.1
* Supported Hardware: Intel Data Center GPU, Intel ARC GPU
* OneAPI requirements: oneAPI 2024.2

.. _xpu_backend_quick_start_dockerfile:

Expand All @@ -40,7 +40,7 @@ Quick start using Dockerfile
Build from source
-----------------

- First, install required driver and intel OneAPI 2024.1 or later.
- First, install required driver and intel OneAPI 2024.2 or later.

- Second, install Python packages for vLLM XPU backend building:

Expand Down
4 changes: 2 additions & 2 deletions requirements-xpu.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

setuptools < 70.0.0 # IPEX's torch have some dependency. to be removed.

ray >= 2.9
# Following pkgs retrieved from https://pytorch-extension.intel.com/release-whl/stable/xpu/us/
torch == 2.3.1+cxx11.abi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid it will not find this wheel if we don't use --extra-index-url.
I suggest installing this wheel in docker file, and add some comments here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added the --extra-index-url in the Dockerfile.xpu. It works in our local CI.

intel-extension-for-pytorch == 2.3.110+xpu
oneccl_bind_pt == 2.3.100+xpu

triton-xpu == 3.0.0b2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we also leave one comment here to show the extra index url?
--extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/


--extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/
Loading