Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f2cfdfb
Match TPU `torch` version to `torch_xla`
hmellor Feb 24, 2025
4104094
Add torchvision requirement
hmellor Feb 24, 2025
6496fad
Updated moved test file
hmellor Feb 24, 2025
bf0ff0c
Try 2.6.0
hmellor Feb 24, 2025
505ddb9
Try from pypi
hmellor Feb 24, 2025
3acf682
try
hmellor Feb 24, 2025
9fbbb58
Don't use nightly container
hmellor Feb 24, 2025
12273b1
Typo
hmellor Feb 24, 2025
b0a033e
Try to cache requirements files separately
hmellor Feb 24, 2025
1f5b2ed
Try something
hmellor Feb 24, 2025
012b00d
Use `uv` to install requirements
hmellor Feb 25, 2025
cf0180d
Update to latest container (that available torch nightly)
hmellor Feb 25, 2025
e159851
Remove `uv`
hmellor Feb 25, 2025
e4a13c8
Update torch version
hmellor Feb 25, 2025
3c57eca
Specify matching torchvision version
hmellor Feb 25, 2025
af0a7cb
Specify matching torch_xla
hmellor Feb 25, 2025
069e07b
Use torch and torch_xla that come with container
hmellor Feb 25, 2025
9b2fe75
Save filtered requirements to temporary file
hmellor Feb 25, 2025
f03c34c
Make sure pallas gets installed
hmellor Feb 25, 2025
7fd4ba1
Revert "Make sure pallas gets installed"
hmellor Feb 25, 2025
4d716c2
Install pallas deps separately in Dockerfile
hmellor Feb 25, 2025
e09358e
Add pallas dependency to install command
hmellor Feb 25, 2025
ba81512
Pin jaxlib in Dockerfile
hmellor Feb 25, 2025
6aa25ad
Try cxx11 image
hmellor Feb 25, 2025
58ac569
Try installing requirements from txt in Dockerfile
hmellor Feb 25, 2025
d2d0e3d
Remove no longer needed code
hmellor Feb 25, 2025
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
2 changes: 1 addition & 1 deletion .buildkite/run-tpu-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ docker run --privileged --net host --shm-size=16G -it \
vllm-tpu /bin/bash -c "python3 -m pip install git+https://github.com/thuml/depyf.git \
&& python3 -m pip install pytest \
&& python3 -m pip install lm_eval[api]==0.4.4 \
&& pytest -v -s /workspace/vllm/tests/entrypoints/openai/test_accuracy.py \
&& pytest -v -s /workspace/vllm/tests/entrypoints/openai/correctness/test_lmeval.py \
&& pytest -v -s /workspace/vllm/tests/tpu/test_custom_dispatcher.py \
&& python3 /workspace/vllm/tests/tpu/test_compilation.py \
&& python3 /workspace/vllm/tests/tpu/test_quantization_accuracy.py \
Expand Down
14 changes: 8 additions & 6 deletions Dockerfile.tpu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG NIGHTLY_DATE="20250124"
ARG BASE_IMAGE="us-central1-docker.pkg.dev/tpu-pytorch-releases/docker/xla:nightly_3.10_tpuvm_$NIGHTLY_DATE"
ARG NIGHTLY_DATE="20250224"
ARG BASE_IMAGE="us-central1-docker.pkg.dev/tpu-pytorch-releases/docker/xla:nightly_3.10_tpuvm_cxx11_$NIGHTLY_DATE"

FROM $BASE_IMAGE
WORKDIR /workspace/vllm
Expand All @@ -9,17 +9,19 @@ RUN apt-get update && apt-get install -y \
git \
ffmpeg libsm6 libxext6 libgl1

# Install Python dependencies
COPY requirements-common.txt requirements-common.txt
COPY requirements-tpu.txt requirements-tpu.txt
RUN --mount=type=cache,target=/root/.cache/pip \
python3 -m pip install -r requirements-tpu.txt

# Build vLLM.
COPY . .
ARG GIT_REPO_CHECK=0
RUN --mount=type=bind,source=.git,target=.git \
if [ "$GIT_REPO_CHECK" != 0 ]; then bash tools/check_repo.sh; fi

ENV VLLM_TARGET_DEVICE="tpu"
RUN --mount=type=cache,target=/root/.cache/pip \
--mount=type=bind,source=.git,target=.git \
python3 -m pip install \
-r requirements-tpu.txt
RUN python3 setup.py develop

# install development dependencies (for testing)
Expand Down
9 changes: 5 additions & 4 deletions requirements-tpu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ ray[default]
--find-links https://storage.googleapis.com/libtpu-releases/index.html
--find-links https://storage.googleapis.com/jax-releases/jax_nightly_releases.html
--find-links https://storage.googleapis.com/jax-releases/jaxlib_nightly_releases.html
torch==2.6.0.dev20241216+cpu
torch_xla[tpu, pallas] @ https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.7.0.dev20250124-cp39-cp39-linux_x86_64.whl ; python_version == "3.9"
torch_xla[tpu, pallas] @ https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.7.0.dev20250124-cp310-cp310-linux_x86_64.whl ; python_version == "3.10"
torch_xla[tpu, pallas] @ https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.7.0.dev20250124-cp311-cp311-linux_x86_64.whl ; python_version == "3.11"
torch==2.7.0.dev20250224+cpu
torchvision==0.22.0.dev20250224+cpu
torch_xla[tpu, pallas] @ https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.7.0.dev20250224-cp39-cp39-linux_x86_64.whl ; python_version == "3.9"
torch_xla[tpu, pallas] @ https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.7.0.dev20250224-cp310-cp310-linux_x86_64.whl ; python_version == "3.10"
torch_xla[tpu, pallas] @ https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.7.0.dev20250224-cp311-cp311-linux_x86_64.whl ; python_version == "3.11"