Merge pull request kokkos#110 from cwpearson/fix/include-hierarchy

Don't flatten include hierarchy on install
cwpearson · Jul 16, 2024 · c6c557c · c6c557c
2 parents d34862d + 4c387e6
commit c6c557c
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,8 +27,6 @@ message(STATUS "Kokkos Comm: MPI_CXX_LIBRARIES =           ${MPI_CXX_LIBRARIES}"
 include(cmake/flags.cmake)
 add_subdirectory(src)
 kokkoscomm_add_cxx_flags(TARGET KokkosComm INTERFACE)
-message(STATUS ${KOKKOSCOMM_PUBLIC_HEADERS})
-set_target_properties(KokkosComm PROPERTIES PUBLIC_HEADER "${KOKKOSCOMM_PUBLIC_HEADERS}")
 
 ## Version config file
 set(KOKKOSCOMM_VERSION_MAJOR ${CMAKE_PROJECT_VERSION_MAJOR} CACHE STRING "" FORCE)
@@ -75,6 +73,12 @@ install(
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+# install the include tree
+install(
+    DIRECTORY "src/"
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    FILES_MATCHING PATTERN "*.hpp")
+# install the configured files
 install(
     DIRECTORY "${PROJECT_BINARY_DIR}/src/"
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

diff --git a/docs/dev/testing.rst b/docs/dev/testing.rst
@@ -38,9 +38,11 @@ Testing the Install
     cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install
 
     echo "==== CFG KOKKOS COMM ===="
+    rm -rf "$COMM_BUILD"
     cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DKokkosComm_ENABLE_TESTS=OFF -DKokkosComm_ENABLE_PERFTESTS=OFF -DCMAKE_INSTALL_PREFIX="$COMM_INSTALL"
 
     echo "==== BUILD & INSTALL KOKKOS COMM ===="
+    rm -rf "$COMM_INSTALL"
     VERBOSE=1 cmake --build "$COMM_BUILD" --target install
 
     echo "==== REMOVE KOKKOS COMM BUILD FILES ===="

diff --git a/perf_tests/test_main.cpp b/perf_tests/test_main.cpp
@@ -14,7 +14,7 @@
 //
 //@HEADER
 
-#include "KokkosComm_include_mpi.hpp"
+#include "impl/KokkosComm_include_mpi.hpp"
 
 #include <Kokkos_Core.hpp>
 #include <benchmark/benchmark.h>

diff --git a/perf_tests/test_utils.hpp b/perf_tests/test_utils.hpp
@@ -20,7 +20,7 @@
 
 #include <benchmark/benchmark.h>
 
-#include "KokkosComm_include_mpi.hpp"
+#include "impl/KokkosComm_include_mpi.hpp"
 
 // F is a function that takes (state, MPI_Comm, args...)
 template <typename F, typename... Args>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,13 +4,8 @@ add_library(KokkosComm::KokkosComm ALIAS KokkosComm)
 target_include_directories(KokkosComm INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
 )
-target_include_directories(KokkosComm INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/impl>
-)
+
 target_include_directories(KokkosComm INTERFACE
     $<INSTALL_INTERFACE:include>
 )
 target_link_libraries(KokkosComm INTERFACE MPI::MPI_CXX Kokkos::kokkos)
-
-file(GLOB_RECURSE KOKKOSCOMM_PUBLIC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/*.hpp)
-set(KOKKOSCOMM_PUBLIC_HEADERS ${KOKKOSCOMM_PUBLIC_HEADERS} PARENT_SCOPE)
diff --git a/src/KokkosComm.hpp b/src/KokkosComm.hpp
@@ -18,13 +18,13 @@
 
 #include "KokkosComm_config.hpp"
 #include "KokkosComm_collective.hpp"
-#include "KokkosComm_isend.hpp"
-#include "KokkosComm_irecv.hpp"
-#include "KokkosComm_recv.hpp"
-#include "KokkosComm_send.hpp"
-#include "KokkosComm_alltoall.hpp"
-#include "KokkosComm_barrier.hpp"
-#include "KokkosComm_concepts.hpp"
+#include "impl/KokkosComm_isend.hpp"
+#include "impl/KokkosComm_irecv.hpp"
+#include "impl/KokkosComm_recv.hpp"
+#include "impl/KokkosComm_send.hpp"
+#include "impl/KokkosComm_alltoall.hpp"
+#include "impl/KokkosComm_barrier.hpp"
+#include "impl/KokkosComm_concepts.hpp"
 #include "KokkosComm_comm_modes.hpp"
 
 #include <Kokkos_Core.hpp>

diff --git a/src/KokkosComm_collective.hpp b/src/KokkosComm_collective.hpp
@@ -18,10 +18,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_alltoall.hpp"
-#include "KokkosComm_reduce.hpp"
-#include "KokkosComm_allgather.hpp"
+#include "impl/KokkosComm_concepts.hpp"
+#include "impl/KokkosComm_alltoall.hpp"
+#include "impl/KokkosComm_reduce.hpp"
+#include "impl/KokkosComm_allgather.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/KokkosComm_pack_traits.hpp b/src/KokkosComm_pack_traits.hpp
@@ -18,8 +18,8 @@
 
 #include "KokkosComm_traits.hpp"
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_packer.hpp"
+#include "impl/KokkosComm_concepts.hpp"
+#include "impl/KokkosComm_packer.hpp"
 
 /*! \brief Defines a common interface for packing and unpacking
    Kokkos::View-like types \file KokkosComm_traits.hpp

diff --git a/src/KokkosComm_request.hpp b/src/KokkosComm_request.hpp
@@ -19,7 +19,7 @@
 #include <memory>
 #include <vector>
 
-#include "KokkosComm_include_mpi.hpp"
+#include "impl/KokkosComm_include_mpi.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/KokkosComm_traits.hpp b/src/KokkosComm_traits.hpp
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "KokkosComm_concepts.hpp"
+#include "impl/KokkosComm_concepts.hpp"
 
 #include <type_traits>
 

diff --git a/unit_tests/test_isendirecv.cpp b/unit_tests/test_isendirecv.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 
 #include "KokkosComm.hpp"
-#include "KokkosComm_irecv.hpp"
+#include "impl/KokkosComm_irecv.hpp"
 
 #include "view_builder.hpp"
 

diff --git a/unit_tests/test_main.cpp b/unit_tests/test_main.cpp
@@ -23,7 +23,7 @@
 #include <KokkosComm_config.hpp>
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_include_mpi.hpp"
+#include "impl/KokkosComm_include_mpi.hpp"
 
 class MpiEnvironment : public ::testing::Environment {
  public: