From 54185a1da774ff6ceec1505b2d7fd51028c30853 Mon Sep 17 00:00:00 2001 From: Julio Perez Date: Sat, 14 Oct 2023 16:02:05 -0400 Subject: [PATCH] consolidate testing because all in one container --- .github/workflows/gpu.yml | 63 ++------------------------------------- 1 file changed, 2 insertions(+), 61 deletions(-) diff --git a/.github/workflows/gpu.yml b/.github/workflows/gpu.yml index 5ecce1a839..7a137c68fe 100644 --- a/.github/workflows/gpu.yml +++ b/.github/workflows/gpu.yml @@ -10,7 +10,7 @@ on: - "v[0-9]+.[0-9]+.[0-9]+" jobs: - gpu-ci-tensorflow: + gpu-ci: runs-on: linux-amd64-gpu-p100-latest-1 container: image: nvcr.io/nvstaging/merlin/merlin-ci-runner:latest @@ -41,66 +41,7 @@ jobs: fi PYTEST_MARKERS="unit and not (examples or integration or notebook) and (singlegpu or not multigpu) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e gpu - gpu-ci-pytorch: - runs-on: linux-amd64-gpu-p100-latest-1 - container: - image: nvcr.io/nvstaging/merlin/merlin-ci-runner:latest - env: - NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} - options: --shm-size=1G - credentials: - username: $oauthtoken - password: ${{ secrets.NGC_TOKEN }} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Run tests - run: | - nvidia-smi - pip install tox - ref_type=${{ github.ref_type }} - branch=main - if [[ $ref_type == "tag"* ]] - then - git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/release*:refs/remotes/origin/release* - branch=$(git branch -r --contains ${{ github.ref_name }} --list '*release*' --format "%(refname:short)" | sed -e 's/^origin\///') - fi - if [[ "${{ github.ref }}" != 'refs/heads/main' ]]; then - extra_pytest_markers="and changed" - fi - PYTEST_MARKERS="unit and not (examples or integration or notebook) and (singlegpu or not multigpu) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e gpu - - gpu-ci-tensorflow-examples: - runs-on: linux-amd64-gpu-p100-latest-1 - container: - image: nvcr.io/nvstaging/merlin/merlin-ci-runner:latest - env: - NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} - options: --shm-size=1G - credentials: - username: $oauthtoken - password: ${{ secrets.NGC_TOKEN }} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Run tests - run: | - pip install tox - ref_type=${{ github.ref_type }} - branch=main - if [[ $ref_type == "tag"* ]] - then - git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/release*:refs/remotes/origin/release* - branch=$(git branch -r --contains ${{ github.ref_name }} --list '*release*' --format "%(refname:short)" | sed -e 's/^origin\///') - fi - if [[ "${{ github.ref }}" != 'refs/heads/main' ]]; then - extra_pytest_markers="and changed" - fi - PYTEST_MARKERS="(examples or notebook) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e gpu - - gpu-ci-pytorch-examples: + gpu-ci-examples: runs-on: linux-amd64-gpu-p100-latest-1 container: image: nvcr.io/nvstaging/merlin/merlin-ci-runner:latest