Merge branch 'bauerd/fix-ci' into 'main'

Adapt integration tests and CI to HyTeG's new CMake configuration

See merge request !38

.gitlab-ci.yml

@@ -69,8 +69,8 @@ operator-generation:
       -DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS
       -DWARNING_ERROR=$WARNING_ERROR
       -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY
-      -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI
-      -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP
+      -DHYTEG_BUILD_WITH_MPI=$HYTEG_BUILD_WITH_MPI
+      -DHYTEG_BUILD_WITH_OPENMP=$HYTEG_BUILD_WITH_OPENMP
       -DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS
       -DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS
       -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
@@ -84,16 +84,16 @@ operator-generation:
       -DHYTEG_BUILD_WITH_MPFR=$HYTEG_BUILD_WITH_MPFR
       -DWALBERLA_SANITIZE_ADDRESS=$WALBERLA_SANITIZE_ADDRESS
       -DWALBERLA_SANITIZE_UNDEFINED=$WALBERLA_SANITIZE_UNDEFINED
-      -DWALBERLA_OPTIMIZE_FOR_LOCALHOST=$WALBERLA_OPTIMIZE_FOR_LOCALHOST
       -DWALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT=$WALBERLA_BUILD_WITH_HALF_PRECISION_SUPPORT
     - ninja -j $MAX_BUILD_CORES -l $NUM_CORES src/all
 
     # run tests
     - ctest --test-dir src -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j NUM_CORES
   variables:
+    CMAKE_CXX_FLAGS: "-march=native"
     CTEST_EXCLUDE_LABELS: "longrun"
-    WALBERLA_BUILD_WITH_MPI: "ON"
-    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    HYTEG_BUILD_WITH_MPI: "ON"
+    HYTEG_BUILD_WITH_OPENMP: "OFF"
     OMP_NUM_THREADS: "4"
     OMP_WAIT_POLICY: "PASSIVE"
     CMAKE_BUILD_TYPE: "Release"
@@ -108,7 +108,6 @@ operator-generation:
     WALBERLA_DOUBLE_ACCURACY: "ON"
     WALBERLA_BUILD_WITH_METIS: "ON"
     WALBERLA_BUILD_WITH_PARMETIS: "ON"
-    WALBERLA_OPTIMIZE_FOR_LOCALHOST: "ON"
     WARNING_ERROR: "OFF"
 
 deterministic:

hyteg_integration_tests/CMakeLists.txt

@@ -4,13 +4,12 @@ project(hyteg_integration_tests)
 add_compile_options( "-Wno-unused-variable" )
 
 list(APPEND WALBERLA_MODULE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/hyteg/src" "${CMAKE_CURRENT_SOURCE_DIR}/hyteg/tests")
-add_subdirectory(hyteg)
-waLBerla_import()
+add_subdirectory(hyteg SYSTEM)
 
 # add a convenience interface target to link against
 add_library(hyteg::hyteg INTERFACE IMPORTED)
 set_target_properties(hyteg::hyteg PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/hyteg/src"
+  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/hyteg/src;${EIGEN_DIR}"
   INTERFACE_LINK_DIRECTORIES "${hyteg_LIBRARY_DIR}"
   INTERFACE_LINK_LIBRARIES hyteg
 )