fix: use system include syntax for all KokkosComm headers (#120)

Removes all instances of relative paths in favor of system include-style syntax: `<KokkosComm/...>
kokkos · Nov 4, 2024 · c54fb9d · c54fb9d
1 parent 8e177a9
commit c54fb9d
Show file tree

Hide file tree

Showing 36 changed files with 132 additions and 174 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,7 +43,7 @@ if(KOKKOSCOMM_ENABLE_MPI)
   find_package(MPI REQUIRED)
 endif()
 
-add_subdirectory(src)
+add_subdirectory(src/KokkosComm)
 if(KOKKOSCOMM_ENABLE_TESTS)
   add_subdirectory(unit_tests)
 endif()

diff --git a/perf_tests/mpi/test_2dhalo.cpp b/perf_tests/mpi/test_2dhalo.cpp
@@ -15,8 +15,7 @@
 //@HEADER
 
 #include "test_utils.hpp"
-
-#include "KokkosComm/KokkosComm.hpp"
+#include <KokkosComm/KokkosComm.hpp>
 
 #include <iostream>
 

diff --git a/perf_tests/mpi/test_main.cpp b/perf_tests/mpi/test_main.cpp
@@ -14,10 +14,9 @@
 //
 //@HEADER
 
-#include "KokkosComm/mpi/impl/include_mpi.hpp"
-
 #include <Kokkos_Core.hpp>
 #include <benchmark/benchmark.h>
+#include <mpi.h>
 
 // This reporter does nothing.
 // We can use it to disable output from all but the root process

diff --git a/perf_tests/mpi/test_osu_latency.cpp b/perf_tests/mpi/test_osu_latency.cpp
@@ -19,7 +19,7 @@
 // (NBCL), The Ohio State University.
 
 #include "test_utils.hpp"
-#include "KokkosComm/KokkosComm.hpp"
+#include <KokkosComm/KokkosComm.hpp>
 
 template <typename Space, typename View>
 void osu_latency_Kokkos_Comm_sendrecv(benchmark::State &, MPI_Comm, KokkosComm::Handle<> &h, const View &v) {
@@ -149,4 +149,4 @@ BENCHMARK(benchmark_osu_latency_MPI_sendrecv)
     ->UseManualTime()
     ->Unit(benchmark::kMicrosecond)
     ->RangeMultiplier(8)
-    ->Range(1, 1 << 28);
+    ->Range(1, 1 << 28);
diff --git a/perf_tests/mpi/test_sendrecv.cpp b/perf_tests/mpi/test_sendrecv.cpp
@@ -15,8 +15,7 @@
 //@HEADER
 
 #include "test_utils.hpp"
-
-#include "KokkosComm/KokkosComm.hpp"
+#include <KokkosComm/KokkosComm.hpp>
 
 template <KokkosComm::mpi::CommunicationMode Mode, typename Space, typename View>
 void send_recv(benchmark::State &, MPI_Comm comm, const Space &space, int rank, const View &v) {

diff --git a/perf_tests/mpi/test_utils.hpp b/perf_tests/mpi/test_utils.hpp
@@ -16,11 +16,10 @@
 
 #pragma once
 
-#include <chrono>
-
 #include <benchmark/benchmark.h>
+#include <mpi.h>
 
-#include "KokkosComm/mpi/impl/include_mpi.hpp"
+#include <chrono>
 
 // F is a function that takes (state, MPI_Comm, args...)
 template <typename F, typename... Args>
@@ -36,4 +35,4 @@ void do_iteration(benchmark::State &state, MPI_Comm comm, F &&func, Args... args
   double elapsed_seconds = elapsed.count();
   MPI_Allreduce(&elapsed_seconds, &max_elapsed_second, 1, MPI_DOUBLE, MPI_MAX, comm);
   state.SetIterationTime(max_elapsed_second);
-}
+}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/KokkosComm/CMakeLists.txt b/src/KokkosComm/CMakeLists.txt
@@ -14,8 +14,6 @@
 #
 #@HEADER
 
-set(TARGET_LIBRARY kokkoscomm)
-
 add_library(KokkosComm INTERFACE)
 add_library(KokkosComm::KokkosComm ALIAS KokkosComm)
 
@@ -79,12 +77,12 @@ if(KOKKOSCOMM_ENABLE_MPI)
       FILE_SET kokkoscomm_mpi_impl_headers
       TYPE HEADERS
       BASE_DIRS ${PROJECT_SOURCE_DIR}/src
-      FILES mpi/impl/include_mpi.hpp mpi/impl/pack_traits.hpp mpi/impl/packer.hpp mpi/impl/tags.hpp mpi/impl/types.hpp
+      FILES mpi/impl/src_mpi.hpp mpi/impl/pack_traits.hpp mpi/impl/packer.hpp mpi/impl/tags.hpp mpi/impl/types.hpp
   )
 endif()
 
 # --- COMPILE FLAGS --- #
-include(CheckCXXCompilerFlag)
+src(CheckCXXCompilerFlag)
 
 macro(kokkoscomm_check_and_add_compile_options)
   set(target ${ARGV0})
@@ -109,7 +107,7 @@ kokkoscomm_check_and_add_compile_options(KokkosCommFlags -Wpedantic)
 kokkoscomm_check_and_add_compile_options(KokkosCommFlags -pedantic)
 kokkoscomm_check_and_add_compile_options(KokkosCommFlags -Wcast-align)
 kokkoscomm_check_and_add_compile_options(KokkosCommFlags -Wformat=2)
-kokkoscomm_check_and_add_compile_options(KokkosCommFlags -Wmissing-include-dirs)
+kokkoscomm_check_and_add_compile_options(KokkosCommFlags -Wmissing-src-dirs)
 kokkoscomm_check_and_add_compile_options(KokkosCommFlags -Wno-gnu-zero-variadic-macro-arguments)
 
 # Linking

diff --git a/src/KokkosComm/KokkosComm.hpp b/src/KokkosComm/KokkosComm.hpp
@@ -16,28 +16,28 @@
 
 #pragma once
 
-#include "fwd.hpp"
+#include <KokkosComm/fwd.hpp>
 
 // transport declarations
 // TODO: could probably be moved to a per-transport file to be included
 #if defined(KOKKOSCOMM_ENABLE_MPI)
-#include "mpi/mpi.hpp"
-#include "mpi/send.hpp"
-#include "mpi/allgather.hpp"
-#include "mpi/alltoall.hpp"
-#include "mpi/barrier.hpp"
-#include "mpi/handle.hpp"
-#include "mpi/irecv.hpp"
-#include "mpi/isend.hpp"
-#include "mpi/recv.hpp"
-#include "mpi/reduce.hpp"
+#include <KokkosComm/mpi/mpi.hpp>
+#include <KokkosComm/mpi/send.hpp>
+#include <KokkosComm/mpi/allgather.hpp>
+#include <KokkosComm/mpi/alltoall.hpp>
+#include <KokkosComm/mpi/barrier.hpp>
+#include <KokkosComm/mpi/handle.hpp>
+#include <KokkosComm/mpi/irecv.hpp>
+#include <KokkosComm/mpi/isend.hpp>
+#include <KokkosComm/mpi/recv.hpp>
+#include <KokkosComm/mpi/reduce.hpp>
 #else
 #error at least one transport must be defined
 #endif
 
-#include "concepts.hpp"
-#include "point_to_point.hpp"
-#include "collective.hpp"
+#include <KokkosComm/concepts.hpp>
+#include <KokkosComm/point_to_point.hpp>
+#include <KokkosComm/collective.hpp>
 
 #include <Kokkos_Core.hpp>
 

diff --git a/src/KokkosComm/collective.hpp b/src/KokkosComm/collective.hpp
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include <utility>
+#include <KokkosComm/fwd.hpp>
+#include <KokkosComm/concepts.hpp>
 
 #include <Kokkos_Core.hpp>
 
-#include "fwd.hpp"
-#include "concepts.hpp"
+#include <utility>
 
 namespace KokkosComm {
 

diff --git a/src/KokkosComm/fwd.hpp b/src/KokkosComm/fwd.hpp
@@ -16,12 +16,13 @@
 
 #pragma once
 
-#include <vector>
-
-#include "concepts.hpp"
+#include <KokkosComm/concepts.hpp>
 #include <KokkosComm/config.hpp>
 
+#include <vector>
+
 namespace KokkosComm {
+
 #if defined(KOKKOSCOMM_ENABLE_MPI)
 class Mpi;
 using DefaultCommunicationSpace  = Mpi;
@@ -51,4 +52,4 @@ struct Barrier;
 
 }  // namespace Impl
 
-}  // namespace KokkosComm
+}  // namespace KokkosComm
diff --git a/src/KokkosComm/impl/KokkosComm_contiguous.hpp b/src/KokkosComm/impl/KokkosComm_contiguous.hpp
@@ -20,8 +20,8 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "concepts.hpp"
-#include "traits.hpp"
+#include <KokkosComm/concepts.hpp>
+#include <KokkosComm/traits.hpp>
 
 namespace KokkosComm::Impl {
 
@@ -60,4 +60,4 @@ auto resize_contiguous_for(const Space &space, DstView &out, const SrcView &in)
   }
 }
 
-}  // namespace KokkosComm::Impl
+}  // namespace KokkosComm::Impl
diff --git a/src/KokkosComm/mpi/allgather.hpp b/src/KokkosComm/mpi/allgather.hpp
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include <Kokkos_Core.hpp>
+#include <KokkosComm/traits.hpp>
+#include <KokkosComm/mpi/impl/pack_traits.hpp>
+#include <KokkosComm/mpi/impl/include_mpi.hpp>
+#include <KokkosComm/mpi/impl/types.hpp>
 
-#include "KokkosComm/traits.hpp"
-#include "impl/pack_traits.hpp"
-#include "impl/include_mpi.hpp"
-#include "impl/types.hpp"
+#include <Kokkos_Core.hpp>
 
 namespace KokkosComm::mpi {
 

diff --git a/src/KokkosComm/mpi/alltoall.hpp b/src/KokkosComm/mpi/alltoall.hpp
@@ -34,12 +34,12 @@
 
 #pragma once
 
-#include <Kokkos_Core.hpp>
+#include <KokkosComm/traits.hpp>
+#include <KokkosComm/mpi/impl/pack_traits.hpp>
+#include <KokkosComm/mpi/impl/include_mpi.hpp>
+#include <KokkosComm/mpi/impl/types.hpp>
 
-#include "KokkosComm/traits.hpp"
-#include "impl/pack_traits.hpp"
-#include "impl/include_mpi.hpp"
-#include "impl/types.hpp"
+#include <Kokkos_Core.hpp>
 
 namespace KokkosComm::Impl {
 template <KokkosExecutionSpace ExecSpace, KokkosView SendView, KokkosView RecvView>

diff --git a/src/KokkosComm/mpi/barrier.hpp b/src/KokkosComm/mpi/barrier.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "KokkosComm/concepts.hpp"
+#include <KokkosComm/concepts.hpp>
 
 namespace KokkosComm {
 

diff --git a/src/KokkosComm/mpi/handle.hpp b/src/KokkosComm/mpi/handle.hpp
@@ -16,9 +16,8 @@
 
 #pragma once
 
-#include "KokkosComm/fwd.hpp"
-
-#include "req.hpp"
+#include <KokkosComm/fwd.hpp>
+#include <KokkosComm/mpi/req.hpp>
 
 namespace KokkosComm {
 
@@ -62,4 +61,4 @@ class Handle<ExecSpace, Mpi> {
   MPI_Comm comm_;
 };
 
-}  // namespace KokkosComm
+}  // namespace KokkosComm
diff --git a/src/KokkosComm/mpi/impl/pack_traits.hpp b/src/KokkosComm/mpi/impl/pack_traits.hpp
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "KokkosComm/traits.hpp"
-#include "KokkosComm/concepts.hpp"
+#include <KokkosComm/traits.hpp>
+#include <KokkosComm/concepts.hpp>
 
-#include "packer.hpp"
+#include <KokkosComm/mpi/impl/packer.hpp>
 
 namespace KokkosComm {
 

diff --git a/src/KokkosComm/mpi/impl/packer.hpp b/src/KokkosComm/mpi/impl/packer.hpp
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "KokkosComm/concepts.hpp"
-#include "KokkosComm/traits.hpp"
-#include "types.hpp"
-#include "include_mpi.hpp"
+#include <KokkosComm/concepts.hpp>
+#include <KokkosComm/traits.hpp>
+#include <KokkosComm/mpi/impl/types.hpp>
+#include <KokkosComm/mpi/impl/include_mpi.hpp>
 
 // todo: redo this using KokkosComm_contiguous
 

diff --git a/src/KokkosComm/mpi/impl/types.hpp b/src/KokkosComm/mpi/impl/types.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "include_mpi.hpp"
+#include <KokkosComm/mpi/impl/include_mpi.hpp>
 
 #include <Kokkos_Core.hpp>
 

diff --git a/src/KokkosComm/mpi/irecv.hpp b/src/KokkosComm/mpi/irecv.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "mpi.hpp"
-#include "impl/tags.hpp"
+#include <KokkosComm/mpi/mpi.hpp>
+#include <KokkosComm/mpi/impl/tags.hpp>
 
 namespace KokkosComm {
 
@@ -67,4 +67,4 @@ void irecv(const RecvView &rv, int src, int tag, MPI_Comm comm, MPI_Request &req
 }
 }  // namespace mpi
 
-}  // namespace KokkosComm
+}  // namespace KokkosComm
diff --git a/src/KokkosComm/mpi/isend.hpp b/src/KokkosComm/mpi/isend.hpp
@@ -16,12 +16,11 @@
 
 #pragma once
 
-#include "KokkosComm/traits.hpp"
-
-#include "mpi.hpp"
-#include "impl/types.hpp"
-#include "impl/tags.hpp"
-#include "commmode.hpp"
+#include <KokkosComm/traits.hpp>
+#include <KokkosComm/mpi/mpi.hpp>
+#include <KokkosComm/mpi/impl/types.hpp>
+#include <KokkosComm/mpi/impl/tags.hpp>
+#include <KokkosComm/mpi/commmode.hpp>
 
 namespace KokkosComm {
 
@@ -97,4 +96,4 @@ void isend(const SendView &sv, int dest, int tag, MPI_Comm comm, MPI_Request &re
 
 }  // namespace mpi
 
-}  // namespace KokkosComm
+}  // namespace KokkosComm
diff --git a/src/KokkosComm/mpi/mpi.hpp b/src/KokkosComm/mpi/mpi.hpp
@@ -18,8 +18,8 @@
 
 #include <type_traits>
 
-#include "../concepts.hpp"
-#include "impl/include_mpi.hpp"
+#include <KokkosComm/concepts.hpp>
+#include <KokkosComm/mpi/impl/include_mpi.hpp>
 
 namespace KokkosComm {
 
@@ -45,4 +45,4 @@ struct Mpi {
 template <>
 struct Impl::is_communication_space<KokkosComm::Mpi> : public std::true_type {};
 
-}  // namespace KokkosComm
+}  // namespace KokkosComm