Skip to content

Updated rhelppc.patch for triton to add libpng. #8261

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
Sunidhi-Gaonkar1 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −11
Open

Updated rhelppc.patch for triton to add libpng. #8261

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions t/triton-inference-server/rhelppc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/build.py b/build.py
index f32c0159..93ef2e2f 100755
index f32c0159..77718cc7 100755
--- a/build.py
+++ b/build.py
@@ -335,6 +335,13 @@ class BuildScript:
Expand Down Expand Up @@ -183,7 +183,7 @@ index f32c0159..93ef2e2f 100755

RUN pip3 install -r python/openai/requirements.txt

+ENV LD_LIBRARY_PATH=/opt/tritonserver/lib64:$LD_LIBRARY_PATH
+ENV LD_LIBRARY_PATH=/opt/tritonserver/lib64:/usr/local/lib64/python3.12/site-packages/torch/lib:$LD_LIBRARY_PATH
+
+LABEL maintainer="Sunidhi Gaonkar<Sunidhi.Gaonkar@ibm.com>" \
+ version="v2.65.0" \
Expand All @@ -200,7 +200,7 @@ index f32c0159..93ef2e2f 100755
"""
if "tensorrtllm" in backends:
df += """
@@ -1352,21 +1406,44 @@ RUN userdel tensorrt-server > /dev/null 2>&1 || true \\
@@ -1352,21 +1406,45 @@ RUN userdel tensorrt-server > /dev/null 2>&1 || true \\

if target_platform() == "rhel":
df += """
Expand Down Expand Up @@ -228,6 +228,7 @@ index f32c0159..93ef2e2f 100755
gperftools-devel \\
+ libprometheus-cpp-devel \\
+ civetweb-devel \\
+ libpng-devel \\
wget \\
- python3-pip \\
- numactl-devel
Expand All @@ -245,19 +246,19 @@ index f32c0159..93ef2e2f 100755
+ ccache \\
+ gfortran
+RUN ln -sf $(which python3.12) /usr/bin/python3 && ln -sf $(which pip3.12) /usr/bin/pip3 && ln -sf $(which pip3.12) /usr/bin/pip
+RUN pip3 install patchelf==0.17.2 pillow
+RUN pip3 install patchelf==0.17.2 pillow==12.2.0

"""
else:
@@ -1435,7 +1512,6 @@ RUN ln -sf ${_CUDA_COMPAT_PATH}/lib.real ${_CUDA_COMPAT_PATH}/lib \\
@@ -1435,7 +1513,6 @@ RUN ln -sf ${_CUDA_COMPAT_PATH}/lib.real ${_CUDA_COMPAT_PATH}/lib \\
df += """
# python3, python3-pip and some pip installs required for the python backend
RUN yum install -y \\
- libarchive-devel \\
openssl-devel \\
readline-devel
"""
@@ -1522,11 +1598,6 @@ ENV PYTHONPATH=/opt/tritonserver/backends/dali/wheel/dali:$PYTHONPATH
@@ -1522,11 +1599,6 @@ ENV PYTHONPATH=/opt/tritonserver/backends/dali/wheel/dali:$PYTHONPATH
if target_platform() == "rhel":
repo_arch = "sbsa" if target_machine == "aarch64" else "x86_64"
df += """
Expand All @@ -269,7 +270,7 @@ index f32c0159..93ef2e2f 100755
""".format(
repo_arch=repo_arch
)
@@ -1568,38 +1639,9 @@ def add_cpu_libs_to_linux_dockerfile(backends, target_machine):
@@ -1568,38 +1640,9 @@ def add_cpu_libs_to_linux_dockerfile(backends, target_machine):
# we must copy these from the Triton min container ourselves.
cuda_arch = "sbsa" if target_machine == "aarch64" else "x86_64"
df += """
Expand Down Expand Up @@ -308,15 +309,15 @@ index f32c0159..93ef2e2f 100755
""".format(
cuda_arch=cuda_arch, libs_arch=libs_arch
)
@@ -1611,7 +1653,6 @@ ENV LD_LIBRARY_PATH /usr/local/cuda/targets/{cuda_arch}-linux/lib:/usr/local/cud
@@ -1611,7 +1654,6 @@ ENV LD_LIBRARY_PATH /usr/local/cuda/targets/{cuda_arch}-linux/lib:/usr/local/cud
# Since this dependency is not present in the ubuntu base image,
# we must copy it from the Triton min container ourselves.
df += """
-COPY --from=min_container /usr/lib/{libs_arch}-linux-gnu/libnccl.so.2 /usr/lib/{libs_arch}-linux-gnu/libnccl.so.2
""".format(
libs_arch=libs_arch
)
@@ -1625,20 +1666,6 @@ def change_default_python_version_rhel(version):
@@ -1625,20 +1667,6 @@ def change_default_python_version_rhel(version):
# match the version of python inside the RHEL base container. This means that python packages
# installed within the container will not be picked up by the python backend stub process pybind
# bindings. It must instead must be installed via pyenv.
Expand All @@ -337,7 +338,7 @@ index f32c0159..93ef2e2f 100755
"""
return df

@@ -1896,6 +1923,43 @@ def create_docker_build_script(script_name, container_install_dir, container_ci_
@@ -1896,6 +1924,43 @@ def create_docker_build_script(script_name, container_install_dir, container_ci_
check_exitcode=True,
)

Expand Down Expand Up @@ -380,4 +381,3 @@ index f32c0159..93ef2e2f 100755
+
#
# Final image... tritonserver
#
Loading