From cb1dab12c1d6e0d990bd019461e1b81f23a8e385 Mon Sep 17 00:00:00 2001 From: Morgan Funtowicz Date: Sat, 25 Jan 2025 01:31:13 +0100 Subject: [PATCH] backend(trtllm): ok let's try to define the launchers in build.rs when rustc_wrapper is present --- Dockerfile_trtllm | 3 --- backends/trtllm/build.rs | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile_trtllm b/Dockerfile_trtllm index 72de0ea6..5a23fdab 100644 --- a/Dockerfile_trtllm +++ b/Dockerfile_trtllm @@ -93,9 +93,6 @@ COPY --from=trt-builder /usr/local/tensorrt /usr/local/tensorrt COPY --from=mpi-builder /usr/local/mpi /usr/local/mpi ENV RUSTC_WRAPPER=sccache -ENV CMAKE_C_COMPILER_LAUNCHER=sccache -ENV CMAKE_CXX_COMPILER_LAUNCHER=sccache -ENV CMAKE_CUDA_COMPILER_LAUNCHER=sccache ENV CMAKE_INSTALL_PREFIX=$TGI_INSTALL_PREFIX RUN mkdir $TGI_INSTALL_PREFIX && mkdir "$TGI_INSTALL_PREFIX/include" && mkdir "$TGI_INSTALL_PREFIX/lib" && \ cargo build --profile ${build_type} --package text-generation-backends-trtllm --bin text-generation-backends-trtllm && \ diff --git a/backends/trtllm/build.rs b/backends/trtllm/build.rs index 429b7533..4d559fd4 100644 --- a/backends/trtllm/build.rs +++ b/backends/trtllm/build.rs @@ -138,6 +138,9 @@ fn build_backend(is_debug: bool, opt_level: &str, out_dir: &PathBuf) -> (PathBuf if let Some(wrapper) = option_env!("RUSTC_WRAPPER") { println!("cargo:warning=Using caching tool: {wrapper}"); + config.define("CMAKE_C_COMPILER_LAUNCHER", wrapper); + config.define("CMAKE_CXX_COMPILER_LAUNCHER", wrapper); + config.define("CMAKE_CUDA_COMPILER_LAUNCHER", wrapper); } // Allow to override which Python to use ...