From 0b218173869e0e4afdd722665ae297ee69898885 Mon Sep 17 00:00:00 2001 From: Iman Tabrizian <10105175+tabrizian@users.noreply.github.com> Date: Mon, 19 May 2025 10:53:23 -0700 Subject: [PATCH] Add tritonrelease container Signed-off-by: Iman Tabrizian <10105175+tabrizian@users.noreply.github.com> --- docker/Dockerfile.multi | 18 ++++++++++++++++++ docker/Makefile | 3 +++ .../inflight_batcher_llm/CMakeLists.txt | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile.multi b/docker/Dockerfile.multi index 1b26d4e6e78c..dcf26a9920c5 100644 --- a/docker/Dockerfile.multi +++ b/docker/Dockerfile.multi @@ -161,3 +161,21 @@ ARG GIT_COMMIT ARG TRT_LLM_VER ENV TRT_LLM_GIT_COMMIT=${GIT_COMMIT} \ TRT_LLM_VERSION=${TRT_LLM_VER} + +FROM wheel AS tritonbuild + +WORKDIR /src/tensorrt_llm +RUN pip install /src/tensorrt_llm/build/tensorrt_llm*.whl +COPY ./triton_backend/ ./triton_backend/ +RUN bash ./triton_backend/inflight_batcher_llm/scripts/build.sh + + +FROM release AS tritonrelease + +WORKDIR /app/tensorrt_llm +COPY ./triton_backend/all_models ./triton_backend/all_models +COPY ./triton_backend/scripts ./triton_backend/scripts +COPY ./triton_backend/tools ./triton_backend/tools +COPY ./triton_backend/inflight_batcher_llm/scripts ./triton_backend/inflight_batcher_llm/scripts +COPY ./triton_backend/inflight_batcher_llm/client ./triton_backend/inflight_batcher_llm/client +COPY --from=tritonbuild /opt/tritonserver/backends/tensorrtllm /opt/tritonserver/backends/tensorrtllm diff --git a/docker/Makefile b/docker/Makefile index 6303d75f315e..a5c1e8a278c3 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -148,6 +148,9 @@ endif devel_%: STAGE = devel tritondevel_%: STAGE = tritondevel +tritonrelease_%: STAGE = tritonrelease +tritonrelease_%: DEVEL_IMAGE = tritondevel +tritonrelease_run: WORK_DIR = /app/tensorrt_llm wheel_%: STAGE = wheel wheel_run: WORK_DIR = /src/tensorrt_llm diff --git a/triton_backend/inflight_batcher_llm/CMakeLists.txt b/triton_backend/inflight_batcher_llm/CMakeLists.txt index 4038e30f09bd..8b471e2856ab 100644 --- a/triton_backend/inflight_batcher_llm/CMakeLists.txt +++ b/triton_backend/inflight_batcher_llm/CMakeLists.txt @@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 3.17) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/set_ifndef.cmake) -set_ifndef(TRTLLM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../tensorrt_llm) +set_ifndef(TRTLLM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../) include_directories(${TRTLLM_DIR} ${TRTLLM_DIR}/cpp/include)