From 5d5524d680d211019106192331d850be143eba80 Mon Sep 17 00:00:00 2001
From: Morgan Funtowicz <funtowiczmo@gmail.com>
Date: Mon, 16 Dec 2024 15:47:51 +0100
Subject: [PATCH] misc(backend): test with TGI S3 conf

---
 .github/workflows/build_trtllm.yaml | 31 ++++++++++++++++++-----------
 Dockerfile_trtllm                   |  1 -
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_trtllm.yaml b/.github/workflows/build_trtllm.yaml
index d38f6c43..ae374290 100644
--- a/.github/workflows/build_trtllm.yaml
+++ b/.github/workflows/build_trtllm.yaml
@@ -30,13 +30,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: "Configure AWS Credentials"
-        id: aws-creds
-        uses: aws-actions/configure-aws-credentials@v4
+      - name: Extract TensorRT-LLM version
+        run: |
+          echo "TENSORT_LLM_VERSION=$(grep -oP '([a-z,0-9]{40})' backends/trtllm/cmake/trtllm.cmake)" >> $GITHUB_ENV
+
+      - name: Setup Github Actions Caching Layer
+        uses: actions/cache@v7
         with:
-          aws-region: us-east-1
-          role-to-assume: ${{ secrets.AWS_ROLE_GITHUB_TGI_TEST }}
-          output-credentials: true
+          path: .sccache
+          key: trtllm_${{ env.TENSORRT_LLM_VERSION }}_linux-gnu-x86_64-gcc14
 
       - name: Initialize Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -61,13 +63,18 @@ jobs:
             SCCACHE_NO_DAEMON=1
             BUILD_TYPE=dev
             SCCACHE_REGION: us-east-1
-            SCCACHE_S3_KEY_PREFIX: trtllm
+            SCCACHE_S3_KEY_PREFIX: x86_64
+          #            SCCACHE_GHA_ENABLED=true
+
           secrets:
-            AWS_ACCESS_KEY_ID=${{ steps.aws-creds.outputs.aws-access-key-id }}
-            AWS_SECRET_ACCESS_KEY=${{ steps.aws-creds.outputs.aws-secret-access-key }}
-            SCCACHE_BUCKET=${{ secrets.AWS_S3_BUCKET_GITHUB_TGI_TEST }}
-          cache-from: type=s3,region=us-east-1,bucket=ci-docker-buildx-cache,name=text-generation-inference-trtllm-cache${{ env.LABEL }},mode=min,access_key_id=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_ACCESS_KEY_ID }},secret_access_key=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_SECRET_ACCESS_KEY }},mode=min
-          cache-to: type=s3,region=us-east-1,bucket=ci-docker-buildx-cache,name=text-generation-inference-trtllm-cache${{ env.LABEL }},mode=min,access_key_id=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_ACCESS_KEY_ID }},secret_access_key=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_SECRET_ACCESS_KEY }},mode=min
+            #            ACTIONS_CACHE_URL=${{}}
+            #            ACTIONS_RUNTIME_TOKEN=${{}}
+
+            AWS_ACCESS_KEY_ID=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_SECRET_ACCESS_KEY }}
+            SCCACHE_BUCKET=ci-docker-buildx-cache,name=text-generation-inference-cache-${{ env.LABEL }}
+          cache-from: type=s3,region=us-east-1,bucket=ci-docker-buildx-cache,name=text-generation-inference-cache-${{ env.LABEL }},mode=min,access_key_id=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_ACCESS_KEY_ID }},secret_access_key=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_SECRET_ACCESS_KEY }},mode=min
+          cache-to: type=s3,region=us-east-1,bucket=ci-docker-buildx-cache,name=text-generation-inference-cache-${{ env.LABEL }},mode=min,access_key_id=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_ACCESS_KEY_ID }},secret_access_key=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_SECRET_ACCESS_KEY }},mode=min
 
 
 
diff --git a/Dockerfile_trtllm b/Dockerfile_trtllm
index a7ddf485..ba6c5438 100644
--- a/Dockerfile_trtllm
+++ b/Dockerfile_trtllm
@@ -97,7 +97,6 @@ COPY --from=mpi-builder /usr/local/mpi /usr/local/mpi
 RUN --mount=type=secret,id=AWS_ACCESS_KEY_ID,env=AWS_ACCESS_KEY_ID \
     --mount=type=secret,id=AWS_SECRET_ACCESS_KEY,env=AWS_SECRET_ACCESS_KEY \
     --mount=type=secret,id=SCCACHE_BUCKET,env=SCCACHE_BUCKET \
-    echo "AWS_ACCESS_KEY_ID: "${AWS_ACCESS_KEY_ID}" && \
     mkdir $TGI_INSTALL_PREFIX && mkdir "$TGI_INSTALL_PREFIX/include" && mkdir "$TGI_INSTALL_PREFIX/lib" && \
     RUSTC_WRAPPER=sccache CMAKE_INSTALL_PREFIX=$TGI_INSTALL_PREFIX cargo build --profile ${BUILD_TYPE} --package text-generation-backends-trtllm --bin text-generation-backends-trtllm