Merge pull request 'Build GPU within the CI Jobs + a few small changes.' (#56)...

Merge pull request 'Build GPU within the CI Jobs + a few small changes.' (#56) from peters/VirtualFluids_dev:develop into develop

Reviewed-on: https://git.irmb.bau.tu-bs.de/VirtualFluids/VirtualFluids_dev/pulls/56

.gitlab-ci.yml

@@ -231,36 +231,45 @@ lizard:
 gcov:
   stage: test
 
-  only: ["schedules"]
-
   before_script:
     - export DEBIAN_FRONTEND=noninteractive
     - apt-get update
     - pip3 install gcovr
     - gcovr --version
+    - apt-get install -y libboost-serialization-dev
+    - cd /tmp
+    - apt-get install unzip
+    - wget https://github.com/NVIDIA/cuda-samples/archive/10.1.2.zip
+    - unzip 10.1.2.zip
+    - export NVCUDASAMPLES_ROOT=$(pwd)/cuda-samples-10.1.2
 
   script:
-    - mkdir $CI_PROJECT_DIR/build
-    - cd $CI_PROJECT_DIR/build
-    - cmake .. -DBUILD_VF_CPU=ON -DBUILD_VF_COVERAGE=ON -DBUILD_VF_UNIT_TESTS=ON
+    - mkdir $CI_PROJECT_DIR/gcov_build
+    - cd $CI_PROJECT_DIR/gcov_build
+    - cmake .. -DBUILD_VF_CPU=ON -DBUILD_VF_GPU=ON -DBUILD_VF_COVERAGE=ON -DBUILD_VF_UNIT_TESTS=ON
     - make -j4
     - ./bin/basicsTests
     - cd ..
     - mkdir coverage
-    - gcovr -r $CI_PROJECT_DIR -k build -f "src" --print-summary --html coverage/coverage.html --html-details --xml coverage/coverage.xml
+    - gcovr -r $CI_PROJECT_DIR -k gcov_build -f "src" --print-summary --html coverage/coverage.html --html-details --xml coverage/coverage.xml
 
   artifacts:
     paths:
       - coverage/
+      - gcov_build/
+
     reports:
       cobertura: coverage/coverage.xml
 
+  cache:
+    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-gcov"
+    paths:
+      - gcov_build/
+
 
 deploy_gcov_to_elladan:
   stage: deploy
 
-  only: ["schedules"]
-
   needs: ["gcov"]
 
   before_script:

CMake/3rd/cuda.cmake

@@ -4,7 +4,7 @@ function(linkCUDA)
     find_path(CUDA_CUT_INCLUDE_DIR
       helper_cuda.h
       PATHS "$ENV{NVCUDASAMPLES_ROOT}" "${NVCUDASAMPLES_ROOT}"
-      PATH_SUFFIXES "common/inc"
+      PATH_SUFFIXES "common/inc" "Common"
       DOC "Location of helper_cuda.h"
       NO_DEFAULT_PATH
     )

CMake/CMakeSetCompilerFlags.cmake

@@ -20,7 +20,7 @@ macro(loadMachineFile)
     SET(CMAKE_CONFIG_FILE "${VF_CMAKE_DIR}/cmake_config_files/${CAB_MACHINE}.config.cmake")
 
     IF(NOT EXISTS ${CMAKE_CONFIG_FILE})
-        status("No configuration file found.")
+        status("No configuration file found for machine: ${CAB_MACHINE}.")
     ELSE()
         status("Load configuration file ${CAB_MACHINE}.config.cmake")
         include(${CMAKE_CONFIG_FILE})

apps/gpu/LBM/DrivenCavity/CMakeLists.txt

@@ -4,4 +4,6 @@ PROJECT(DrivenCavity)
 
 vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluids_GPU basics GridGenerator FILES DrivenCavity.cpp )
 
+set_source_files_properties(DrivenCavity.cpp PROPERTIES LANGUAGE CUDA)
+
 linkCUDA()

apps/gpu/LBM/TGV_3D/CMakeLists.txt

@@ -2,4 +2,6 @@ PROJECT(TGV_3D)
 
 vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES TGV_3D.cpp)
 
+set_source_files_properties(TGV_3D.cpp PROPERTIES LANGUAGE CUDA)
+
 linkCUDA()

apps/gpu/LBM/TGV_3D_MultiGPU/CMakeLists.txt

@@ -2,4 +2,6 @@ PROJECT(TGV_3D_MultiGPU)
 
 vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES TGV_3D_MultiGPU.cpp)
 
+set_source_files_properties(TGV_3D_MultiGPU.cpp PROPERTIES LANGUAGE CUDA)
+
 linkCUDA()

apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt

@@ -2,4 +2,6 @@ PROJECT(GridGeneratorTest)
 
 vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES gridGenerator.cpp)
 
+set_source_files_properties(gridGenerator.cpp PROPERTIES LANGUAGE CUDA)
+
 linkCUDA()

cpu.cmake

@@ -82,11 +82,11 @@ endif()
 
 
 add_subdirectory(${VF_THIRD_DIR}/MuParser)
-add_subdirectory(${VF_THIRD_DIR}/pybind11/pybind11-2.5.0)
 
 add_subdirectory(src/cpu/VirtualFluidsCore)
 
 if(BUILD_VF_PYTHON_BINDINGS)
+    add_subdirectory(${VF_THIRD_DIR}/pybind11/pybind11-2.5.0)
     add_subdirectory(src/cpu/simulationconfig)
     add_subdirectory(src/cpu/pythonbindings)
 endif()