Skip to content

Commit f6a5cbb

Browse files
authoredMar 12, 2025··
Dockerfile.s390x: fix dependency build in vllm-tgis-adapter install (#355)
`hf-transfer` build (`vllm-tgis-adapter` dependency) was failing to build because of missing rust dependencies in the final target
1 parent 4edefa6 commit f6a5cbb

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed
 

‎Dockerfile.ppc64le.ubi

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
1212
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib
1313
# install gcc-13, python, rust, openblas
1414
# Note: A symlink for libatomic.so is created for gcc-13 (linker fails to find to find libatomic otherwise - reqd. for sentencepiece)
15-
# Note: A dummy file 'control' is created in /tmp/ to artifically create dependencies between stages when building stages in parallel
15+
# Note: A dummy file 'control' is created in /tmp/ to artificially create dependencies between stages when building stages in parallel
1616
# when `--jobs=<N>` is passed with podman build command
1717
RUN microdnf install -y dnf \
1818
&& dnf install -y https://mirror.stream.centos.org/9-stream/BaseOS/`arch`/os/Packages/centos-gpg-keys-9.0-24.el9.noarch.rpm \
@@ -40,7 +40,7 @@ RUN microdnf install -y dnf \
4040
# Stage to build torch family
4141
###############################################################
4242
FROM base-builder AS torch-builder
43-
# buld cache without torch dependent packages
43+
# build cache without torch dependent packages
4444
# sentencepiece has linker issues otherwise
4545
RUN --mount=type=cache,target=/root/.cache/uv \
4646
--mount=type=bind,src=requirements-common.txt,dst=/requirements-common.txt,ro \

‎Dockerfile.s390x.ubi

+8-3
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ ARG PYTHON_VERSION
104104
ENV LD_LIBRARY_PATH="/opt/vllm/lib64/python${PYTHON_VERSION}/site-packages/torch/lib:/usr/local/lib:$LD_LIBRARY_PATH"
105105
ENV C_INCLUDE_PATH="/usr/local/include:$C_INCLUDE_PATH"
106106
ENV UV_LINK_MODE=copy
107-
ENV CARGO_HOME=/root/.cargo
108-
ENV RUSTUP_HOME=/root/.rustup
109-
ENV PATH="$CARGO_HOME/bin:$RUSTUP_HOME/bin:$PATH"
110107

111108
COPY . /workspace/vllm
112109
WORKDIR /workspace/vllm
@@ -120,6 +117,9 @@ RUN --mount=type=cache,target=/root/.cache/uv \
120117
--mount=type=bind,from=rust,source=/root/.rustup,target=/root/.rustup,rw \
121118
--mount=type=bind,from=pyarrow,source=/tmp/arrow/python/dist,target=/tmp/arrow-wheels \
122119
--mount=type=bind,from=torch-vision,source=/tmp/vision/dist,target=/tmp/vision-wheels/ \
120+
CARGO_HOME=/root/.cargo \
121+
RUSTUP_HOME=/root/.rustup \
122+
PATH="/root/.cargo/bin:/root/.rustup/bin:$PATH" \
123123
sed -i '/^torch/d' requirements-build.txt && \
124124
sed -i '/^numba/d' requirements-common.txt && \
125125
ARROW_WHL_FILE=$(ls /tmp/arrow-wheels/pyarrow-*.whl | head -n 1) && \
@@ -171,6 +171,11 @@ USER root
171171
ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
172172

173173
RUN --mount=type=cache,target=/root/.cache/uv \
174+
--mount=type=bind,from=rust,source=/root/.cargo,target=/root/.cargo,rw \
175+
--mount=type=bind,from=rust,source=/root/.rustup,target=/root/.rustup,rw \
176+
CARGO_HOME=/root/.cargo \
177+
RUSTUP_HOME=/root/.rustup \
178+
PATH="/root/.cargo/bin:/root/.rustup/bin:$PATH" \
174179
HOME=/root uv pip install "$(echo /workspace/vllm/dist/*.whl)[tensorizer]" vllm-tgis-adapter==0.6.3
175180

176181
ENV GRPC_PORT=8033 \

0 commit comments

Comments
 (0)
Please sign in to comment.