Skip to content

Commit 423dddf

Browse files
committed
Revert unstashed chagnes
1 parent f875f40 commit 423dddf

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

build.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,23 +1275,23 @@ def create_dockerfile_linux(
12751275
# Remove contents that are not needed in runtime
12761276
# Setuptools has breaking changes in version 70.0.0, so fix it to 69.5.1
12771277
# The generated code in grpc_service_pb2_grpc.py depends on grpcio>=1.64.0, so fix it to 1.64.0
1278-
RUN ldconfig && \
1279-
ARCH="$(uname -i)" && \
1280-
rm -fr ${{TRT_ROOT}}/bin ${{TRT_ROOT}}/targets/${{ARCH}}-linux-gnu/bin ${{TRT_ROOT}}/data && \\
1281-
rm -fr ${{TRT_ROOT}}/doc ${{TRT_ROOT}}/onnx_graphsurgeon ${{TRT_ROOT}}/python && \\
1282-
rm -fr ${{TRT_ROOT}}/samples ${{TRT_ROOT}}/targets/${{ARCH}}-linux-gnu/samples && \\
1278+
RUN ldconfig && \\
1279+
ARCH="$(uname -i)" && \\
1280+
rm -fr ${TRT_ROOT}/bin ${TRT_ROOT}/targets/${ARCH}-linux-gnu/bin ${TRT_ROOT}/data && \\
1281+
rm -fr ${TRT_ROOT}/doc ${TRT_ROOT}/onnx_graphsurgeon ${TRT_ROOT}/python && \\
1282+
rm -fr ${TRT_ROOT}/samples ${TRT_ROOT}/targets/${ARCH}-linux-gnu/samples && \\
12831283
pip3 install --no-cache-dir transformers && \\
1284-
find /usr -name libtensorrt_llm.so -exec dirname {{}} \; > /etc/ld.so.conf.d/tensorrt-llm.conf && \\
1285-
find /opt/tritonserver -name libtritonserver.so -exec dirname {{}} \; > /etc/ld.so.conf.d/triton-tensorrtllm-worker.conf && \\
1284+
find /usr -name libtensorrt_llm.so -exec dirname {} \; > /etc/ld.so.conf.d/tensorrt-llm.conf && \\
1285+
find /opt/tritonserver -name libtritonserver.so -exec dirname {} \; > /etc/ld.so.conf.d/triton-tensorrtllm-worker.conf && \\
12861286
pip3 install --no-cache-dir grpcio-tools==1.64.0 && \\
12871287
pip3 uninstall -y setuptools
12881288
ENV LD_LIBRARY_PATH=/usr/local/tensorrt/lib/:/opt/tritonserver/backends/tensorrtllm:$LD_LIBRARY_PATH
12891289
12901290
# There are some ucc issues when spawning mpi processes with ompi v4.1.7a1.
12911291
# Downgrade to ompi v4.1.5rc2 to avoid the issue.
12921292
RUN rm -fr /opt/hpcx/ompi
1293-
COPY --from={} /opt/hpcx/ompi /opt/hpcx/ompi
1294-
""".format(argmap["BASE_IMAGE"])
1293+
COPY --from=nvcr.io/nvidia/tritonserver:24.02-py3-min /opt/hpcx/ompi /opt/hpcx/ompi
1294+
"""
12951295
with open(os.path.join(ddir, dockerfile_name), "w") as dfile:
12961296
dfile.write(df)
12971297

0 commit comments

Comments
 (0)