Merge branch 'gitlab_ci' into develop

Add Gitlab CI pipeline to OpDiLib.

Author: jblueh

.gitlab-ci.yml

@@ -0,0 +1,41 @@
+default:
+  tags:
+    - docker
+
+test-gcc-macro:
+  image: ubuntu:22.04
+  timeout: 2h
+  script:
+    - apt update && apt install -y build-essential binutils git
+    - git clone --depth 1 --branch develop https://github.com/SciCompKL/CoDiPack.git
+    - export CODI_DIR=$(pwd)/CoDiPack/include
+    - export OPDI_DIR=$(pwd)/include
+    - cd tests
+    - export CXX=g++
+    - make all
+
+test-clang-macro:
+  image: fedora:39
+  timeout: 2h
+  script:
+    - dnf install -y diffutils binutils clang git
+    - git clone --depth 1 --branch develop https://github.com/SciCompKL/CoDiPack.git
+    - export CODI_DIR=$(pwd)/CoDiPack/include
+    - export OPDI_DIR=$(pwd)/include
+    - cd tests
+    - export CXX=clang++
+    - make all
+
+test-clang-ompt:
+  image: fedora:39
+  timeout: 2h
+  script:
+    - dnf install -y diffutils binutils clang git
+    - git clone --depth 1 --branch develop https://github.com/SciCompKL/CoDiPack.git
+    - export CODI_DIR=$(pwd)/CoDiPack/include
+    - export OPDI_DIR=$(pwd)/include
+    - cd tests
+    - export CXX=clang++
+    - export BACKEND=OMPT
+    - make all
+

include/opdi/backend/macro/reductionTools.hpp

@@ -57,13 +57,9 @@ namespace opdi {
         }
         ReductionTools::reductionBarrierStack.pop();
         if (ProbeScopeStatus::insideImplicitTaskProbeScope()) {
-          #if defined(__GNUC__) && !defined(__clang__)
-            opdi_set_lock(&globalReducerLock);
-            opdi_unset_lock(&globalReducerLock);
-          #else
-            logic->onSyncRegion(LogicInterface::SyncRegionKind::BarrierImplementation,
-                                LogicInterface::ScopeEndpoint::End);
-          #endif
+          #pragma omp barrier
+          logic->onSyncRegion(LogicInterface::SyncRegionKind::BarrierImplementation,
+                              LogicInterface::ScopeEndpoint::End);
         }
       }
 

tests/Makefile

@@ -148,10 +148,14 @@ link:
 $(patsubst %,run%,$(DRIVERS)): DRIVER_TESTS = $(call getDriverTests, $(subst run,,$@))
 $(patsubst %,run%,$(DRIVERS)): DRIVER = $(subst run,,$@)
 $(patsubst %,run%,$(DRIVERS)):
-	@ for test in ${DRIVER_TESTS}; \
+	@rm -f testresults; \
+	for test in ${DRIVER_TESTS}; \
 	do \
 		bash run.sh ${DRIVER} $$test $(MODE) $(EXPLICIT_PREPROCESSOR); \
-	done;
+	done; \
+	if grep -q 1 testresults; then \
+		exit 1; \
+	fi;
 
 # execute all tests
 .PHONY: run
@@ -169,3 +173,4 @@ clean:
 	rm -r -f build
 	rm -f tempmakefile
 	rm -f results/*.out
+	rm -f testresults

tests/run.sh

@@ -37,14 +37,23 @@ fi
 
 case "$MODE" in
 	"RUN")
-		./$BUILD_DIR/$LAUNCH_NAME 1> $RESULT_DIR/$DRIVER$TEST.out
-		if cmp -s $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
+		timeout 5m ./$BUILD_DIR/$LAUNCH_NAME 1> $RESULT_DIR/$DRIVER$TEST.out;
+		ret=$?
+		if [[ $ret -ne 0 ]];
 		then
-			echo -e $DRIVER$TEST "\e[0;32mOK\e[0m";
+		  echo -e $DRIVER$TEST "\e[0;31mTIMEOUT\e[0m";
+			echo "1" >> testresults;
 		else
-			echo -e $DRIVER$TEST "\e[0;31mFAILED\e[0m";
-			diff $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
-		fi;
+		  if cmp -s $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
+		  then
+			  echo -e $DRIVER$TEST "\e[0;32mOK\e[0m";
+			  echo "0" >> testresults;
+		  else
+			  echo -e $DRIVER$TEST "\e[0;31mFAILED\e[0m";
+			  diff $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
+			  echo "1" >> testresults;
+		  fi;
+	  fi;
 		;;
 	"REF")
 		./$BUILD_DIR/$LAUNCH_NAME > $RESULT_DIR/$DRIVER$TEST.ref