Add upstream cherry picks manually for power/z

Author: heyselbi

Dockerfile.ppc64le.ubi

@@ -52,9 +52,9 @@ FROM base-builder AS torch-builder
 # build cache without torch dependent packages
 # sentencepiece has linker issues otherwise
 RUN --mount=type=cache,target=/root/.cache/uv \
-    --mount=type=bind,src=requirements-common.txt,dst=/requirements-common.txt,ro \
+    --mount=type=bind,src=requirements/common.txt,dst=/requirements/common.txt,ro \
     source /opt/rh/gcc-toolset-13/enable && \
-    sed -e 's/.*opencv.*//g; s/.*outlines.*//g; s/.*tensors.*//g' requirements-common.txt | uv pip install -r /dev/stdin && \
+    sed -e 's/.*opencv.*//g; s/.*outlines.*//g; s/.*tensors.*//g' requirements/common.txt | uv pip install -r /dev/stdin && \
     uv pip list
 
 ARG MAX_JOBS
@@ -99,10 +99,10 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 
 # build cache with torch dependent packages
 RUN --mount=type=cache,target=/root/.cache/uv \
-    --mount=type=bind,src=requirements-common.txt,dst=/requirements-common.txt,ro \
+    --mount=type=bind,src=requirements/common.txt,dst=/requirements/common.txt,ro \
     source /opt/rh/gcc-toolset-13/enable && \
-    grep "outlines" requirements-common.txt | uv pip install -r /dev/stdin && \
-    grep "tensors" requirements-common.txt | uv pip install -r /dev/stdin && \
+    grep "outlines" requirements/common.txt | uv pip install -r /dev/stdin && \
+    grep "tensors" requirements/common.txt | uv pip install -r /dev/stdin && \
     uv pip list
 
 
@@ -144,22 +144,25 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 FROM base-builder AS cv-builder
 
 ARG MAX_JOBS
-ARG OPENCV_VERSION=84
+ARG OPENCV_VERSION=86
+# patch for version 4.11.0.86
+ARG OPENCV_PATCH=97f3f39
 ARG ENABLE_HEADLESS=1
 RUN --mount=type=cache,target=/root/.cache/uv \
     source /opt/rh/gcc-toolset-13/enable && \
     git clone --recursive https://github.com/opencv/opencv-python.git -b ${OPENCV_VERSION} && \
     cd opencv-python && \
-    sed -i 's/"setuptools==59.2.0",/"setuptools<70.0",/g' pyproject.toml && \
+    sed -i -E -e 's/"setuptools.+",/"setuptools",/g' pyproject.toml && \
+    cd opencv && git cherry-pick --no-commit $OPENCV_PATCH && cd .. && \
     python -m build --wheel --installer=uv --outdir /opencvwheels/
 
 # build opencv dependent packages
 RUN --mount=type=cache,target=/root/.cache/uv \
-    --mount=type=bind,src=requirements-common.txt,dst=/requirements-common.txt,ro \
+    --mount=type=bind,src=requirements/common.txt,dst=/requirements/common.txt,ro \
     source /opt/rh/gcc-toolset-13/enable && \
     uv pip install /opencvwheels/*.whl && \
     uv pip list | grep opencv && \
-    grep "opencv" requirements-common.txt | uv pip install -r /dev/stdin --no-build-isolation && \
+    grep "opencv" requirements/common.txt | uv pip install -r /dev/stdin --no-build-isolation && \
     uv pip list
 
 
@@ -175,22 +178,27 @@ COPY --from=torch-builder /tmp/control /dev/null
 COPY --from=arrow-builder /tmp/control /dev/null
 COPY --from=cv-builder /tmp/control /dev/null
 
-ARG VLLM_TGIS_ADAPTER_VERSION=0.6.3
+ARG VLLM_TGIS_ADAPTER_VERSION=0.7.0
 ARG VLLM_TARGET_DEVICE=cpu
 ARG GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
 
 # this step installs vllm & tgis adapter and populates uv cache
 # with all the transitive dependencies
+RUN --mount=type=cache,target=/root/.cache/uv \
+    source /opt/rh/gcc-toolset-13/enable && \
+    git clone https://github.com/huggingface/xet-core.git && cd xet-core/hf_xet/ && \
+    uv pip install maturin && \
+    uv build --wheel --out-dir /hf_wheels/
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,from=torch-builder,source=/torchwheels/,target=/torchwheels/,ro \
     --mount=type=bind,from=arrow-builder,source=/arrowwheels/,target=/arrowwheels/,ro \
     --mount=type=bind,from=cv-builder,source=/opencvwheels/,target=/opencvwheels/,ro \
     --mount=type=bind,src=.,dst=/src/,rw \
     source /opt/rh/gcc-toolset-13/enable && \
     uv pip install /opencvwheels/*.whl /arrowwheels/*.whl /torchwheels/*.whl && \
-    sed -i -e 's/.*torch.*//g' /src/pyproject.toml /src/requirements-*.txt && \
-    uv pip install pandas && \
-    uv pip install -r /src/requirements-common.txt -r /src/requirements-cpu.txt -r /src/requirements-build.txt --no-build-isolation && \
+    sed -i -e 's/.*torch.*//g' /src/pyproject.toml /src/requirements/*.txt && \
+    uv pip install pandas /hf_wheels/*.whl && \
+    uv pip install -r /src/requirements/common.txt -r /src/requirements/cpu.txt -r /src/requirements/build.txt --no-build-isolation && \
     cd /src/ && \
     uv build --wheel --out-dir /vllmwheel/ --no-build-isolation && \
     uv pip install "$(echo /vllmwheel/*.whl)[tensorizer]" vllm-tgis-adapter==${VLLM_TGIS_ADAPTER_VERSION}
@@ -274,8 +282,9 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,from=torch-builder,source=/torchwheels/,target=/torchwheels/,ro \
     --mount=type=bind,from=arrow-builder,source=/arrowwheels/,target=/arrowwheels/,ro \
     --mount=type=bind,from=cv-builder,source=/opencvwheels/,target=/opencvwheels/,ro \
+    --mount=type=bind,from=vllmcache-builder,source=/hf_wheels/,target=/hf_wheels/,ro \
     --mount=type=bind,from=vllmcache-builder,source=/vllmwheel/,target=/vllmwheel/,ro \
-    HOME=/root uv pip install /opencvwheels/*.whl /arrowwheels/*.whl /torchwheels/*.whl /vllmwheel/*.whl
+    HOME=/root uv pip install /opencvwheels/*.whl /arrowwheels/*.whl /torchwheels/*.whl /hf_wheels/*.whl /vllmwheel/*.whl
 
 WORKDIR /home/vllm
 
@@ -307,7 +316,7 @@ FROM vllm-openai as vllm-grpc-adapter
 
 USER root
 
-ARG VLLM_TGIS_ADAPTER_VERSION=0.6.3
+ARG VLLM_TGIS_ADAPTER_VERSION
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,from=vllmcache-builder,source=/vllmwheel/,target=/vllmwheel/,ro \
     HOME=/root uv pip install "$(echo /vllmwheel/*.whl)[tensorizer]" vllm-tgis-adapter==${VLLM_TGIS_ADAPTER_VERSION}

Dockerfile.s390x.ubi

@@ -1,7 +1,7 @@
 # Base UBI image for s390x architecture
 ARG BASE_UBI_IMAGE_TAG=9.5-1741850109
 ARG PYTHON_VERSION=3.12
-ARG VLLM_TGIS_ADAPTER_VERSION="0.6.3"
+ARG VLLM_TGIS_ADAPTER_VERSION="0.7.0"
 FROM registry.access.redhat.com/ubi9/ubi-minimal:${BASE_UBI_IMAGE_TAG} AS base
 
 # Install basic dependencies
@@ -192,7 +192,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,from=rust,source=/root/.cargo,target=/root/.cargo,rw \
     --mount=type=bind,from=rust,source=/root/.rustup,target=/root/.rustup,rw \
     export PATH="$PATH:/root/.cargo/bin:/root/.rustup/bin" && \
-    HOME=/root uv pip install "$(echo /workspace/vllm/dist/*.whl)[tensorizer]" vllm-tgis-adapter==${VLLM_TGIS_ADAPTER_VERSION} && \   
+    HOME=/root uv pip install "$(echo /workspace/vllm/dist/*.whl)[tensorizer]" vllm-tgis-adapter==${VLLM_TGIS_ADAPTER_VERSION} && \ 
     cd /tmp && touch control
 
 FROM vllm-openai as vllm-grpc-adapter