From 858f7a0ec28d772e34a7de479ba6dd13130f857f Mon Sep 17 00:00:00 2001
From: Daniel Juenger <2955913+sleeepyjack@users.noreply.github.com>
Date: Mon, 21 Aug 2023 13:01:37 +0000
Subject: [PATCH] Use comma-separated build arch list

---
 .github/workflows/build-and-test.yml | 8 ++++----
 ci/matrix.yml                        | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 07912a832..c641ec01a 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -55,10 +55,10 @@ jobs:
   build:
     needs: devcontainer_image
     if: inputs.build_script != '' && needs.devcontainer_image.outputs.image_name != ''
-    name: Build ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}}
+    name: Build ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}}/SM${{inputs.gpu_build_archs}}
     uses: ./.github/workflows/run-as-coder.yml
     with:
-      name: Build ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}}
+      name: Build ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}}SM${{inputs.gpu_build_archs}}
       runner: linux-${{inputs.cpu}}-cpu16
       image: ${{ needs.devcontainer_image.outputs.image_name }}
       command: |
@@ -67,10 +67,10 @@ jobs:
   test:
     needs: [devcontainer_image, build]
     if:  ${{ !cancelled() && ( needs.build.result == 'success' || needs.build.result == 'skipped' ) && inputs.test_script != '' && needs.devcontainer_image.outputs.image_name != '' && inputs.run_tests}}
-    name: Test ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}}
+    name: Test ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}}/SM${{inputs.gpu_build_archs}}
     uses: ./.github/workflows/run-as-coder.yml
     with:
-      name: Test ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}}
+      name: Test ${{inputs.compiler}}${{inputs.compiler_version}}/C++${{inputs.std}}SM${{inputs.gpu_build_archs}}
       runner: linux-${{inputs.cpu}}-gpu-v100-latest-1
       image: ${{ needs.devcontainer_image.outputs.image_name }}
       command: |
diff --git a/ci/matrix.yml b/ci/matrix.yml
index 99e2363ce..58d384cfc 100644
--- a/ci/matrix.yml
+++ b/ci/matrix.yml
@@ -34,7 +34,7 @@ devcontainer_version: '23.08'
 #   version: The compiler version
 #   exe: The unverionsed compiler binary name
 #   To use the system's default compiler set "exe: 'c++'" or "name: 'cc'"
-# gpu_build_archs: The GPU architectures to build for using the syntax of CMAKE_CUDA_ARCHITECTURES (semi-colon separated list)
+# gpu_build_archs: The GPU architectures to build for (comma-separated list)
 # std: The C++ standards to build for
 #    This field is unique as it will generate an independent build/test job for each value
 
@@ -44,5 +44,4 @@ pull_request:
     # There is currently only one CUDA 11.8 image available which comes with the system's default C++ compiler. For ubuntu22.04, we know that the default CC is gcc11.3
     - {cuda: *cuda_oldest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '11', exe: 'c++'}, gpu_build_archs: '60', std: [17], jobs: ['build', 'test']}
     - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '12', exe: 'g++'}, gpu_build_archs: '70', std: [17], jobs: ['build', 'test']}
-    - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '12', exe: 'g++'}, gpu_build_archs: '80', std: [17], jobs: ['build']}
-    - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '12', exe: 'g++'}, gpu_build_archs: '90', std: [17], jobs: ['build']}
\ No newline at end of file
+    - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '12', exe: 'g++'}, gpu_build_archs: '80,90', std: [17], jobs: ['build']}
\ No newline at end of file