From 1fd6c0c69c36ba22b073024447a163e1858fcb4a Mon Sep 17 00:00:00 2001
From: Giovanni La Mura <giovanni.lamura@inaf.it>
Date: Thu, 11 Jul 2024 18:10:54 +0000
Subject: [PATCH] Disable OpenMP in non-gnu compatibility tests and skip
documentation in pipeline
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78d10e7e..a261c6ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ compatibility_stage:
- mkdir build_clang16
- cd build_clang16
- cp -r ../build/* .
- - CXX=clang++-16 F77=flang-new-16 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/13"
+ - CXX=clang++-16 F77=flang-new-16 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp
- make clean
- make -j
- echo "Running make with flang version 17 and clang version 17..."
@@ -88,7 +88,7 @@ compatibility_stage:
- mkdir build_clang17
- cd build_clang17
- cp -r ../build/* .
- - CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13"
+ - CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp
- make clean
- make -j
- echo "Running make with Intel ifort and Intel icpx..."
@@ -96,7 +96,7 @@ compatibility_stage:
- mkdir build_ifort_icpx
- cd build_ifort_icpx
- cp -r ../build/* .
- - LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/2024.2/lib PATH=/opt/intel/oneapi/compiler/2024.2/bin:$PATH CXX=icpx F77=ifort ./configure --with-fflags="-O3 -diag-disable=10448"
+ - LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/2024.2/lib PATH=/opt/intel/oneapi/compiler/2024.2/bin:$PATH CXX=icpx F77=ifort ./configure --with-fflags="-O3 -diag-disable=10448" --disable-openmp
- make clean
- make -j
- echo "Running make with Intel ifx and Intel icpx..."
@@ -104,7 +104,7 @@ compatibility_stage:
- mkdir build_ifx_icpx
- cd build_ifx_icpx
- cp -r ../build/* .
- - LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/2024.2/lib PATH=/opt/intel/oneapi/compiler/2024.2/bin:$PATH CXX=icpx F77=ifx ./configure --with-fflags="-O3"
+ - LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/2024.2/lib PATH=/opt/intel/oneapi/compiler/2024.2/bin:$PATH CXX=icpx F77=ifx ./configure --with-fflags="-O3" --disable-openmp
- make clean
- make -j
#- echo "Running make with default MPI compilers"
@@ -121,7 +121,7 @@ building_stage:
- build/testing/*
- build/trapping/*
- build/libnptm/*
- - doc/build/*
+ #- doc/build/*
exclude:
- ".git*"
- ".git/**/*"
@@ -140,8 +140,8 @@ building_stage:
- make clean
- echo "Building default configuration..."
- make -j
- - echo "Building documentation..."
- - make docs -j && make -C ../doc/build/latex -j
+ #- echo "Building documentation..."
+ #- make docs -j && make -C ../doc/build/latex -j
running_stage:
stage: run
--
GitLab