Sync with main @ 631274f

Author: dtrifiro

Dockerfile.ppc64le.ubi

@@ -1,17 +1,22 @@
 ARG BASE_UBI_IMAGE_TAG=9.5-1741599792
+
 ###############################################################
 # base stage with basic dependencies
 ###############################################################
+
 FROM registry.access.redhat.com/ubi9/ubi-minimal:${BASE_UBI_IMAGE_TAG} AS base-builder
+
 ARG PYTHON_VERSION=3.12
 ARG OPENBLAS_VERSION=0.3.29
+
 # Set Environment Variables for venv, cargo & openblas
 ENV VIRTUAL_ENV=/opt/vllm
 ENV PATH=${VIRTUAL_ENV}/bin:/root/.cargo/bin:$PATH
 ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib
+
 # install gcc-13, python, rust, openblas
-# Note: A symlink for libatomic.so is created for gcc-13 (linker fails to find to find libatomic otherwise - reqd. for sentencepiece)
+# Note: A symlink for libatomic.so is created for gcc-13 (linker fails to find libatomic otherwise - reqd. for sentencepiece)
 # Note: A dummy file 'control' is created in /tmp/ to artificially create dependencies between stages when building stages in parallel
 #       when `--jobs=<N>` is passed with podman build command
 RUN microdnf install -y dnf \
@@ -22,7 +27,7 @@ RUN microdnf install -y dnf \
     && dnf config-manager --add-repo https://mirror.stream.centos.org/9-stream/AppStream/`arch`/os \
     && dnf config-manager --set-enabled crb \
     && dnf install -y \
-       git tar gcc-toolset-13 numactl-devel lapack-devel \
+       git tar gcc-toolset-13 automake libtool numactl-devel lapack-devel \
        pkgconfig openssl-devel xsimd zeromq-devel kmod \
        libtiff-devel libjpeg-devel openjpeg2-devel zlib-devel \
        freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel \
@@ -36,17 +41,22 @@ RUN microdnf install -y dnf \
     && curl -sL https://ftp2.osuosl.org/pub/ppc64el/openblas/latest/Openblas_${OPENBLAS_VERSION}_ppc64le.tar.gz | tar xvf - -C /usr/local \
     && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
     && cd /tmp && touch control
+
+
 ###############################################################
 # Stage to build torch family
 ###############################################################
+
 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 \
     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 && \
     uv pip list
+
 ARG MAX_JOBS
 ARG TORCH_VERSION=2.5.1
 ARG _GLIBCXX_USE_CXX11_ABI=1
@@ -59,6 +69,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     rm -f dist/torch*+git*whl && \
     MAX_JOBS=${MAX_JOBS:-$(nproc)} \
     PYTORCH_BUILD_VERSION=${TORCH_VERSION} PYTORCH_BUILD_NUMBER=1 uv build --wheel --out-dir /torchwheels/
+
 ARG TORCHVISION_VERSION=0.20.1
 ARG TORCHVISION_USE_NVJPEG=0
 ARG TORCHVISION_USE_FFMPEG=0
@@ -69,6 +80,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     MAX_JOBS=${MAX_JOBS:-$(nproc)} \
     BUILD_VERSION=${TORCHVISION_VERSION} \
     uv build --wheel --out-dir /torchwheels/ --no-build-isolation
+
 ARG TORCHAUDIO_VERSION=2.5.1
 ARG BUILD_SOX=1
 ARG BUILD_KALDI=1
@@ -84,17 +96,22 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     MAX_JOBS=${MAX_JOBS:-$(nproc)} \
     BUILD_VERSION=${TORCHAUDIO_VERSION} \
     uv build --wheel --out-dir /torchwheels/ --no-build-isolation
+
 # 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 \
     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 && \
     uv pip list
+
+
 ###############################################################
 # Stage to build pyarrow
 ###############################################################
+
 FROM base-builder AS arrow-builder
+
 ARG MAX_JOBS
 ARG PYARROW_PARALLEL
 ARG PYARROW_VERSION=19.0.1
@@ -118,10 +135,14 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     python setup.py build_ext \
     --build-type=release --bundle-arrow-cpp \
     bdist_wheel --dist-dir /arrowwheels/
+
+
 ###############################################################
 # Stage to build opencv
 ###############################################################
+
 FROM base-builder AS cv-builder
+
 ARG MAX_JOBS
 ARG OPENCV_VERSION=84
 ARG ENABLE_HEADLESS=1
@@ -131,6 +152,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     cd opencv-python && \
     sed -i 's/"setuptools==59.2.0",/"setuptools<70.0",/g' pyproject.toml && \
     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 \
@@ -139,18 +161,24 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     uv pip list | grep opencv && \
     grep "opencv" requirements-common.txt | uv pip install -r /dev/stdin --no-build-isolation && \
     uv pip list
+
+
 ###############################################################
 # Stage to build vllm - this stage builds and installs
 # vllm, tensorizer and vllm-tgis-adapter and builds uv cache
 # for transitive dependencies - eg. grpcio
 ###############################################################
+
 FROM base-builder AS vllmcache-builder
+
 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_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 \
