From 44feeac91b6698c95813be24529396dae9c0c60a Mon Sep 17 00:00:00 2001 From: Morgan Funtowicz Date: Mon, 16 Dec 2024 16:03:07 +0100 Subject: [PATCH] misc(backend): once more? --- .github/workflows/build_trtllm.yaml | 8 +++----- Dockerfile_trtllm | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_trtllm.yaml b/.github/workflows/build_trtllm.yaml index 292c5abe..ae4765fe 100644 --- a/.github/workflows/build_trtllm.yaml +++ b/.github/workflows/build_trtllm.yaml @@ -65,14 +65,12 @@ jobs: SCCACHE_REGION: us-east-1 SCCACHE_S3_KEY_PREFIX: ${{ env.TENSORT_LLM_VERSION }} # SCCACHE_GHA_ENABLED=true - secrets: # 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 }} + 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_aws_bucket_name=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 a6d158ae..995e6190 100644 --- a/Dockerfile_trtllm +++ b/Dockerfile_trtllm @@ -79,9 +79,9 @@ ENV SCCACHE_S3_KEY_PREFIX ${SCCACHE_S3_KEY_PREFIX} COPY . . COPY --from=trt-builder /usr/local/tensorrt /usr/local/tensorrt 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 \ +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_aws_bucket_name,env=SCCACHE_BUCKET \ 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