Move headers to KokkosComm/

kokkos · Aug 12, 2024 · 2c2bc5f · 2c2bc5f
1 parent dc74642
commit 2c2bc5f
Show file tree

Hide file tree

Showing 38 changed files with 77 additions and 77 deletions.
diff --git a/perf_tests/test_2dhalo.cpp b/perf_tests/test_2dhalo.cpp
@@ -16,7 +16,7 @@
 
 #include "test_utils.hpp"
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 #include <iostream>
 

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

diff --git a/perf_tests/test_osu_latency.cpp b/perf_tests/test_osu_latency.cpp
@@ -19,7 +19,7 @@
 // (NBCL), The Ohio State University.
 
 #include "test_utils.hpp"
-#include "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) {

diff --git a/perf_tests/test_sendrecv.cpp b/perf_tests/test_sendrecv.cpp
@@ -16,7 +16,7 @@
 
 #include "test_utils.hpp"
 
-#include "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/test_utils.hpp b/perf_tests/test_utils.hpp
@@ -20,7 +20,7 @@
 
 #include <benchmark/benchmark.h>
 
-#include "mpi/impl/KokkosComm_include_mpi.hpp"
+#include "KokkosComm/mpi/impl/include_mpi.hpp"
 
 // F is a function that takes (state, MPI_Comm, args...)
 template <typename F, typename... Args>

diff --git a/src/KokkosComm.hpp → src/KokkosComm/KokkosComm.hpp b/src/KokkosComm.hpp → src/KokkosComm/KokkosComm.hpp
@@ -16,28 +16,28 @@
 
 #pragma once
 
-#include "KokkosComm_fwd.hpp"
+#include "fwd.hpp"
 
 // transport declarations
 // TODO: could probably be moved to a per-transport file to be included
 #if defined(KOKKOSCOMM_ENABLE_MPI)
-#include "mpi/KokkosComm_mpi.hpp"
-#include "mpi/KokkosComm_mpi_send.hpp"
-#include "mpi/KokkosComm_mpi_allgather.hpp"
-#include "mpi/KokkosComm_mpi_alltoall.hpp"
-#include "mpi/KokkosComm_mpi_barrier.hpp"
-#include "mpi/KokkosComm_mpi_handle.hpp"
-#include "mpi/KokkosComm_mpi_irecv.hpp"
-#include "mpi/KokkosComm_mpi_isend.hpp"
-#include "mpi/KokkosComm_mpi_recv.hpp"
-#include "mpi/KokkosComm_mpi_reduce.hpp"
+#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"
 #else
 #error at least one transport must be defined
 #endif
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_point_to_point.hpp"
-#include "KokkosComm_collective.hpp"
+#include "concepts.hpp"
+#include "point_to_point.hpp"
+#include "collective.hpp"
 
 #include <Kokkos_Core.hpp>
 

