diff --git a/src/KokkosComm.hpp b/src/KokkosComm.hpp index 774b99c2..579f311b 100644 --- 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 +template 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 index a7e589e1..1f6ae307 100644 --- a/src/impl/KokkosComm_irecv.hpp +++ b/src/impl/KokkosComm_irecv.hpp @@ -26,7 +26,7 @@ namespace KokkosComm::Impl { -template +template 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 +template 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 index d7664fba..308f1d07 100644 --- a/src/impl/KokkosComm_packer.hpp +++ b/src/impl/KokkosComm_packer.hpp @@ -23,7 +23,7 @@ namespace KokkosComm::Impl { namespace Packer { -template +template 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 index 3a5bdd9f..3da3b244 100644 --- 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 -#define MDSPAN_PREFIX() experimental:: -#else -#include -#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 #include "KokkosComm.hpp"