CMake: Improve encapsulation

Author: jngrad

CMakeLists.txt

@@ -511,7 +511,7 @@ if(ESPRESSO_BUILD_WITH_SHARED_MEMORY_PARALLELISM)
     FetchContent_Declare(
       kokkos
       GIT_REPOSITORY https://github.com/kokkos/kokkos.git
-      GIT_TAG        4.3.00
+      GIT_TAG        b4f7c84 # version 4.6.1 with patches
       OVERRIDE_FIND_PACKAGE
     )
     # cmake-format: on
@@ -530,25 +530,6 @@ if(ESPRESSO_BUILD_WITH_SHARED_MEMORY_PARALLELISM)
       endif()
     endforeach()
   endif()
-  if(ESPRESSO_BUILD_WITH_CLANG_TIDY)
-    set(KOKKOS_CXX_CLANG_TIDY "${ESPRESSO_CXX_CLANG_TIDY}")
-    set(SKIP_CLANG_TIDY_CHECKS "")
-    set(SKIP_CLANG_TIDY_CHECKS_CXX "")
-    # silence heFFTe diagnostics
-    list(APPEND SKIP_CLANG_TIDY_CHECKS "-modernize-*")
-    list(APPEND SKIP_CLANG_TIDY_CHECKS "-readability-*")
-    list(APPEND SKIP_CLANG_TIDY_CHECKS "-clang-diagnostic-float-conversion")
-    list(APPEND SKIP_CLANG_TIDY_CHECKS
-         "-clang-diagnostic-implicit-int-float-conversion")
-    list(APPEND SKIP_CLANG_TIDY_CHECKS
-         "-bugprone-return-const-ref-from-parameter")
-    list(APPEND SKIP_CLANG_TIDY_CHECKS "-bugprone-narrowing-conversions")
-    list(APPEND SKIP_CLANG_TIDY_CHECKS "-bugprone-sizeof-expression")
-    list(APPEND SKIP_CLANG_TIDY_CHECKS "-bugprone-fold-init-type")
-    espresso_override_clang_tidy_checks(
-      KOKKOS_CXX_CLANG_TIDY "${SKIP_CLANG_TIDY_CHECKS}"
-      "${SKIP_CLANG_TIDY_CHECKS_CXX}")
-  endif()
 
   if(NOT EXISTS ${FETCHCONTENT_BASE_DIR}/cabana-src)
     find_package(Cabana 0.7.0 QUIET)
@@ -559,11 +540,38 @@ if(ESPRESSO_BUILD_WITH_SHARED_MEMORY_PARALLELISM)
       cabana
       GIT_REPOSITORY https://github.com/ECP-copa/Cabana.git
       GIT_TAG        6647fed3 # 0.7.0 with patches
+      PATCH_COMMAND  patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cabana.patch
     )
     # cmake-format: on
     set(Cabana_REQUIRE_HEFFTE ${ESPRESSO_BUILD_WITH_FFTW} CACHE BOOL "")
     FetchContent_MakeAvailable(cabana)
   endif()
+
+  if(ESPRESSO_BUILD_WITH_CLANG_TIDY)
+    # silence Kokkos and Cabana diagnostics
+    set(CABANA_CXX_CLANG_TIDY "${ESPRESSO_CXX_CLANG_TIDY}")
+    set(CABANA_CUDA_CLANG_TIDY "${ESPRESSO_CUDA_CLANG_TIDY}")
+    unset(SKIP_CLANG_TIDY_CHECKS)
+    unset(SKIP_CLANG_TIDY_CHECKS_CXX)
+    unset(SKIP_CLANG_TIDY_CHECKS_CUDA)
+    list(APPEND SKIP_CLANG_TIDY_CHECKS "-modernize-*")
+    list(APPEND SKIP_CLANG_TIDY_CHECKS "-readability-*")
+    list(APPEND SKIP_CLANG_TIDY_CHECKS "-clang-diagnostic-float-conversion")
+    list(APPEND SKIP_CLANG_TIDY_CHECKS
+         "-clang-diagnostic-implicit-int-float-conversion")
+    list(APPEND SKIP_CLANG_TIDY_CHECKS
+         "-bugprone-return-const-ref-from-parameter")
+    list(APPEND SKIP_CLANG_TIDY_CHECKS "-bugprone-narrowing-conversions")
+    list(APPEND SKIP_CLANG_TIDY_CHECKS "-bugprone-sizeof-expression")
+    list(APPEND SKIP_CLANG_TIDY_CHECKS "-bugprone-fold-init-type")
+    list(APPEND SKIP_CLANG_TIDY_CHECKS_CUDA "-bugprone-branch-clone")
+    espresso_override_clang_tidy_checks(
+      CABANA_CXX_CLANG_TIDY "${SKIP_CLANG_TIDY_CHECKS}"
+      "${SKIP_CLANG_TIDY_CHECKS_CXX}")
+    espresso_override_clang_tidy_checks(
+      CABANA_CUDA_CLANG_TIDY "${SKIP_CLANG_TIDY_CHECKS}"
+      "${SKIP_CLANG_TIDY_CHECKS_CUDA}")
+  endif()
 endif()
 
 # We need the parallel hdf5 version!

