Skip to content

Commit 6d29e55

Browse files
committed
gpuCI: Update to NVHPC 21.5 and CUDA 11.3.
1 parent 9116aa8 commit 6d29e55

5 files changed

Lines changed: 18 additions & 23 deletions

File tree

ci/axis/cpu.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ SDK_TYPE:
88
- nvhpc
99

1010
SDK_VER:
11-
- 11.0-devel
12-
- 20.9-devel
11+
- 11.3.1-devel
12+
- 21.5-devel-cuda11.3
1313

1414
OS_TYPE:
1515
- ubuntu
@@ -30,7 +30,8 @@ CXX_VER:
3030
- 8
3131
- 9
3232
- 10
33-
- 20.9
33+
- 11
34+
- 21.5
3435
- latest
3536

3637
exclude:
@@ -45,9 +46,9 @@ exclude:
4546
SDK_TYPE: cuda
4647
# Excludes by `SDK_VER`.
4748
- SDK_TYPE: cuda
48-
SDK_VER: 20.9-devel
49+
SDK_VER: 21.5-devel-cuda11.3
4950
- SDK_TYPE: nvhpc
50-
SDK_VER: 11.0-devel
51+
SDK_VER: 11.3.1-devel
5152
# Excludes by `CXX_VER`.
5253
- CXX_TYPE: nvcxx
5354
CXX_VER: 5
@@ -61,22 +62,22 @@ exclude:
6162
CXX_VER: 9
6263
- CXX_TYPE: nvcxx
6364
CXX_VER: 10
65+
- CXX_TYPE: nvcxx
66+
CXX_VER: 11
6467
- CXX_TYPE: nvcxx
6568
CXX_VER: latest
6669
- CXX_TYPE: gcc
67-
CXX_VER: 10
70+
CXX_VER: 11
6871
- CXX_TYPE: gcc
69-
CXX_VER: 20.9
72+
CXX_VER: 21.5
7073
- CXX_TYPE: gcc
7174
CXX_VER: latest
7275
- CXX_TYPE: clang
7376
CXX_VER: 5
7477
- CXX_TYPE: clang
7578
CXX_VER: 6
7679
- CXX_TYPE: clang
77-
CXX_VER: 10
78-
- CXX_TYPE: clang
79-
CXX_VER: 20.9
80+
CXX_VER: 21.5
8081
- CXX_TYPE: clang
8182
CXX_VER: latest
8283
- CXX_TYPE: icc
@@ -92,5 +93,7 @@ exclude:
9293
- CXX_TYPE: icc
9394
CXX_VER: 10
9495
- CXX_TYPE: icc
95-
CXX_VER: 20.9
96+
CXX_VER: 11
97+
- CXX_TYPE: icc
98+
CXX_VER: 21.5
9699

ci/axis/gpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SDK_TYPE:
77
- cuda
88

99
SDK_VER:
10-
- 11.0-devel
10+
- 11.3.1-devel
1111

1212
OS_TYPE:
1313
- ubuntu

ci/common/build.bash

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ if [[ "${CXX_TYPE}" == "nvcxx" ]]; then
8989
append CMAKE_FLAGS "-DCMAKE_CUDA_COMPILER_ID=NVCXX"
9090
# Don't stop on build failures.
9191
append CMAKE_BUILD_FLAGS "-k"
92-
# NVC++ currently uses a lot of memory.
93-
PARALLEL_LEVEL=1
9492
else
9593
if [[ "${CXX_TYPE}" == "icc" ]]; then
9694
# Only the latest version of the Intel C++ compiler, which NVCC doesn't
@@ -196,20 +194,14 @@ if [[ "${BUILD_TYPE}" == "cpu" ]]; then
196194
CTEST_EXCLUSION_REGEXES+=("^cub" "^thrust.*cuda")
197195
fi
198196

199-
if [[ "${CXX_TYPE}" == "icc" ]]; then
200-
# The free version of icpc used in gpuCI seems to have a compiler bug that
201-
# causes a scan test to produce incorrect output.
202-
CTEST_EXCLUSION_REGEXES+=("thrust\\.cpp\\.tbb\\.cpp..\\.test\\.scan$")
203-
fi
204-
205197
if [[ -n "${CTEST_EXCLUSION_REGEXES[@]}" ]]; then
206198
CTEST_EXCLUSION_REGEX=$(join_delimit "|" "${CTEST_EXCLUSION_REGEXES[@]}")
207199
append CTEST_FLAGS "-E ${CTEST_EXCLUSION_REGEX}"
208200
fi
209201

210202
if [[ -n "${@}" ]]; then
211203
CTEST_INCLUSION_REGEX=$(join_delimit "|" "${@}")
212-
append CTEST_FLAGS "-R ${CTEST_INCLUSION_REGEX[@]}"
204+
append CTEST_FLAGS "-R ^${CTEST_INCLUSION_REGEX[@]}$"
213205
fi
214206

215207
# Export variables so they'll show up in the logs when we report the environment.

ci/local/build.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ REPOSITORY_PATH=$(realpath ${SCRIPT_PATH}/../..)
6060
# FLAGS - Process command line flags.
6161
################################################################################
6262

63-
IMAGE="gpuci/cccl:cuda11.0-devel-ubuntu20.04-gcc7"
63+
IMAGE="gpuci/cccl:cuda11.3.1-devel-ubuntu20.04-gcc7"
6464

6565
LOCAL_IMAGE=0
6666

dependencies/cub

Submodule cub updated from 1877cc0 to 6346b2e

0 commit comments

Comments
 (0)