moved PR patch before the requirements patching
This commit is contained in:
19
Dockerfile
19
Dockerfile
@@ -182,6 +182,16 @@ RUN if [ -n "$VLLM_PRS" ]; then \
|
||||
done; \
|
||||
fi
|
||||
|
||||
# TEMPORARY PATCH for broken compilation
|
||||
RUN curl -fsL https://patch-diff.githubusercontent.com/raw/vllm-project/vllm/pull/38423.diff -o pr38423.diff \
|
||||
&& if git apply --reverse --check pr38423.diff 2>/dev/null; then \
|
||||
echo "Patch already applied, skipping."; \
|
||||
else \
|
||||
echo "Applying patch..."; \
|
||||
git apply -v pr38423.diff; \
|
||||
fi \
|
||||
&& rm pr38423.diff
|
||||
|
||||
# Prepare build requirements
|
||||
RUN --mount=type=cache,id=uv-cache,target=/root/.cache/uv \
|
||||
python3 use_existing_torch.py && \
|
||||
@@ -201,15 +211,6 @@ RUN --mount=type=cache,id=uv-cache,target=/root/.cache/uv \
|
||||
# TEMPORARY PATCH for broken vLLM build (unguarded Hopper code) - reverting PR #34758 and #34302
|
||||
# RUN curl -L https://patch-diff.githubusercontent.com/raw/vllm-project/vllm/pull/34758.diff | patch -p1 -R || echo "Cannot revert PR #34758, skipping"
|
||||
# RUN curl -L https://patch-diff.githubusercontent.com/raw/vllm-project/vllm/pull/34302.diff | patch -p1 -R || echo "Cannot revert PR #34302, skipping"
|
||||
# # TEMPORARY PATCH for broken compilation
|
||||
RUN curl -fsL https://patch-diff.githubusercontent.com/raw/vllm-project/vllm/pull/38423.diff -o pr38423.diff \
|
||||
&& if git apply --reverse --check pr38423.diff 2>/dev/null; then \
|
||||
echo "Patch already applied, skipping."; \
|
||||
else \
|
||||
echo "Applying patch..."; \
|
||||
git apply -v pr38423.diff; \
|
||||
fi \
|
||||
&& rm pr38423.diff
|
||||
|
||||
# Final Compilation
|
||||
RUN --mount=type=cache,id=ccache,target=/root/.ccache \
|
||||
|
||||
Reference in New Issue
Block a user