Skip to content

Commit 3e6e64c

Browse files
committed
Add special handling for 12.0 with clang
1 parent e9e6a4f commit 3e6e64c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/dispatch-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ jobs:
3737
test_name: ${{matrix.compiler.name}}${{matrix.compiler.version}}/C++${{matrix.std}}
3838
build_script: "./ci/build.sh --cxx ${{matrix.compiler.exe}} --std ${{matrix.std}} --arch ${{matrix.gpu_build_archs}} --infix ${{matrix.cpu}}-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}"
3939
test_script: "./ci/test.sh --tests --cxx ${{matrix.compiler.exe}} --std ${{matrix.std}} --arch ${{matrix.gpu_build_archs}} --infix ${{matrix.cpu}}-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}"
40-
container_image: rapidsai/devcontainers:${{inputs.devcontainer_version}}-cpp-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}-${{matrix.os}}
40+
container_image: ${{ matrix.cuda == '12.0' && matrix.compiler.name == 'llvm' && format('rapidsai/devcontainers:{0}-cpp-{1}{2}-cuda{3}', inputs.devcontainer_version, matrix.compiler.name, matrix.compiler.version, matrix.cuda) || format('rapidsai/devcontainers:{0}-cpp-{1}{2}-cuda{3}-{4}', inputs.devcontainer_version, matrix.compiler.name, matrix.compiler.version, matrix.cuda, matrix.os) }}
4141
run_tests: ${{ contains(matrix.jobs, 'test') && !contains(github.event.head_commit.message, 'skip-tests') }}

.github/workflows/pr.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,15 @@ jobs:
6868
.github/actions/compute-matrix/compute-matrix.sh ci/matrix.yml pull_request
6969
7070
ci:
71-
name: CUDA${{ matrix.cuda_version }} ${{ matrix.compiler }}
71+
name: CUDA${{ matrix.cuda }} ${{ matrix.compiler.name }}${{ matrix.compiler.version }}
7272
needs: compute-matrix
7373
uses: ./.github/workflows/dispatch-build-and-test.yml
7474
strategy:
7575
fail-fast: false
7676
matrix:
77-
cuda_version: ${{ fromJSON(needs.compute-matrix.outputs.CUDA_VERSIONS) }}
78-
compiler: ${{ fromJSON(needs.compute-matrix.outputs.HOST_COMPILERS) }}
77+
include: ${{ fromJSON(needs.compute-matrix.outputs.NVCC_FULL_MATRIX) }}
7978
with:
80-
per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ format('{0}-{1}', matrix.cuda_version, matrix.compiler) ]) }}
79+
per_cuda_compiler_matrix: ${{ toJSON([matrix]) }}
8180
devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
8281

8382
verify-devcontainers:

0 commit comments

Comments
 (0)