Merge branch 'feature/cmake_presets' into 'develop'

Feature/cmake presets

See merge request irmb/VirtualFluids_dev!10

.gitlab-ci.yml

@@ -43,8 +43,7 @@ stages:
     - mkdir -p $CI_PROJECT_DIR/$BUILD_FOLDER
     - cd $CI_PROJECT_DIR/$BUILD_FOLDER
     - cmake ..
-      -DBUILD_VF_CPU=ON
-      -DBUILD_VF_GPU=ON
+      --preset=all_make
       -DCMAKE_CUDA_ARCHITECTURES=60
     - cmake . -LAH
     - make -j4
@@ -86,12 +85,8 @@ gcc_9_rebuild:
     - cd $CI_PROJECT_DIR/build
     - rm -r -f ./*
     - cmake ..
-      -DBUILD_VF_CPU=ON
-      -DBUILD_VF_GPU=ON
+      --preset=all_make_ccache
       -DCMAKE_CUDA_ARCHITECTURES=60
-      -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-      -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache
-      -DCMAKE_C_COMPILER_LAUNCHER=ccache
     - make -j4  2>&1 | tee gcc_warnings.txt
     - ccache -s
 
@@ -113,12 +108,8 @@ msvc_16:
     - gpu
 
   variables:
-    CMAKE_GENERATOR: "Visual Studio 16 2019"
     BUILD_CONFIGURATION: "Release"
     BUILD_FOLDER: "build"
-    BUILD_VF_CPU: "ON"
-    BUILD_VF_GPU: "ON"
-    BUILD_VF_UNIT_TESTS: "ON"
 
   # add cmake and MSBuild.exe to the path.
   # This Needs to be adapted when moved to a new build machine.
@@ -133,7 +124,7 @@ msvc_16:
     - cd $CI_PROJECT_DIR
     - md -force $env:BUILD_FOLDER
     - cd $env:BUILD_FOLDER
-    - cmake .. -DBUILD_VF_CPU=$env:BUILD_VF_CPU -DBUILD_VF_GPU=$env:BUILD_VF_GPU -DBUILD_VF_UNIT_TESTS=$env:BUILD_VF_UNIT_TESTS -G "$env:CMAKE_GENERATOR" ..
+    - cmake .. --preset=all_msvc
     - MSBuild.exe VirtualFluids.sln /property:Configuration=$env:BUILD_CONFIGURATION /verbosity:minimal /maxcpucount:4
 
   cache:
@@ -275,15 +266,9 @@ gpu_numerical_tests:
     - cd $CI_PROJECT_DIR/build
     - rm -r -f ./*
     - cmake ..
-      -DBUILD_VF_CPU=OFF
-      -DBUILD_VF_GPU=ON
+      --preset=gpu_numerical_tests_ccache_make
       -DCMAKE_CUDA_ARCHITECTURES=60
-      -DBUILD_VF_DOUBLE_ACCURACY=ON
-      -DBUILD_NUMERIC_TESTS=ON
       -DPATH_NUMERICAL_TESTS=/tmp/test_data/numerical_tests_gpu
-      -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-      -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache
-      -DCMAKE_C_COMPILER_LAUNCHER=ccache
     - make -j4
     - ccache -s
 
@@ -439,11 +424,9 @@ gcov_gcc_9:
     - mkdir -p $CI_PROJECT_DIR/build
     - cd $CI_PROJECT_DIR/build
     - cmake ..
-      -DBUILD_VF_CPU=ON
-      -DBUILD_VF_GPU=ON
+      --preset=all_make
       -DCMAKE_CUDA_ARCHITECTURES=60
       -DBUILD_VF_COVERAGE=ON
-      -DBUILD_VF_UNIT_TESTS=ON
     - make -j4
     - ./bin/basicsTests
     - cd ..
@@ -533,7 +516,6 @@ vf_to_phoenix:
           - y0054816
 
 ###############################################################################
-
 vf_wheel_to_jupyterhub:
   extends: .deploy_template
   stage: deploy
@@ -551,37 +533,6 @@ vf_wheel_to_jupyterhub:
   script:
     - ansible-playbook -i ansible/hosts.cfg -u $REMOTE_USER ansible/playbook_jupyter_update.yml
 
-###############################################################################
-
-cppcheck_to_elladan:
-  extends: .deploy_template
-  stage: deploy
-  needs: ["cppcheck"]
-
-  when: manual
-
-  variables:
-    SSH_KEY: "$SSH_PRIVATE_KEY_ELLADAN"
-    HOST: "elladan.irmb.bau.tu-bs.de"
-
-  script:
-    - ansible-playbook -i ansible/hosts.cfg -u public_pages ansible/playbook_cppcheck.yml
-
-###############################################################################
-gcov_to_elladan:
-  extends: .deploy_template
-  stage: deploy
-  needs: ["gcov_gcc_9"]
-
-  when: manual
-
-  variables:
-    SSH_KEY: "$SSH_PRIVATE_KEY_ELLADAN"
-    HOST: "elladan.irmb.bau.tu-bs.de"
-
-  script:
-    - ansible-playbook -i ansible/hosts.cfg -u public_pages ansible/playbook_gcov.yml
-
 ###############################################################################
 # sonar-scanner runs sonar-project.properties
 # the reports in this file needs to match the artifacts.
@@ -592,8 +543,8 @@ sonar-scanner:
     - linux
 
   only:
-    - develop
-    #- develop@irmb/VirtualFluids_dev
+    #- develop
+    - develop@irmb/VirtualFluids_dev
 
   variables:
     SONAR_HOST_URL: "http://gitlab-runner01.irmb.bau.tu-bs.de/sonarqube/"

CMakePresets.json

+{
+  "version": 1,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 19,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "default",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/build/",
+      "cacheVariables": {
+        "BUILD_VF_UNIT_TESTS": "ON"
+      }
+    },
+    {
+      "name": "default_make",
+      "inherits": "default",
+      "hidden": true,
+      "generator": "Unix Makefiles"
+    },
+    {
+      "name": "default_ccache_make",
+      "inherits": "default_make",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+        "CMAKE_CUDA_COMPILER_LAUNCHER": "ccache",
+        "CMAKE_C_COMPILER_LAUNCHER": "ccache"
+      }
+    },
+    {
+      "name": "default_msvc",
+      "inherits": "default",
+      "hidden": true,
+      "generator": "Visual Studio 16 2019",
+      "architecture": "x64"
+    },
+    {
+      "name": "default_cpu",
+      "hidden": true,
+      "description": "CPU build of VirtualFluids",
+      "cacheVariables": {
+        "BUILD_VF_CPU": "ON"
+      }
+    },
+    {
+      "name": "default_gpu",
+      "hidden": true,
+      "description": "GPU build of VirtualFluids",
+      "cacheVariables": {
+        "BUILD_VF_GPU": "ON"
+      }
+    },
+    {
+      "name": "default_gpu_numerical_tests",
+      "inherits": ["default_gpu"],
+      "hidden": true,
+      "description": "GPU numerical tests of VirtualFluids",
+      "cacheVariables": {
+        "BUILD_VF_DOUBLE_ACCURACY": "ON",
+        "BUILD_NUMERIC_TESTS": "ON"
+      }
+    },
+    {
+      "name": "default_all",
+      "hidden": true,
+      "description": "All build of VirtualFluids",
+      "inherits": ["default_cpu", "default_gpu"]
+    },
+    {
+      "name": "cpu_make",
+      "inherits": ["default_make", "default_cpu"],
+      "displayName": "cpu make configuration"
+    },
+    {
+      "name": "cpu_make_ccache",
+      "inherits": ["default_ccache_make", "default_cpu"],
+      "displayName": "cpu ccache make configuration"
+    },
+    {
+      "name": "cpu_msvc",
+      "inherits": ["default_msvc", "default_cpu"],
+      "displayName": "cpu msvc configuration"
+    },
+    {
+      "name": "gpu_make",
+      "inherits": ["default_make", "default_gpu"],
+      "displayName": "gpu make configuration"
+    },
+    {
+      "name": "gpu_make_ccache",
+      "inherits": ["default_ccache_make", "default_gpu"],
+      "displayName": "gpu ccache make configuration"
+    },
+    {
+      "name": "gpu_msvc",
+      "inherits": ["default_msvc", "default_gpu"],
+      "displayName": "gpu msvc configuration"
+    },
+    {
+      "name": "all_make",
+      "inherits": ["default_make", "default_all"],
+      "displayName": "all make configuration"
+    },
+    {
+      "name": "all_make_ccache",
+      "inherits": ["default_ccache_make", "default_all"],
+      "displayName": "all ccache make configuration"
+    },
+    {
+      "name": "all_msvc",
+      "inherits": ["default_msvc", "default_all"],
+      "displayName": "all msvc configuration"
+    },
+    {
+      "name": "gpu_numerical_tests_make",
+      "inherits": ["default_make", "default_gpu_numerical_tests"],
+      "displayName": "gpu numerical tests make configuration"
+    },
+    {
+      "name": "gpu_numerical_tests_ccache_make",
+      "inherits": ["default_ccache_make", "default_gpu_numerical_tests"],
+      "displayName": "gpu numerical tests ccache make configuration"
+    },
+    {
+      "name": "gpu_numerical_tests_msvc",
+      "inherits": ["default_msvc", "default_gpu_numerical_tests"],
+      "displayName": "gpu numerical tests msvc configuration"
+    }
+  ]
+}