From e2882dd749a2924c0a81cc72cfdf36738de445ff Mon Sep 17 00:00:00 2001 From: Wing Lian Date: Wed, 4 Dec 2024 12:25:47 -0500 Subject: [PATCH] drop unnecessary BNB_CUDA_VERSION env var from docker as it just results in warnings (#2121) [skip ci] * drop unnecessary BNB_CUDA_VERSION env var from docker as it just results in warnings * make sure to run tests when cicd Dockerfile changes --- .github/workflows/tests.yml | 2 ++ cicd/Dockerfile.jinja | 1 - docker/Dockerfile | 1 - docker/Dockerfile-tests | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dd4c95bbe4..5abab4a2df 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,6 +10,7 @@ on: - '.github/workflows/*.yml' - 'requirements-tests.txt' - 'cicd/cicd.sh' + - 'cicd/Dockerfile.jinja' pull_request: paths: - '**.py' @@ -17,6 +18,7 @@ on: - '.github/workflows/*.yml' - 'requirements-tests.txt' - 'cicd/cicd.sh' + - 'cicd/Dockerfile.jinja' workflow_dispatch: # Cancel jobs on the same ref if a new one is triggered diff --git a/cicd/Dockerfile.jinja b/cicd/Dockerfile.jinja index da28b391fc..4d1c4e664b 100644 --- a/cicd/Dockerfile.jinja +++ b/cicd/Dockerfile.jinja @@ -4,7 +4,6 @@ ENV TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6+PTX" ENV AXOLOTL_EXTRAS="{{ AXOLOTL_EXTRAS }}" ENV AXOLOTL_ARGS="{{ AXOLOTL_ARGS }}" ENV CUDA="{{ CUDA }}" -ENV BNB_CUDA_VERSION="{{ CUDA }}" ENV PYTORCH_VERSION="{{ PYTORCH_VERSION }}" ENV GITHUB_REF="{{ GITHUB_REF }}" ENV GITHUB_SHA="{{ GITHUB_SHA }}" diff --git a/docker/Dockerfile b/docker/Dockerfile index 88b871ea94..261f0e12ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,6 @@ ARG TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6+PTX" ARG AXOLOTL_EXTRAS="" ARG AXOLOTL_ARGS="" ARG CUDA="118" -ENV BNB_CUDA_VERSION=$CUDA ARG PYTORCH_VERSION="2.1.2" ENV PYTORCH_VERSION=$PYTORCH_VERSION diff --git a/docker/Dockerfile-tests b/docker/Dockerfile-tests index 36c0a639e3..09efeb6199 100644 --- a/docker/Dockerfile-tests +++ b/docker/Dockerfile-tests @@ -5,7 +5,6 @@ ARG TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6+PTX" ARG AXOLOTL_EXTRAS="" ARG AXOLOTL_ARGS="" ARG CUDA="118" -ENV BNB_CUDA_VERSION=$CUDA ARG PYTORCH_VERSION="2.1.2" ARG GITHUB_REF="main"