From 71fc33174664738d8c8d93025ebc810180e69c20 Mon Sep 17 00:00:00 2001 From: Yih-Dar <2521628+ydshieh@users.noreply.github.com> Date: Mon, 26 Sep 2022 10:55:42 +0200 Subject: [PATCH] Separate Push CI images from Scheduled CI (#19170) * separate images * Fix condition Co-authored-by: ydshieh --- .github/workflows/build-docker-images.yml | 18 ++++++++++++++++-- .github/workflows/self-push-caller.yml | 2 ++ .github/workflows/self-push.yml | 12 ++++++------ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index 2d4dfc9f04..88934cbcbc 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -6,6 +6,10 @@ on: - docker-image* repository_dispatch: workflow_call: + inputs: + image_postfix: + required: true + type: string schedule: - cron: "0 1 * * *" @@ -38,10 +42,12 @@ jobs: build-args: | REF=main push: true - tags: huggingface/transformers-all-latest-gpu + tags: huggingface/transformers-all-latest-gpu${{ inputs.image_postfix }} latest-with-torch-nightly-docker: name: "Nightly PyTorch + Stable TensorFlow" + # Push CI doesn't need this image + if: inputs.image_postfix != '-push-ci' runs-on: ubuntu-latest steps: - @@ -91,10 +97,12 @@ jobs: build-args: | REF=main push: true - tags: huggingface/transformers-pytorch-deepspeed-latest-gpu + tags: huggingface/transformers-pytorch-deepspeed-latest-gpu${{ inputs.image_postfix }} nightly-torch-deepspeed-docker: name: "Nightly PyTorch + DeepSpeed" + # Push CI doesn't need this image + if: inputs.image_postfix != '-push-ci' runs-on: ubuntu-latest steps: - @@ -121,6 +129,8 @@ jobs: doc-builder: name: "Doc builder" + # Push CI doesn't need this image + if: inputs.image_postfix != '-push-ci' runs-on: ubuntu-latest steps: - @@ -145,6 +155,8 @@ jobs: latest-pytorch: name: "Latest PyTorch [dev]" + # Push CI doesn't need this image + if: inputs.image_postfix != '-push-ci' runs-on: ubuntu-latest steps: - @@ -171,6 +183,8 @@ jobs: latest-tensorflow: name: "Latest TensorFlow [dev]" + # Push CI doesn't need this image + if: inputs.image_postfix != '-push-ci' runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/self-push-caller.yml b/.github/workflows/self-push-caller.yml index 6dffef5da7..4c90b13870 100644 --- a/.github/workflows/self-push-caller.yml +++ b/.github/workflows/self-push-caller.yml @@ -40,6 +40,8 @@ jobs: needs: check-for-setup if: (github.event_name == 'push') && (needs.check-for-setup.outputs.changed == '1') uses: ./.github/workflows/build-docker-images.yml + with: + image_postfix: "-push-ci" secrets: inherit run_push_ci: diff --git a/.github/workflows/self-push.yml b/.github/workflows/self-push.yml index 97a76554df..af00314fa9 100644 --- a/.github/workflows/self-push.yml +++ b/.github/workflows/self-push.yml @@ -47,7 +47,7 @@ jobs: machine_type: [single-gpu, multi-gpu] runs-on: [self-hosted, docker-gpu, '${{ matrix.machine_type }}'] container: - image: huggingface/transformers-all-latest-gpu + image: huggingface/transformers-all-latest-gpu-push-ci options: --gpus 0 --shm-size "16gb" --ipc host -v /mnt/cache/.cache/huggingface:/mnt/cache/ steps: - name: NVIDIA-SMI @@ -62,7 +62,7 @@ jobs: machine_type: [single-gpu, multi-gpu] runs-on: [self-hosted, docker-gpu, '${{ matrix.machine_type }}'] container: - image: huggingface/transformers-all-latest-gpu + image: huggingface/transformers-all-latest-gpu-push-ci options: --gpus 0 --shm-size "16gb" --ipc host -v /mnt/cache/.cache/huggingface:/mnt/cache/ outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} @@ -158,7 +158,7 @@ jobs: machine_type: [single-gpu] runs-on: [self-hosted, docker-gpu, '${{ matrix.machine_type }}'] container: - image: huggingface/transformers-all-latest-gpu + image: huggingface/transformers-all-latest-gpu-push-ci options: --gpus 0 --shm-size "16gb" --ipc host -v /mnt/cache/.cache/huggingface:/mnt/cache/ steps: # Necessary to get the correct branch name and commit SHA for `workflow_run` event @@ -243,7 +243,7 @@ jobs: machine_type: [multi-gpu] runs-on: [self-hosted, docker-gpu, '${{ matrix.machine_type }}'] container: - image: huggingface/transformers-all-latest-gpu + image: huggingface/transformers-all-latest-gpu-push-ci options: --gpus all --shm-size "16gb" --ipc host -v /mnt/cache/.cache/huggingface:/mnt/cache/ steps: # Necessary to get the correct branch name and commit SHA for `workflow_run` event @@ -328,7 +328,7 @@ jobs: machine_type: [single-gpu] runs-on: [self-hosted, docker-gpu, '${{ matrix.machine_type }}'] container: - image: huggingface/transformers-pytorch-deepspeed-latest-gpu + image: huggingface/transformers-pytorch-deepspeed-latest-gpu-push-ci options: --gpus 0 --shm-size "16gb" --ipc host -v /mnt/cache/.cache/huggingface:/mnt/cache/ steps: # Necessary to get the correct branch name and commit SHA for `workflow_run` event @@ -410,7 +410,7 @@ jobs: machine_type: [multi-gpu] runs-on: [self-hosted, docker-gpu, '${{ matrix.machine_type }}'] container: - image: huggingface/transformers-pytorch-deepspeed-latest-gpu + image: huggingface/transformers-pytorch-deepspeed-latest-gpu-push-ci options: --gpus all --shm-size "16gb" --ipc host -v /mnt/cache/.cache/huggingface:/mnt/cache/ steps: # Necessary to get the correct branch name and commit SHA for `workflow_run` event