cmake/cabana.patch

@@ -1,16 +1,6 @@
-https://github.com/ECP-copa/Cabana/pull/815
 --- CMakeLists.txt
 +++ CMakeLists.txt
-@@ -216,12 +216,6 @@
-   enable_testing()
+@@ -56,3 +56,2 @@ endforeach()
+ if(Kokkos_ENABLE_CUDA)
+-  kokkos_check(OPTIONS CUDA_LAMBDA)
  endif()
- 
--# enable doxygen
--find_package(Doxygen)
--if(Doxygen_FOUND)
--  doxygen_add_docs(doxygen core/src grid/src)
--endif()
--
- ##---------------------------------------------------------------------------##
- ## Libraries and Examples
- ##---------------------------------------------------------------------------##

src/core/CMakeLists.txt

@@ -53,7 +53,7 @@ if(ESPRESSO_BUILD_WITH_CLANG_TIDY)
                                                  "${ESPRESSO_CXX_CLANG_TIDY}")
   if(ESPRESSO_BUILD_WITH_SHARED_MEMORY_PARALLELISM)
     set_target_properties(espresso_core PROPERTIES CXX_CLANG_TIDY
-                                                   "${KOKKOS_CXX_CLANG_TIDY}")
+                                                   "${CABANA_CXX_CLANG_TIDY}")
   endif()
 endif()
 
@@ -75,6 +75,10 @@ if(ESPRESSO_BUILD_WITH_CUDA)
             ${CMAKE_CURRENT_SOURCE_DIR}/magnetostatics)
   set_target_properties(espresso_cuda PROPERTIES CUDA_CLANG_TIDY
                                                  "${ESPRESSO_CUDA_CLANG_TIDY}")
+  if(ESPRESSO_BUILD_WITH_SHARED_MEMORY_PARALLELISM)
+    set_target_properties(espresso_cuda PROPERTIES CUDA_CLANG_TIDY
+                                                   "${CABANA_CUDA_CLANG_TIDY}")
+  endif()
   target_link_libraries(espresso_core PUBLIC espresso::cuda)
   install(TARGETS espresso_cuda
           LIBRARY DESTINATION ${ESPRESSO_INSTALL_PYTHON}/espressomd)
@@ -102,8 +106,8 @@ if(ESPRESSO_BUILD_WITH_WALBERLA)
 endif()
 
 if(ESPRESSO_BUILD_WITH_FFTW)
-  add_subdirectory(fft)
   add_subdirectory(p3m)
+  add_subdirectory(fft)
 endif()
 
 add_subdirectory(accumulators)

src/core/fft/CMakeLists.txt

@@ -17,8 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-if(FFTW3_FOUND)
-  target_link_libraries(espresso_core PUBLIC FFTW3::FFTW3)
+if(ESPRESSO_BUILD_WITH_FFTW)
+  target_link_libraries(espresso_p3m PRIVATE FFTW3::FFTW3)
+  target_sources(espresso_p3m PRIVATE fft.cpp)
 endif()
-
-target_sources(espresso_core PRIVATE fft.cpp)

src/core/p3m/CMakeLists.txt

@@ -17,13 +17,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-target_sources(
-  espresso_core PRIVATE common.cpp send_mesh.cpp TuningAlgorithm.cpp
-                        FFTBackendLegacy.cpp FFTBuffersLegacy.cpp)
-
 if(ESPRESSO_BUILD_WITH_FFTW)
   add_library(espresso_p3m OBJECT)
   add_library(espresso::p3m ALIAS espresso_p3m)
+  target_include_directories(espresso_p3m
+                             PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
   if(ESPRESSO_BUILD_WITH_CLANG_TIDY)
     set_target_properties(espresso_p3m PROPERTIES CXX_CLANG_TIDY
                                                   "${HEFFTE_CXX_CLANG_TIDY}")
@@ -44,7 +42,8 @@ if(ESPRESSO_BUILD_WITH_FFTW)
       $<$<BOOL:${ESPRESSO_BUILD_WITH_SHARED_MEMORY_PARALLELISM}>:Kokkos::kokkos>
       $<$<BOOL:${ESPRESSO_BUILD_WITH_SHARED_MEMORY_PARALLELISM}>:Cabana::Core>)
   set_target_properties(espresso_p3m PROPERTIES POSITION_INDEPENDENT_CODE ON)
-  target_link_libraries(espresso_core PUBLIC espresso_p3m)
-  install(TARGETS espresso_p3m
-          LIBRARY DESTINATION ${ESPRESSO_INSTALL_PYTHON}/espressomd)
+  target_link_libraries(espresso_core PRIVATE espresso_p3m)
+  target_sources(
+    espresso_p3m PRIVATE common.cpp send_mesh.cpp TuningAlgorithm.cpp
+                         FFTBackendLegacy.cpp FFTBuffersLegacy.cpp)
 endif()