Skip to content

[s390x] Align build with gcc-toolset-14 and fix PyArrow env (rhoai-2.25) #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sindhujabd268 wants to merge 4 commits into
base: rhoai-2.25
Choose a base branch
from
Open

[s390x] Align build with gcc-toolset-14 and fix PyArrow env (rhoai-2.25) #290

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ce7c71
RHOAIENG-49027: fix model deployment for Power
Shafi-Hussain Feb 9, 2026
3235713
RHOAIENG-49027: fix model deployment for Power
Shafi-Hussain Feb 10, 2026
95a7971
s390x: switch to gcc-toolset-14 for rhoai-2.25 build
sindhujabd268 Feb 10, 2026
53c1a3d
s390x: fix PYTHONPATH handling with gcc-toolset-14 build
sindhujabd268 Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Dockerfile.konflux.cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,11 @@ ENV VLLM_NO_USAGE_STATS=1

# Set Environment Variables for venv & openblas
ENV VIRTUAL_ENV=/opt/vllm
ENV PATH=${VIRTUAL_ENV}/bin:$PATH:/usr/lib64/llvm15/bin
ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
ENV PCP_DIR=/opt/rh/gcc-toolset-14/root
ENV PATH=${VIRTUAL_ENV}/bin:${PCP_DIR}/usr/bin:$PATH:/usr/lib64/llvm15/bin
ENV PKG_CONFIG_PATH=${PCP_DIR}/usr/lib64/pkgconfig:/usr/local/lib/pkgconfig/
ENV C_INCLUDE_PATH="/usr/local/include:$C_INCLUDE_PATH"
ENV LD_LIBRARY_PATH=/opt/vllm/lib64/python${PYTHON_VERSION}/site-packages/torch/lib:/usr/local/lib:$LD_LIBRARY_PATH:/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib
ENV LD_LIBRARY_PATH=${PCP_DIR}/usr/lib64:${PCP_DIR}/usr/lib:/opt/vllm/lib64/python${PYTHON_VERSION}/site-packages/torch/lib:/usr/local/lib:$LD_LIBRARY_PATH:/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib
ENV OMP_NUM_THREADS=16
ENV UV_LINK_MODE=copy
ARG VLLM_VERSION="0.10.1.1.6"
Expand Down Expand Up @@ -111,7 +112,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm; \
microdnf install --nodocs -y \
libomp tar findutils openssl llvm15 llvm15-devel \
pkgconfig xsimd g++ gcc-fortran libsndfile \
pkgconfig xsimd gcc-toolset-14 libsndfile \
libtiff libjpeg openjpeg2 zlib zeromq \
freetype lcms2 libwebp tcl tk utf8proc \
harfbuzz fribidi libraqm libimagequant libxcb \
Expand Down
4 changes: 4 additions & 0 deletions build_vllm_ppc64le.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ install_numba
# back to vLLM root
cd ${CURDIR}

# llvmlite==0.44.0 needs setuptools<70
echo "setuptools<70.0.0" > build_constraints.txt
uv pip install ${WHEEL_DIR}/numba*.whl --build-constraint build_constraints.txt

uv pip install ${WHEEL_DIR}/*.whl
sed -i.bak -e 's/.*torch.*//g' pyproject.toml requirements/*.txt
# sentencepiece.pc is in some pkgconfig inside uv cache
Expand Down
8 changes: 7 additions & 1 deletion build_vllm_s390x.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-/usr/lib64:/usr/lib}
# install development packages
rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
microdnf install -y \
which procps findutils tar vim git gcc gcc-gfortran g++ gcc-c++ make patch zlib-devel \
which procps findutils tar vim git gcc-toolset-14 gcc-toolset-14-libatomic-devel make patch zlib-devel \
libjpeg-turbo-devel libtiff-devel libpng-devel libwebp-devel freetype-devel harfbuzz-devel \
openssl-devel openblas openblas-devel autoconf automake libtool cmake numpy libsndfile \
clang clang-devel ninja-build perl-core libsodium libsodium-devel llvm15 llvm15-devel llvm15-static && \
Expand All @@ -30,6 +30,8 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y && \
rustup default stable && \
rustup show

source /opt/rh/gcc-toolset-14/enable

# -------------------------
# Apache Arrow (C++ + Python)
# -------------------------
Expand Down Expand Up @@ -57,6 +59,10 @@ cmake -DCMAKE_BUILD_TYPE=Release \
..
make -j"$(nproc)"
make install

export PYTHONPATH=$(pwd)/build/lib.linux-s390x-cpython-${PYTHON_VERSION/./}:$PYTHONPATH
Copy link

@san7ket san7ket Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe set the path variable to empty string first

Suggested change
export PYTHONPATH=$(pwd)/build/lib.linux-s390x-cpython-${PYTHON_VERSION/./}:$PYTHONPATH
PYTHONPATH=""
export PYTHONPATH=$(pwd)/build/lib.linux-s390x-cpython-${PYTHON_VERSION/./}:$PYTHONPATH

export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH

cd ../../python
export PYARROW_PARALLEL=4
export ARROW_BUILD_TYPE=release
Expand Down