Skip to content

Commit 7d38473

Browse files
jeremyltjeremylt
committed
ci - use consistent GCOV
1 parent de8d243 commit 7d38473

1 file changed

Lines changed: 28 additions & 18 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@ noether-cpu:
6969
interruptible: true
7070
before_script:
7171
# Environment
72-
- export COVERAGE=1 CC=gcc CXX=g++ FC=gfortran
72+
- export COVERAGE=1 CC=gcc CXX=g++ FC=gfortran GCOV=gcov
7373
- export NPROC_POOL=8
7474
- echo "-------------- nproc ---------------" && NPROC_CPU=$(nproc) && NPROC_GPU=$(($(nproc)<8?$(nproc):8)) && echo "NPROC_CPU" $NPROC_CPU && echo "NPROC_GPU" $NPROC_GPU
7575
- echo "-------------- CC ------------------" && $CC --version
7676
- echo "-------------- CXX -----------------" && $CXX --version
7777
- echo "-------------- FC ------------------" && $FC --version
78-
- echo "-------------- GCOV ----------------" && gcov --version
78+
- echo "-------------- GCOV ----------------" && $GCOV --version
79+
- echo "GCOV=$GCOV" > job.env
7980
# Libraries for backends
8081
# -- LIBXSMM 7 April 2024
8182
- cd .. && export XSMM_HASH=94ee71576870152feb62f3f0cf6b061d036dcdb5 && { [[ -d libxsmm-$XSMM_HASH ]] || { curl -L https://github.com/libxsmm/libxsmm/archive/$XSMM_HASH.tar.gz -o xsmm.tar.gz && tar zvxf xsmm.tar.gz && rm xsmm.tar.gz && make -C libxsmm-$XSMM_HASH -j$(nproc); }; } && export XSMM_DIR=$PWD/libxsmm-$XSMM_HASH && cd libCEED
@@ -120,7 +121,8 @@ noether-cpu:
120121
after_script:
121122
- |
122123
if [ -f .SUCCESS ]; then
123-
lcov --directory . --capture --output-file coverage.info --ignore-errors source,mismatch;
124+
source job.env;
125+
lcov --directory . --capture --gcov-tool $GCOV --output-file coverage.info --ignore-errors source,mismatch;
124126
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F interface;
125127
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F gallery;
126128
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F backends;
@@ -177,16 +179,16 @@ noether-rust-qfunctions:
177179
interruptible: true
178180
before_script:
179181
# Environment
180-
- export COVERAGE=1 CC=gcc-14 CXX=g++-14 FC=gfortran-14 NVCC=nvcc CEED_USE_CLANG_CUDA=1
182+
- export COVERAGE=1 CC=gcc-14 CXX=g++-14 FC=gfortran-14 NVCC=nvcc GCOV=gcov-14 CEED_USE_CLANG_CUDA=1
181183
- export NPROC_POOL=1
182184
- echo "-------------- nproc ---------------" && NPROC_CPU=$(nproc) && NPROC_GPU=$(($(nproc)<8?$(nproc):8)) && echo "NPROC_CPU" $NPROC_CPU && echo "NPROC_GPU" $NPROC_GPU
183185
- echo "-------------- CC ------------------" && $CC --version
184186
- echo "-------------- CXX -----------------" && $CXX --version
185187
- echo "-------------- FC ------------------" && $FC --version
186188
- echo "-------------- NVCC ----------------" && $NVCC --version
187189
- echo "-------------- Rustc ---------------" && rustc --version
188-
- echo "-------------- Clang++ -------------" && clang++ --version
189-
- echo "-------------- GCOV ----------------" && gcov-14 --version
190+
- echo "-------------- GCOV ----------------" && $GCOV --version
191+
- echo "GCOV=$GCOV" > job.env
190192
script:
191193
- rm -f .SUCCESS
192194
# Rustup
@@ -208,7 +210,8 @@ noether-rust-qfunctions:
208210
after_script:
209211
- |
210212
if [ -f .SUCCESS ]; then
211-
lcov --directory . --capture --output-file coverage.info --ignore-errors source,mismatch;
213+
source job.env;
214+
lcov --directory . --capture --gcov-tool $GCOV --output-file coverage.info --ignore-errors source,mismatch;
212215
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F interface;
213216
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F gallery;
214217
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F backends;
@@ -230,14 +233,15 @@ noether-cuda:
230233
interruptible: true
231234
before_script:
232235
# Environment
233-
- export COVERAGE=1 CC=gcc-14 CXX=g++-14 FC=gfortran-14 NVCC=nvcc
236+
- export COVERAGE=1 CC=gcc-14 CXX=g++-14 FC=gfortran-14 NVCC=nvcc GCOV=gcov-14
234237
- export NPROC_POOL=4
235238
- echo "-------------- nproc ---------------" && NPROC_CPU=$(nproc) && NPROC_GPU=$(($(nproc)<8?$(nproc):8)) && echo "NPROC_CPU" $NPROC_CPU && echo "NPROC_GPU" $NPROC_GPU
236239
- echo "-------------- CC ------------------" && $CC --version
237240
- echo "-------------- CXX -----------------" && $CXX --version
238241
- echo "-------------- FC ------------------" && $FC --version
239242
- echo "-------------- NVCC ----------------" && $NVCC --version
240-
- echo "-------------- GCOV ----------------" && gcov-14 --version
243+
- echo "-------------- GCOV ----------------" && $GCOV --version
244+
- echo "GCOV=$GCOV" > job.env
241245
# ASAN
242246
- echo "-------------- ASAN ----------------"
243247
- export ASAN=1 AFLAGS="-fsanitize=address -fsanitize=leak" ASAN_OPTIONS=protect_shadow_gap=0
@@ -290,7 +294,8 @@ noether-cuda:
290294
after_script:
291295
- |
292296
if [ -f .SUCCESS ]; then
293-
lcov --directory . --capture --output-file coverage.info --ignore-errors source,mismatch;
297+
source job.env;
298+
lcov --directory . --capture --gcov-tool $GCOV --output-file coverage.info --ignore-errors source,mismatch;
294299
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F interface;
295300
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F gallery;
296301
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F backends;
@@ -317,14 +322,15 @@ noether-cuda:
317322
# interruptible: true
318323
# before_script:
319324
# # Environment
320-
# - export COVERAGE=1 CC=gcc CXX=g++ FC=gfortran HIPCC=hipcc
325+
# - export COVERAGE=1 CC=gcc CXX=g++ FC=gfortran HIPCC=hipcc GCOV=gcov
321326
# - export NPROC_POOL=4
322327
# - echo "-------------- nproc ---------------" && NPROC_CPU=$(nproc) && NPROC_GPU=$(($(nproc)<8?$(nproc):8)) && echo "NPROC_CPU" $NPROC_CPU && echo "NPROC_GPU" $NPROC_GPU
323328
# - echo "-------------- CC ------------------" && $CC --version
324329
# - echo "-------------- CXX -----------------" && $CXX --version
325330
# - echo "-------------- FC ------------------" && $FC --version
326331
# - echo "-------------- HIPCC ---------------" && $HIPCC --version
327-
# - echo "-------------- GCOV ----------------" && gcov --version
332+
# - echo "-------------- GCOV ----------------" && $GCOV --version
333+
# - echo "GCOV=$GCOV" > job.env
328334
# # Libraries for backends
329335
# # -- MAGMA from dev branch
330336
# - echo "-------------- MAGMA ---------------"
@@ -357,7 +363,8 @@ noether-cuda:
357363
# after_script:
358364
# - |
359365
# if [ -f .SUCCESS ]; then
360-
# lcov --directory . --capture --output-file coverage.info --ignore-errors source,mismatch;
366+
# source job.env;
367+
# lcov --directory . --capture --gcov-tool $GCOV --output-file coverage.info --ignore-errors source,mismatch;
361368
# bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F interface;
362369
# bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F gallery;
363370
# bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F backends;
@@ -379,14 +386,15 @@ noether-rocm:
379386
interruptible: true
380387
before_script:
381388
# Environment
382-
- export COVERAGE=1 CC=gcc CXX=g++ FC=gfortran HIPCC=hipcc
389+
- export COVERAGE=1 CC=gcc CXX=g++ FC=gfortran HIPCC=hipcc GCOV=gcov
383390
- export NPROC_POOL=4
384391
- echo "-------------- nproc ---------------" && NPROC_CPU=$(nproc) && NPROC_GPU=$(($(nproc)<8?$(nproc):8)) && echo "NPROC_CPU" $NPROC_CPU && echo "NPROC_GPU" $NPROC_GPU
385392
- echo "-------------- CC ------------------" && $CC --version
386393
- echo "-------------- CXX -----------------" && $CXX --version
387394
- echo "-------------- FC ------------------" && $FC --version
388395
- echo "-------------- HIPCC ---------------" && $HIPCC --version
389-
- echo "-------------- GCOV ----------------" && gcov --version
396+
- echo "-------------- GCOV ----------------" && $GCOV --version
397+
- echo "GCOV=$GCOV" > job.env
390398
# Libraries for backends
391399
# -- MAGMA from dev branch
392400
- echo "-------------- MAGMA ---------------"
@@ -418,13 +426,14 @@ noether-float:
418426
interruptible: true
419427
before_script:
420428
# Environment
421-
- export COVERAGE=1 CC=gcc-14 CXX=g++-14 FC= NVCC=nvcc
429+
- export COVERAGE=1 CC=gcc-14 CXX=g++-14 FC= NVCC=nvcc GCOV=gcov-14
422430
- export NPROC_POOL=8
423431
- echo "-------------- nproc ---------------" && NPROC_CPU=$(nproc) && NPROC_GPU=$(($(nproc)<8?$(nproc):8)) && echo "NPROC_CPU" $NPROC_CPU && echo "NPROC_GPU" $NPROC_GPU
424432
- echo "-------------- CC ------------------" && $CC --version
425433
- echo "-------------- CXX -----------------" && $CXX --version
426434
- echo "-------------- NVCC ----------------" && $NVCC --version
427-
- echo "-------------- GCOV ----------------" && gcov-14 --version
435+
- echo "-------------- GCOV ----------------" && $GCOV --version
436+
- echo "GCOV=$GCOV" > job.env
428437
# Libraries for backends
429438
# ROCm tests currently disabled
430439
# -- MAGMA from dev branch
@@ -459,7 +468,8 @@ noether-float:
459468
after_script:
460469
- |
461470
if [ $(cat .job_status) == "SUCCESS" ]; then
462-
lcov --directory . --capture --output-file coverage.info --ignore-errors source,mismatch;
471+
source job.env;
472+
lcov --directory . --capture --gcov-tool $GCOV --output-file coverage.info --ignore-errors source,mismatch;
463473
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F interface;
464474
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F gallery;
465475
bash <(curl -s https://codecov.io/bash) -f coverage.info -t ${CODECOV_ACCESS_TOKEN} -F backends;

0 commit comments

Comments
 (0)