Skip to content

Commit

Permalink
Ensure that we are testing against 11.8 and SM90
Browse files Browse the repository at this point in the history
  • Loading branch information
miscco committed Feb 9, 2024
1 parent 40878d8 commit 4744c02
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 1 deletion.
46 changes: 46 additions & 0 deletions .devcontainer/cuda11.8-gcc10/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.04-cpp-gcc10-cuda11.8-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
"initializeCommand": [
"/bin/bash",
"-c",
"mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}"
],
"containerEnv": {
"SCCACHE_REGION": "us-east-2",
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda11.8-gcc10",
"CCCL_CUDA_VERSION": "11.8",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "10",
"CCCL_BUILD_INFIX": "cuda11.8-gcc10"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
"mounts": [
"source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent"
],
"customizations": {
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
}
}
},
"name": "cuda11.8-gcc10"
}
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"binaryDir": "${sourceDir}/build/$env{CCCL_BUILD_INFIX}/${presetName}",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_CUDA_ARCHITECTURES": "60;70;80",
"CMAKE_CUDA_ARCHITECTURES": "60;70;90",
"CCCL_ENABLE_LIBCUDACXX": false,
"CCCL_ENABLE_CUB": false,
"CCCL_ENABLE_THRUST": false,
Expand Down
2 changes: 2 additions & 0 deletions ci/build_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ CUDA_COMPILER=$(which ${CUDA_COMPILER})

if [[ -n "${CUDA_ARCHS}" ]]; then
GLOBAL_CMAKE_OPTIONS+=("-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHS}")
elif [[ "${CUDA_COMPILER}" =~ "11.1" ]]; then
GLOBAL_CMAKE_OPTIONS+=("-DCMAKE_CUDA_ARCHITECTURES=\"60;70;80\"")
fi

if [ $VERBOSE ]; then
Expand Down
2 changes: 2 additions & 0 deletions ci/matrix.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

cuda_oldest: &cuda_oldest '11.1'
cuda_pre12: &cuda_pre12 '11.8'
cuda_newest: &cuda_newest '12.3'

# The GPUs to test on
Expand Down Expand Up @@ -66,6 +67,7 @@ pull_request:
- {cuda: *cuda_newest, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc8, std: [11, 14, 17], jobs: ['build']}
- {cuda: *cuda_newest, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc9, std: [11, 14, 17], jobs: ['build']}
- {cuda: *cuda_newest, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc10, std: [11, 14, 17, 20], jobs: ['build']}
- {cuda: *cuda_pre12, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc10, std: [11, 14, 17], jobs: ['build']}
- {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: *gcc11, std: [11, 14, 17, 20], jobs: ['build']}
- {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: *gcc12, std: [11, 14, 17, 20], jobs: ['build', 'test']}
- {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'arm64', compiler: *gcc12, std: [11, 14, 17, 20], jobs: ['build']}
Expand Down

0 comments on commit 4744c02

Please sign in to comment.