Skip to content

Commit 4a0d67a

Browse files
committed
bump the gtest version requirement and rearrange comments in build
1 parent 28b9374 commit 4a0d67a

2 files changed

Lines changed: 7 additions & 14 deletions

File tree

.gitlab/build.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# cuda 11.4 and friends
21
build/cuda110/nompi/gcc/cuda/release/shared:
32
extends:
43
- .build_and_test_template
@@ -11,8 +10,6 @@ build/cuda110/nompi/gcc/cuda/release/shared:
1110
BUILD_MPI: "OFF"
1211
BUILD_TYPE: "Release"
1312
FAST_TESTS: "ON"
14-
# fix gtest issue https://github.com/google/googletest/issues/3514
15-
CXX_FLAGS: "-Wno-error=maybe-uninitialized"
1613
# disable spurious unused argument warning
1714
# this is seemingly broken with CUDA 11
1815
# EXTRA_CMAKE_FLAGS: "-DCMAKE_CUDA_FLAGS=-diag-suppress=177"
@@ -30,10 +27,10 @@ build/nvhpc227/cuda117/nompi/nvcpp/debug/shared:
3027
BUILD_MPI: "OFF"
3128
BUILD_TYPE: "Debug"
3229
FAST_TESTS: "ON"
33-
# disable common gflags warnings
3430
CXX_FLAGS: "--diag_suppress=useless_using_declaration,declared_but_not_referenced"
35-
# disable spurious unused argument warning
3631
EXTRA_CMAKE_FLAGS: "-DCMAKE_CUDA_FLAGS=-diag-suppress=177"
32+
# `--diag_suppress=useless_using_declaration,declared_but_not_referenced` disables common gflags warning
33+
# `-diag-suppress=188` disables spurious unused argument warning in CUDA
3734

3835
build/cuda118/nompi/gcc/cuda/debug/shared:
3936
extends:
@@ -148,7 +145,6 @@ build/amd/openmpi/gcc/rocm620/debug/shared:
148145
BUILD_SHARED_LIBS: "ON"
149146
MODULE_LOAD: "cmake/3.24.4 rocm/6.2.0 gcc/13.3.0 openmpi/5.0.7"
150147

151-
# rocm 6.3.x is the last version support MI50 officially
152148
build/amd/openmpi/gcc/rocm634_wo_omp/release/shared:
153149
extends:
154150
- .build_and_test_tum_template
@@ -161,8 +157,8 @@ build/amd/openmpi/gcc/rocm634_wo_omp/release/shared:
161157
BUILD_MPI: "ON"
162158
BUILD_TYPE: "Release"
163159
MODULE_LOAD: "cmake/3.29.6 rocm/6.3.4 gcc/13.3.0 openmpi/5.0.7"
160+
# MI50 is officially supported by ROCm < 6.4.0
164161

165-
# mi50 is not officially supported by ROCm >= 6.4.0
166162
build/amd/nompi/gcc/rocm644/debug/static:
167163
extends:
168164
- .build_and_test_tum_template
@@ -177,6 +173,7 @@ build/amd/nompi/gcc/rocm644/debug/static:
177173
BUILD_TYPE: "Debug"
178174
BUILD_SHARED_LIBS: "OFF"
179175
MODULE_LOAD: "cmake/3.29.6 rocm/6.4.4 gcc/14.3.0"
176+
# MI50 is not officially supported by ROCm >= 6.4.0
180177

181178
build/amd/nompi/gcc/rocm710/release/shared:
182179
extends:
@@ -207,7 +204,6 @@ build/amd/nompi/gcc/rocm720/release/shared:
207204
ENABLE_HALF: "OFF"
208205
MODULE_LOAD: "cmake/3.25.3 rocm/7.2.0 gcc/12.4.0"
209206

210-
# no cuda but latest gcc and clang
211207
build/nocuda/nompi/gcc/core/debug/static:
212208
extends:
213209
- .build_and_test_template
@@ -271,10 +267,9 @@ build/nocuda/openmpi/clang/omp/glibcxx-debug-release/shared:
271267
MPI_AS_ROOT: "ON"
272268
BUILD_MPI: "ON"
273269
CXX_FLAGS: "-Wpedantic -D_GLIBCXX_DEBUG=1"
274-
# The tests are prohibitively slow in Debug
275270
BUILD_TYPE: "Release"
271+
# We use Release here bacause glibcxx tests are prohibitively slow in Debug
276272

277-
# nocuda with old compiler
278273
build/nocuda/nompi/gcc/omp/release/static:
279274
extends:
280275
- .build_and_test_template
@@ -390,7 +385,6 @@ build/nogpu/mpi/gcc13/noomp/release/shared:
390385
BUILD_MPI: "ON"
391386
MODULE_LOAD: "cmake/3.18.6 gcc/13.3.0 openmpi"
392387

393-
# spack oneapi 2023.1
394388
build/icpx20231/gpu/release/shared:
395389
extends:
396390
- .build_and_test_template
@@ -459,7 +453,6 @@ build/icpx202421/gpu/release/shared:
459453
ONEAPI_DEVICE_SELECTOR: "level_zero:gpu"
460454
MODULE_LOAD: "cmake/3.28.6 intel-oneapi-compilers/2024.2.1 intel-oneapi-dpl/2022.6.1 intel-oneapi-tbb/2021.13.1 intel-oneapi-mkl/2024.2.1"
461455

462-
# It gives two available backends of GPU on tests
463456
build/dpcpp/gpu/release/shared:
464457
extends:
465458
- .build_and_test_template
@@ -471,8 +464,8 @@ build/dpcpp/gpu/release/shared:
471464
CXX_FLAGS: "-Wpedantic -ffp-model=precise"
472465
BUILD_SYCL: "ON"
473466
BUILD_TYPE: "Release"
474-
# static builds take too long
475467
BUILD_SHARED_LIBS: "ON"
476468
DPCPP_SINGLE_MODE: "ON"
477469
ONEAPI_DEVICE_SELECTOR: "*:gpu"
478470
BUILD_HWLOC: "OFF"
471+
# This gives two available backends of GPU on tests

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ endif()
443443

444444
# Try to find the third party packages before using our subdirectories
445445
if(GINKGO_BUILD_TESTS)
446-
find_package(GTest 1.10.0) # No need for QUIET as CMake ships FindGTest
446+
find_package(GTest 1.12.0) # No need for QUIET as CMake ships FindGTest
447447
endif()
448448
if(GINKGO_BUILD_BENCHMARKS)
449449
find_package(gflags 2.2.2 QUIET)

0 commit comments

Comments
 (0)