Merge branch 'Bugfix/CMakeAndCI' into 'open_source'

Remove boost dependency from cmake, supress cuda warnings in gridgenerator and...

See merge request irmb/VirtualFluids_dev!53

.gitlab-ci.yml

@@ -93,7 +93,7 @@ msvc_16:
     - cd $CI_PROJECT_DIR
     - md -force $env:BUILD_FOLDER
     - cd $env:BUILD_FOLDER
-    - cmake .. --preset=all_msvc -DBUILD_WARNINGS_AS_ERRORS=ON
+    - cmake .. --preset=all_msvc -DCMAKE_CUDA_ARCHITECTURES=61 -DBUILD_WARNINGS_AS_ERRORS=ON
     - MSBuild.exe VirtualFluids.sln /property:Configuration=$env:BUILD_CONFIGURATION /verbosity:minimal /maxcpucount:4
 
   cache:

src/gpu/GridGenerator/CMakeLists.txt

@@ -12,19 +12,5 @@ if (NOT BUILD_SHARED_LIBRARY)
     set_target_properties(${library_name} PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS ON)
 endif()
 
-# suppress warning 3123, 3126: calling a __host__ function from __host__ __device__ is not allowed
-# suppress warning 3152: __host__ function redeclared with __host__ __device__, hence treated as a __host__ __device__ function
-# suppress warning 3125, 3127: calling a constexpr __host__ function from a __host__ __device__ function
-set(cuda_warnings_suppressions "--diag_suppress=3123 --diag_suppress=3126 --diag_suppress=3152 --diag_suppress=3125 --diag_suppress=3127")
-
-# suppress warning 3311: unrecognized #pragma in device code
-if(NOT MSVC)
-    set(cuda_warnings_suppressions "${cuda_warnings_suppressions} --diag_suppress=3311")
-endif()
-
-# suppress warning 2979: calling a __host__ function from __host__ __device__ is not allowed
-if(MSVC)
-    set(cuda_warnings_suppressions "${cuda_warnings_suppressions} --diag_suppress=2979 --diag_suppress=2976 --diag_suppress=3005 --diag_suppress=2978 --diag_suppress=3009")
-endif()
-
-target_compile_options(${library_name} PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe ${cuda_warnings_suppressions} >)
+# we want to suppress all cuda warnings so far for this library.
+target_compile_options(${library_name} PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe "-w" >)
\ No newline at end of file

src/gpu/VirtualFluids_GPU/CMakeLists.txt

@@ -7,8 +7,6 @@ endif()
 
 vf_add_library(PRIVATE_LINK ${additional_libraries} GridGenerator basics MPI::MPI_CXX)
 
-linkBoost(COMPONENTS "serialization")
-
 #SET(TPN_WIN32 "/EHsc")
 #https://stackoverflow.com/questions/6832666/lnk2019-when-including-asio-headers-solution-generated-with-cmake
 #https://stackoverflow.com/questions/27442885/syntax-error-with-stdnumeric-limitsmax