From 95ccba3705963c294758eeca77e66dbc529f5381 Mon Sep 17 00:00:00 2001 From: Alvaro Bartolome <36760800+alvarobartt@users.noreply.github.com> Date: Fri, 18 Apr 2025 12:45:32 +0200 Subject: [PATCH] Bump `sccache` to 0.10.0 (#3179) * Ensure that `sccache` version is 0.10.0 or higher * Rename `ACTIONS_CACHE_URL` to `ACTIONS_RESULTS_URL` --- .github/workflows/build.yaml | 4 ++-- Dockerfile_trtllm | 9 ++++----- docs/source/backends/trtllm.md | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 99f29d7eb..a87191c2f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,7 @@ jobs: uses: actions/github-script@v7 with: script: | - core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - name: Extract TensorRT-LLM version @@ -223,7 +223,7 @@ jobs: PLATFORM=${{ env.PLATFORM }} build_type=${{ env.BUILD_TYPE }} sccache_gha_enabled=on - actions_cache_url=${{ env.ACTIONS_CACHE_URL }} + actions_results_url=${{ env.ACTIONS_RESULTS_URL }} actions_runtime_token=${{ env.ACTIONS_RUNTIME_TOKEN }} target: ${{ env.TARGET }} tags: ${{ steps.meta.outputs.tags || steps.meta-pr.outputs.tags }} diff --git a/Dockerfile_trtllm b/Dockerfile_trtllm index 7df2e3685..c0cf90335 100644 --- a/Dockerfile_trtllm +++ b/Dockerfile_trtllm @@ -3,10 +3,9 @@ ARG cuda_base=12.8.0 ARG build_type=release ARG ompi_version=4.1.7 ARG sccache_gha_enabled=off -ARG actions_cache_url="" +ARG actions_results_url="" ARG actions_runtime_token="" - # CUDA dependent dependencies resolver stage FROM nvidia/cuda:${cuda_base}-cudnn-devel-ubuntu24.04 AS cuda-builder @@ -66,7 +65,7 @@ WORKDIR /usr/src/text-generation-inference ARG cuda_arch_list ARG build_type ARG sccache_gha_enabled -ARG actions_cache_url +ARG actions_results_url ARG actions_runtime_token # Install Rust @@ -74,7 +73,7 @@ ENV PATH="/root/.cargo/bin:$PATH" RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.85.1 --profile minimal -y && \ chmod -R a+w /root/.rustup && \ chmod -R a+w /root/.cargo && \ - cargo install sccache --locked + cargo install sccache --version ">=0.10.0" --locked ENV LD_LIBRARY_PATH="/usr/local/mpi/lib:$LD_LIBRARY_PATH" ENV PKG_CONFIG_PATH="/usr/local/mpi/lib/pkgconfig" @@ -85,7 +84,7 @@ ENV CUDA_ARCH_LIST=${cuda_arch_list} # SCCACHE Specifics args - before finding a better, more generic, way... ENV SCCACHE_GHA_ENABLED=${sccache_gha_enabled} -ENV ACTIONS_CACHE_URL=${actions_cache_url} +ENV ACTIONS_RESULTS_URL=${actions_results_url} ENV ACTIONS_RUNTIME_TOKEN=${actions_runtime_token} COPY Cargo.lock Cargo.lock diff --git a/docs/source/backends/trtllm.md b/docs/source/backends/trtllm.md index 10db4a508..92edbf090 100644 --- a/docs/source/backends/trtllm.md +++ b/docs/source/backends/trtllm.md @@ -163,7 +163,7 @@ WORKDIR /usr/src/text-generation-inference ARG cuda_arch_list ARG build_type ARG sccache_gha_enabled -ARG actions_cache_url +ARG actions_results_url ARG actions_runtime_token # Install Rust @@ -171,7 +171,7 @@ ENV PATH="/root/.cargo/bin:$PATH" RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y && \ chmod -R a+w /root/.rustup && \ chmod -R a+w /root/.cargo && \ - cargo install sccache --locked + cargo install sccache --version ">=0.10.0" --locked ENV LD_LIBRARY_PATH="/usr/local/mpi/lib:$LD_LIBRARY_PATH" ENV PKG_CONFIG_PATH="/usr/local/mpi/lib/pkgconfig"