irecv: remove mdspan

kokkos · Apr 10, 2024 · 8d0fe77 · 8d0fe77
1 parent f211dae
commit 8d0fe77
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 22 deletions.
diff --git a/src/KokkosComm.hpp b/src/KokkosComm.hpp
@@ -48,7 +48,7 @@ void recv(const ExecSpace &space, RecvView &sv, int src, int tag,
   return Impl::recv(space, sv, src, tag, comm);
 }
 
-template <KokkosExecutionSpace ExecSpace, ViewOrMdspan RecvView>
+template <KokkosExecutionSpace ExecSpace, KokkosView RecvView>
 Req irecv(const ExecSpace &space, RecvView &rv, int src, int tag,
           MPI_Comm comm) {
   return Impl::irecv(space, rv, src, tag, comm);

diff --git a/src/impl/KokkosComm_irecv.hpp b/src/impl/KokkosComm_irecv.hpp
@@ -26,7 +26,7 @@
 
 namespace KokkosComm::Impl {
 
-template <typename ExecSpace, typename RecvView, typename MpiArgs>
+template <KokkosExecutionSpace ExecSpace, KokkosView RecvView, typename MpiArgs>
 struct IrecvUnpacker {
   IrecvUnpacker(const ExecSpace &space, RecvView &rv, MpiArgs &args)
       : space_(space), rv_(rv), args_(args) {}
@@ -43,10 +43,7 @@ struct IrecvUnpacker {
   MpiArgs args_;
 };
 
-/* FIXME: If RecvView is a Kokkos view, it can be a const ref
-   same is true for an mdspan?
-*/
-template <typename RecvView, typename ExecSpace>
+template <KokkosExecutionSpace ExecSpace, KokkosView RecvView>
 Req irecv(const ExecSpace &space, RecvView &rv, int src, int tag,
           MPI_Comm comm) {
   Kokkos::Tools::pushRegion("KokkosComm::Impl::irecv");

diff --git a/src/impl/KokkosComm_packer.hpp b/src/impl/KokkosComm_packer.hpp
@@ -23,7 +23,7 @@
 namespace KokkosComm::Impl {
 namespace Packer {
 
-template <KokkosView View>
+template <KokkosView View, typename Packer>
 struct MpiArgs {
   using packer_type =
       Packer;  // the type of the packer that produced these arguments

diff --git a/unit_tests/test_isendirecv.cpp b/unit_tests/test_isendirecv.cpp
@@ -14,21 +14,6 @@
 //
 //@HEADER
 
-#if KOKKOSCOMM_ENABLE_MDSPAN
-#if KOKKOSCOMM_MDSPAN_IN_EXPERIMENTAL
-#include <experimental/mdspan>
-#define MDSPAN_PREFIX() experimental::
-#else
-#include <mdspan>
-#define MDSPAN_PREFIX()
-#endif
-
-using std::MDSPAN_PREFIX() dextents;
-using std::MDSPAN_PREFIX() extents;
-using std::MDSPAN_PREFIX() layout_stride;
-using std::MDSPAN_PREFIX() mdspan;
-#endif  // KOKKOSCOMM_ENABLE_MDSPAN
-
 #include <gtest/gtest.h>
 
 #include "KokkosComm.hpp"