From 04c4d6ebbfdca71868cf88a84c1b2e307fd4cbb1 Mon Sep 17 00:00:00 2001 From: npanpaliya Date: Fri, 30 May 2025 07:55:10 -0400 Subject: [PATCH 1/4] Skip OpenBLAS tests while building from source Signed-off-by: npanpaliya --- Dockerfile.ppc64le.ubi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ppc64le.ubi b/Dockerfile.ppc64le.ubi index bd8ae2ccd5e6..cd55b506d342 100644 --- a/Dockerfile.ppc64le.ubi +++ b/Dockerfile.ppc64le.ubi @@ -15,7 +15,7 @@ RUN microdnf install -y dnf && dnf install -y gcc-toolset-13 make wget unzip \ && wget https://github.com/OpenMathLib/OpenBLAS/releases/download/v$OPENBLAS_VERSION/OpenBLAS-$OPENBLAS_VERSION.zip \ && unzip OpenBLAS-$OPENBLAS_VERSION.zip \ && cd OpenBLAS-$OPENBLAS_VERSION \ - && make -j${MAX_JOBS} TARGET=POWER10 BINARY=64 USE_OPENMP=1 USE_THREAD=1 NUM_THREADS=120 DYNAMIC_ARCH=1 INTERFACE64=0 \ + && make -j${MAX_JOBS} TARGET=POWER10 BINARY=64 USE_OPENMP=1 USE_THREAD=1 NUM_THREADS=120 DYNAMIC_ARCH=1 INTERFACE64=0 NO_FBLAS=1 NO_CBLAS=1 ONLY_CBLAS=1 \ && cd /tmp && touch control ############################################################### @@ -289,11 +289,13 @@ COPY --from=vllmcache-builder /tmp/control /dev/null COPY --from=numa-builder /tmp/control /dev/null COPY --from=lapack-builder /tmp/control /dev/null COPY --from=openblas-builder /tmp/control /dev/null +COPY --from=openblas-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 \ + --mount=type=bind,from=openblas-builder,source=/OpenBLAS-$OPENBLAS_VERSION/,target=/openblas/,rw \ rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ microdnf install --nodocs -y \ tar findutils openssl \ @@ -305,8 +307,8 @@ RUN --mount=type=cache,target=/root/.cache/uv \ && microdnf clean all \ && python${PYTHON_VERSION} -m venv ${VIRTUAL_ENV} \ && python -m pip install -U pip uv --no-cache \ - && curl -L --no-progress-meter --retry 5 --retry-connrefused https://ftp2.osuosl.org/pub/ppc64el/openblas/latest/Openblas_${OPENBLAS_VERSION}_ppc64le.tar.gz | tar xvf - -C /usr/local \ && make -C /numactl install \ + && PREFIX=/usr/local make -C /openblas install \ && uv pip install 'cmake<4' \ && cmake --install /lapack/build \ && uv pip uninstall cmake From 161ac280ab00a2d4f2bfea94176651bda00915af Mon Sep 17 00:00:00 2001 From: "Md. Shafi Hussain" Date: Mon, 2 Jun 2025 12:03:12 +0530 Subject: [PATCH 2/4] Run tests, but build for target power9 Signed-off-by: Md. Shafi Hussain --- Dockerfile.ppc64le.ubi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ppc64le.ubi b/Dockerfile.ppc64le.ubi index cd55b506d342..0c9866dcf091 100644 --- a/Dockerfile.ppc64le.ubi +++ b/Dockerfile.ppc64le.ubi @@ -15,7 +15,7 @@ RUN microdnf install -y dnf && dnf install -y gcc-toolset-13 make wget unzip \ && wget https://github.com/OpenMathLib/OpenBLAS/releases/download/v$OPENBLAS_VERSION/OpenBLAS-$OPENBLAS_VERSION.zip \ && unzip OpenBLAS-$OPENBLAS_VERSION.zip \ && cd OpenBLAS-$OPENBLAS_VERSION \ - && make -j${MAX_JOBS} TARGET=POWER10 BINARY=64 USE_OPENMP=1 USE_THREAD=1 NUM_THREADS=120 DYNAMIC_ARCH=1 INTERFACE64=0 NO_FBLAS=1 NO_CBLAS=1 ONLY_CBLAS=1 \ + && make -j${MAX_JOBS} TARGET=POWER9 BINARY=64 USE_OPENMP=1 USE_THREAD=1 NUM_THREADS=120 DYNAMIC_ARCH=1 INTERFACE64=0 \ && cd /tmp && touch control ############################################################### From 85e42b7c914d1b13a02327680355f63b6d138d7b Mon Sep 17 00:00:00 2001 From: Isotr0py Date: Fri, 2 May 2025 15:45:01 +0800 Subject: [PATCH 3/4] [Bugifx] Remove TritonPlaceholder from sys.modules (#17317) Signed-off-by: Isotr0py <2037008807@qq.com> --- vllm/triton_utils/importing.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vllm/triton_utils/importing.py b/vllm/triton_utils/importing.py index fa29efbf6b2d..0a0c0a4bd178 100644 --- a/vllm/triton_utils/importing.py +++ b/vllm/triton_utils/importing.py @@ -1,6 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -import sys import types from importlib.util import find_spec @@ -45,9 +44,4 @@ def __init__(self): super().__init__("triton.language") self.constexpr = None self.dtype = None - - sys.modules['triton'] = TritonPlaceholder() - sys.modules['triton.language'] = TritonLanguagePlaceholder() - -if 'triton' in sys.modules: - logger.info("Triton module has been replaced with a placeholder.") + self.int64 = None From 98b1702db4cf9484a8b7094bef4c64d6883decd9 Mon Sep 17 00:00:00 2001 From: "Md. Shafi Hussain" Date: Tue, 3 Jun 2025 17:02:52 +0530 Subject: [PATCH 4/4] Add env var OMP_NUM_THREADS Signed-off-by: Md. Shafi Hussain --- Dockerfile.ppc64le.ubi | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.ppc64le.ubi b/Dockerfile.ppc64le.ubi index 0c9866dcf091..5dea57c9bfc6 100644 --- a/Dockerfile.ppc64le.ubi +++ b/Dockerfile.ppc64le.ubi @@ -280,6 +280,7 @@ 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 +ENV OMP_NUM_THREADS=16 # create artificial dependencies between stages for independent stages to build in parallel COPY --from=torch-builder /tmp/control /dev/null