File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -8,8 +8,8 @@ SDK_TYPE:
88 - nvhpc
99
1010SDK_VER :
11- - 11.0 -devel
12- - 20.9 -devel
11+ - 11.3.1 -devel
12+ - 21.5 -devel-cuda11.3
1313
1414OS_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
3637exclude :
@@ -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
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ SDK_TYPE:
77 - cuda
88
99SDK_VER :
10- - 11.0 -devel
10+ - 11.3.1 -devel
1111
1212OS_TYPE :
1313 - ubuntu
Original file line number Diff line number Diff 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
9492else
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" )
197195fi
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-
205197if [[ -n " ${CTEST_EXCLUSION_REGEXES[@]} " ]]; then
206198 CTEST_EXCLUSION_REGEX=$( join_delimit " |" " ${CTEST_EXCLUSION_REGEXES[@]} " )
207199 append CTEST_FLAGS " -E ${CTEST_EXCLUSION_REGEX} "
208200fi
209201
210202if [[ -n " ${@ } " ]]; then
211203 CTEST_INCLUSION_REGEX=$( join_delimit " |" " ${@ } " )
212- append CTEST_FLAGS " -R ${CTEST_INCLUSION_REGEX[@]} "
204+ append CTEST_FLAGS " -R ^ ${CTEST_INCLUSION_REGEX[@]} $ "
213205fi
214206
215207# Export variables so they'll show up in the logs when we report the environment.
Original file line number Diff line number Diff 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
6565LOCAL_IMAGE=0
6666
You can’t perform that action at this time.
0 commit comments