From 4ac5c2ff029c81780419cf7aba9226e68a7dbd88 Mon Sep 17 00:00:00 2001 From: Daniel Juenger <2955913+sleeepyjack@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:12:54 +0000 Subject: [PATCH] Fix annotations --- .github/workflows/build-and-test.yml | 8 ++++---- .github/workflows/pr.yml | 3 +-- ci/matrix.yml | 4 +++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index db748dc03..02c10993c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -39,10 +39,10 @@ on: jobs: build: if: inputs.build_script != '' && inputs.build_image != '' - name: Build ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}} uses: ./.github/workflows/run-as-coder.yml + name: ${{inputs.compiler}}${{inputs.compiler_version}} / C++${{inputs.std}} / SM${{inputs.gpu_build_archs}} with: - name: Build ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}} + name: Build runner: linux-${{inputs.cpu}}-cpu16 image: ${{inputs.build_image}} command: | @@ -51,10 +51,10 @@ jobs: test: needs: build if: ${{ !cancelled() && ( needs.build.result == 'success' || needs.build.result == 'skipped' ) && inputs.test_script != '' && inputs.test_image != '' && inputs.run_tests}} - name: Test ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}} uses: ./.github/workflows/run-as-coder.yml + name: ${{inputs.compiler}}${{inputs.compiler_version}} / C++${{inputs.std}} / SM${{inputs.gpu_build_archs}} with: - name: Test ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}} + name: Test runner: linux-${{inputs.cpu}}-gpu-v100-latest-1 image: ${{inputs.test_image}} command: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2ca22369f..76bb87d18 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -32,7 +32,6 @@ concurrency: cancel-in-progress: true jobs: - get-devcontainer-version: name: Get devcontainer version runs-on: ubuntu-latest @@ -77,7 +76,7 @@ jobs: echo "PER_CUDA_COMPILER_MATRIX=$PER_CUDA_COMPILER_MATRIX" | tee -a "$GITHUB_OUTPUT" ci: - name: CUDA${{ matrix.cuda_version }} ${{ matrix.compiler }} + name: CI / CUDA${{ matrix.cuda_version }} needs: [compute-nvcc-matrix, get-devcontainer-version] uses: ./.github/workflows/dispatch-build-and-test.yml strategy: diff --git a/ci/matrix.yml b/ci/matrix.yml index 32e46420f..a4d932181 100644 --- a/ci/matrix.yml +++ b/ci/matrix.yml @@ -20,6 +20,7 @@ cuda_newest: &cuda_newest '12.2' # Note: This assumes that the appropriate gpu_build_archs are set to include building for the GPUs listed here gpus: - 'v100' + - 'a100' # The version of the devcontainer images to use from https://hub.docker.com/r/rapidsai/devcontainers devcontainer_version: '23.08' @@ -40,4 +41,5 @@ devcontainer_version: '23.08' # Configurations that will run for every PR pull_request: nvcc: - - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '12', exe: 'g++'}, gpu_build_archs: '70', std: [17], jobs: ['build', 'test']} \ No newline at end of file + - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '12', exe: 'g++'}, gpu_build_archs: '70;80', std: [17], jobs: ['build', 'test']} + - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '11', exe: 'g++'}, gpu_build_archs: '70;80', std: [17], jobs: ['build', 'test']} \ No newline at end of file