@@ -166,48 +194,97 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     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}
+
+
+###############################################################
+# Stage to build numactl
+###############################################################
+
+FROM base-builder AS numa-builder
+
+# Note: Building numactl with gcc-11. Compiling with gcc-13 in this builder stage will 
+# trigger recompilation with gcc-11 (and require libtool) in the final stage where we do not have gcc-13
+ARG MAX_JOBS
+ARG NUMACTL_VERSION=2.0.19
+RUN git clone --recursive https://github.com/numactl/numactl.git -b v${NUMACTL_VERSION} \
+    && cd numactl \
+    && autoreconf -i && ./configure \
+    && make -j ${MAX_JOBS:-$(nproc)}
+
+###############################################################
+# Stage to build lapack
+###############################################################
+
+FROM base-builder AS lapack-builder
+
+ARG MAX_JOBS
+ARG LAPACK_VERSION=3.12.1
+RUN git clone --recursive https://github.com/Reference-LAPACK/lapack.git -b v${LAPACK_VERSION} \
+    && cd lapack && source /opt/rh/gcc-toolset-13/enable \
+    && cmake -B build -S . \
+    && cmake --build build -j ${MAX_JOBS:-$(nproc)}
+
+
 ###############################################################
 #                   FINAL VLLM IMAGE STAGE                    #
 ###############################################################
+
 FROM registry.access.redhat.com/ubi9/ubi-minimal:${BASE_UBI_IMAGE_TAG} AS vllm-openai
+
 ARG PYTHON_VERSION=3.12
 ARG OPENBLAS_VERSION=0.3.29
+
 # Set Environment Variables for venv & openblas
 ENV VIRTUAL_ENV=/opt/vllm
 ENV PATH=${VIRTUAL_ENV}/bin:$PATH
 ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib
-# install gcc-13, python, openblas
-RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+
+# create artificial dependencies between stages for independent stages to build in parallel
+COPY --from=torch-builder /tmp/control /dev/null
+COPY --from=arrow-builder /tmp/control /dev/null
+COPY --from=cv-builder /tmp/control /dev/null
+COPY --from=vllmcache-builder /tmp/control /dev/null
+COPY --from=numa-builder /tmp/control /dev/null
+COPY --from=lapack-builder /tmp/control /dev/null
+
+# install gcc-11, python, openblas, numactl, lapack
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,from=numa-builder,source=/numactl/,target=/numactl/,rw \
+    --mount=type=bind,from=lapack-builder,source=/lapack/,target=/lapack/,rw \
+    rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     microdnf install --nodocs -y \
-    tar findutils openssl numactl lapack \
-    pkgconfig xsimd g++ libsndfile \
+    tar findutils openssl \
+    pkgconfig xsimd g++ gcc-fortran libsndfile \
     libtiff libjpeg openjpeg2 zlib zeromq \
     freetype lcms2 libwebp tcl tk utf8proc \
     harfbuzz fribidi libraqm libimagequant libxcb \
     python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip \
     && microdnf clean all \
     && python${PYTHON_VERSION} -m venv ${VIRTUAL_ENV} \
     && python -m pip install -U pip uv --no-cache \
-    && curl -sL https://ftp2.osuosl.org/pub/ppc64el/openblas/latest/Openblas_${OPENBLAS_VERSION}_ppc64le.tar.gz | tar xvf - -C /usr/local
-# create artificial dependencies between stages for independent stages to build in parallel
-COPY --from=torch-builder /tmp/control /dev/null
-COPY --from=arrow-builder /tmp/control /dev/null
-COPY --from=cv-builder /tmp/control /dev/null
-COPY --from=vllmcache-builder /tmp/control /dev/null
+    && curl -sL https://ftp2.osuosl.org/pub/ppc64el/openblas/latest/Openblas_${OPENBLAS_VERSION}_ppc64le.tar.gz | tar xvf - -C /usr/local \
+    && make -C /numactl install \
+    && uv pip install cmake \
+    && cmake --install /lapack/build \
+    && uv pip uninstall cmake
+
 # consume previously built 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,from=vllmcache-builder,source=/vllmwheel/,target=/vllmwheel/,ro \
     HOME=/root uv pip install /opencvwheels/*.whl /arrowwheels/*.whl /torchwheels/*.whl /vllmwheel/*.whl
+
 WORKDIR /home/vllm
+
 # setup non-root user for OpenShift
 RUN umask 002 && \
     useradd --uid 2000 --gid 0 vllm && \
     mkdir -p /home/vllm && \
     chmod g+rwx /home/vllm
+
 ENV HF_HUB_OFFLINE=0 \
     HOME=/home/vllm \
     # Allow requested max length to exceed what is extracted from the
@@ -218,22 +295,31 @@ ENV HF_HUB_OFFLINE=0 \
     VLLM_WORKER_MULTIPROC_METHOD=fork \
     VLLM_NO_USAGE_STATS=1 \
     OUTLINES_CACHE_DIR=/tmp/outlines
+
 COPY LICENSE /licenses/vllm.md
 COPY examples/*.jinja /app/data/template/
+
 USER 2000
+
 ENTRYPOINT ["python", "-m", "vllm.entrypoints.openai.api_server"]
+
 FROM vllm-openai as vllm-grpc-adapter
+
 USER root
+
 ARG VLLM_TGIS_ADAPTER_VERSION=0.6.3
 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}
+
 ENV GRPC_PORT=8033 \
     PORT=8000 \
     # As an optimization, vLLM disables logprobs when using spec decoding by
     # default, but this would be unexpected to users of a hosted model that
     # happens to have spec decoding
     # see: https://github.com/vllm-project/vllm/pull/6485
     DISABLE_LOGPROBS_DURING_SPEC_DECODING=false
+
 USER 2000
+
 ENTRYPOINT ["python", "-m", "vllm_tgis_adapter", "--uvicorn-log-level=warning"]