diff --git a/src/KokkosComm_collective.hpp → src/KokkosComm/collective.hpp b/src/KokkosComm_collective.hpp → src/KokkosComm/collective.hpp
@@ -20,8 +20,8 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_fwd.hpp"
-#include "KokkosComm_concepts.hpp"
+#include "fwd.hpp"
+#include "concepts.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/KokkosComm_comm_modes.hpp → src/KokkosComm/comm_modes.hpp b/src/KokkosComm_comm_modes.hpp → src/KokkosComm/comm_modes.hpp
diff --git a/src/KokkosComm_concepts.hpp → src/KokkosComm/concepts.hpp b/src/KokkosComm_concepts.hpp → src/KokkosComm/concepts.hpp
diff --git a/src/KokkosComm_fwd.hpp → src/KokkosComm/fwd.hpp b/src/KokkosComm_fwd.hpp → src/KokkosComm/fwd.hpp
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#include "KokkosComm_concepts.hpp"
+#include "concepts.hpp"
 #include "KokkosComm_config.hpp"
 
 namespace KokkosComm {

diff --git a/src/impl/KokkosComm_contiguous.hpp → ...KokkosComm/impl/KokkosComm_contiguous.hpp b/src/impl/KokkosComm_contiguous.hpp → ...KokkosComm/impl/KokkosComm_contiguous.hpp
@@ -20,8 +20,8 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_traits.hpp"
+#include "concepts.hpp"
+#include "traits.hpp"
 
 namespace KokkosComm::Impl {
 

diff --git a/src/mpi/KokkosComm_mpi_allgather.hpp → src/KokkosComm/mpi/allgather.hpp b/src/mpi/KokkosComm_mpi_allgather.hpp → src/KokkosComm/mpi/allgather.hpp
@@ -18,10 +18,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_traits.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
-#include "impl/KokkosComm_types.hpp"
+#include "KokkosComm/traits.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
+#include "impl/types.hpp"
 
 namespace KokkosComm::mpi {
 

diff --git a/src/mpi/KokkosComm_mpi_alltoall.hpp → src/KokkosComm/mpi/alltoall.hpp b/src/mpi/KokkosComm_mpi_alltoall.hpp → src/KokkosComm/mpi/alltoall.hpp
@@ -36,10 +36,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_traits.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
-#include "impl/KokkosComm_types.hpp"
+#include "KokkosComm/traits.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
+#include "impl/types.hpp"
 
 namespace KokkosComm::Impl {
 template <KokkosExecutionSpace ExecSpace, KokkosView SendView, KokkosView RecvView>

diff --git a/src/mpi/KokkosComm_mpi_barrier.hpp → src/KokkosComm/mpi/barrier.hpp b/src/mpi/KokkosComm_mpi_barrier.hpp → 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/mpi/KokkosComm_mpi_commmode.hpp → src/KokkosComm/mpi/commmode.hpp b/src/mpi/KokkosComm_mpi_commmode.hpp → src/KokkosComm/mpi/commmode.hpp
diff --git a/src/mpi/KokkosComm_mpi_handle.hpp → src/KokkosComm/mpi/handle.hpp b/src/mpi/KokkosComm_mpi_handle.hpp → src/KokkosComm/mpi/handle.hpp
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "KokkosComm_fwd.hpp"
+#include "KokkosComm/fwd.hpp"
 
-#include "KokkosComm_mpi_req.hpp"
+#include "req.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/mpi/impl/KokkosComm_include_mpi.hpp → src/KokkosComm/mpi/impl/include_mpi.hpp b/src/mpi/impl/KokkosComm_include_mpi.hpp → src/KokkosComm/mpi/impl/include_mpi.hpp
diff --git a/src/mpi/impl/KokkosComm_pack_traits.hpp → src/KokkosComm/mpi/impl/pack_traits.hpp b/src/mpi/impl/KokkosComm_pack_traits.hpp → 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 "KokkosComm_packer.hpp"
+#include "packer.hpp"
 
 namespace KokkosComm {
 

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

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

diff --git a/src/mpi/KokkosComm_mpi_irecv.hpp → src/KokkosComm/mpi/irecv.hpp b/src/mpi/KokkosComm_mpi_irecv.hpp → src/KokkosComm/mpi/irecv.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "KokkosComm_mpi.hpp"
-#include "impl/KokkosComm_tags.hpp"
+#include "mpi.hpp"
+#include "impl/tags.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/mpi/KokkosComm_mpi_isend.hpp → src/KokkosComm/mpi/isend.hpp b/src/mpi/KokkosComm_mpi_isend.hpp → src/KokkosComm/mpi/isend.hpp
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "KokkosComm_traits.hpp"
+#include "KokkosComm/traits.hpp"
 
-#include "KokkosComm_mpi.hpp"
-#include "impl/KokkosComm_types.hpp"
-#include "impl/KokkosComm_tags.hpp"
-#include "KokkosComm_mpi_commmode.hpp"
+#include "mpi.hpp"
+#include "impl/types.hpp"
+#include "impl/tags.hpp"
+#include "commmode.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/mpi/KokkosComm_mpi.hpp → src/KokkosComm/mpi/mpi.hpp b/src/mpi/KokkosComm_mpi.hpp → src/KokkosComm/mpi/mpi.hpp
@@ -18,8 +18,8 @@
 
 #include <type_traits>
 
-#include "KokkosComm_concepts.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
+#include "../concepts.hpp"
+#include "impl/include_mpi.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/mpi/KokkosComm_mpi_recv.hpp → src/KokkosComm/mpi/recv.hpp b/src/mpi/KokkosComm_mpi_recv.hpp → src/KokkosComm/mpi/recv.hpp
@@ -18,10 +18,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_traits.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
+#include "KokkosComm/concepts.hpp"
+#include "KokkosComm/traits.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
 
 namespace KokkosComm::mpi {
 

diff --git a/src/mpi/KokkosComm_mpi_reduce.hpp → src/KokkosComm/mpi/reduce.hpp b/src/mpi/KokkosComm_mpi_reduce.hpp → src/KokkosComm/mpi/reduce.hpp
@@ -18,10 +18,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_traits.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
-#include "impl/KokkosComm_types.hpp"
+#include "KokkosComm/traits.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
+#include "impl/types.hpp"
 
 namespace KokkosComm::mpi {
 

diff --git a/src/mpi/KokkosComm_mpi_req.hpp → src/KokkosComm/mpi/req.hpp b/src/mpi/KokkosComm_mpi_req.hpp → src/KokkosComm/mpi/req.hpp
@@ -20,9 +20,9 @@
 #include <utility>
 #include <functional>
 
-#include "KokkosComm_fwd.hpp"
+#include "KokkosComm/fwd.hpp"
 
-#include "KokkosComm_mpi.hpp"
+#include "mpi.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/mpi/KokkosComm_mpi_send.hpp → src/KokkosComm/mpi/send.hpp b/src/mpi/KokkosComm_mpi_send.hpp → src/KokkosComm/mpi/send.hpp
@@ -18,9 +18,9 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_mpi_commmode.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
+#include "commmode.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
 
 namespace KokkosComm::mpi {
 

diff --git a/src/KokkosComm_point_to_point.hpp → src/KokkosComm/point_to_point.hpp b/src/KokkosComm_point_to_point.hpp → src/KokkosComm/point_to_point.hpp
@@ -18,8 +18,8 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_fwd.hpp"
-#include "KokkosComm_concepts.hpp"
+#include "fwd.hpp"
+#include "concepts.hpp"
 
 namespace KokkosComm {
 

diff --git a/src/KokkosComm_traits.hpp → src/KokkosComm/traits.hpp b/src/KokkosComm_traits.hpp → src/KokkosComm/traits.hpp
@@ -15,14 +15,14 @@
 //@HEADER
 
 /*! \brief Defines a common interface for Kokkos::View-like types
-    \file KokkosComm_traits.hpp
+    \file traits.hpp
 */
 
 #pragma once
 
 #include <type_traits>
 
-#include "KokkosComm_concepts.hpp"
+#include "concepts.hpp"
 
 namespace KokkosComm {
 

diff --git a/unit_tests/mpi/test_allgather.cpp b/unit_tests/mpi/test_allgather.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 

diff --git a/unit_tests/mpi/test_alltoall.cpp b/unit_tests/mpi/test_alltoall.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 

diff --git a/unit_tests/mpi/test_isendrecv.cpp b/unit_tests/mpi/test_isendrecv.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <type_traits>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 

diff --git a/unit_tests/mpi/test_reduce.cpp b/unit_tests/mpi/test_reduce.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 

diff --git a/unit_tests/mpi/test_sendrecv.cpp b/unit_tests/mpi/test_sendrecv.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <type_traits>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 

diff --git a/unit_tests/test_barrier.cpp b/unit_tests/test_barrier.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 

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 "mpi/impl/KokkosComm_include_mpi.hpp"
+#include "KokkosComm/mpi/impl/include_mpi.hpp"
 
 class MpiEnvironment : public ::testing::Environment {
  public: