From 2aac2ff2cd7e2c9cc3d49851289ad9fd298b7639 Mon Sep 17 00:00:00 2001 From: Morgan Funtowicz Date: Mon, 22 Jul 2024 11:32:54 +0000 Subject: [PATCH] do the same name definition stuff for tensorrt_llm_executor_static --- backends/trtllm/CMakeLists.txt | 4 +--- backends/trtllm/cmake/trtllm.cmake | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backends/trtllm/CMakeLists.txt b/backends/trtllm/CMakeLists.txt index 27d3d87f..20e95c4d 100644 --- a/backends/trtllm/CMakeLists.txt +++ b/backends/trtllm/CMakeLists.txt @@ -46,10 +46,8 @@ if (${TGI_TRTLLM_BACKEND_BUILD_EXAMPLES}) endif () # This install all the artifacts in CMAKE_INSTALL_PREFIX under include/ lib/ bin/ to make easy to link / find it back -message(STATUS "nvrtc ${TRTLLM_NVRTC_LIBRARY_NAME}") -message(STATUS "Installation nvrtc ${TRTLLM_NVRTC_WRAPPER_PATH}") install(TARGETS tgi_trtllm_backend_impl tensorrt_llm nvinfer_plugin_tensorrt_llm executorWorker) -install(FILES ${TRTLLM_NVRTC_WRAPPER_PATH} TYPE LIB) +install(FILES ${TRTLLM_NVRTC_WRAPPER_LIBRARY_PATH} ${TRTLLM_EXECUTOR_STATIC_LIBRARY_PATH} TYPE LIB) #### Unit Tests #### if (${TGI_TRTLLM_BACKEND_BUILD_TESTS}) diff --git a/backends/trtllm/cmake/trtllm.cmake b/backends/trtllm/cmake/trtllm.cmake index e114dfdd..2cc46d3d 100644 --- a/backends/trtllm/cmake/trtllm.cmake +++ b/backends/trtllm/cmake/trtllm.cmake @@ -36,3 +36,6 @@ set(TRTLLM_NVRTC_LIBRARY_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}tensorrt_llm_nvrtc_ set(TRTLLM_NVRTC_WRAPPER_LIBRARY_PATH "${trtllm_SOURCE_DIR}/cpp/tensorrt_llm/kernels/decoderMaskedMultiheadAttention/decoderXQAImplJIT/nvrtcWrapper/${CMAKE_LIBRARY_ARCHITECTURE}/${TRTLLM_NVRTC_LIBRARY_NAME}" CACHE INTERNAL "nvrtc wrapper library path") +# The same Executor Static library +set(TRTLLM_EXECUTOR_STATIC_LIBRARY_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}tensorrt_llm_executor_static${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE INTERNAL "executor_static library name") +set(TRTLLM_EXECUTOR_STATIC_LIBRARY_PATH "${trtllm_SOURCE_DIR}/cpp/tensorrt_llm/executor/${CMAKE_LIBRARY_ARCHITECTURE}/${TRTLLM_EXECUTOR_STATIC_LIBRARY_NAME}" CACHE INTERNAL "executor_static library path")