Skip to content

Commit 8223b1b

Browse files
authored
Merge pull request #89 from janciesko/fixes
Several improvements
2 parents e66d8c5 + ce13c5a commit 8223b1b

18 files changed

+432
-470
lines changed

src/core/Kokkos_RemoteSpaces_LocalDeepCopy.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(
7575
#ifdef KRS_ENABLE_MPISPACE
7676
dst_data_block_t data_block = dst_data_block_t(
7777
src.data(), dst.impl_map().handle().loc.win,
78-
dst.impl_map().handle().loc.offset, dst.span(), src_rank);
78+
dst.impl_map().handle().loc.offset, dst.span(), dst_rank);
7979
#else
8080
dst_data_block_t data_block =
8181
dst_data_block_t(dst.data(), src.data(), dst.span(), dst_rank);
@@ -131,7 +131,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy_contiguous(
131131
#ifdef KRS_ENABLE_MPISPACE
132132
dst_data_block_t data_block = dst_data_block_t(
133133
src.data(), dst.impl_map().handle().loc.win,
134-
dst.impl_map().handle().loc.offset, dst.span(), src_rank);
134+
dst.impl_map().handle().loc.offset, dst.span(), dst_rank);
135135
#else
136136
dst_data_block_t data_block =
137137
dst_data_block_t(dst.data(), src.data(), dst.span(), dst_rank);

src/impl/mpispace/Kokkos_MPISpace.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ void *MPISpace::impl_allocate(
9292
Kokkos::abort("MPISpace only supports symmetric allocation policy.");
9393
}
9494
}
95+
9596
using MemAllocFailure =
9697
Kokkos::Impl::Experimental::RemoteSpacesMemoryAllocationFailure;
9798
using MemAllocFailureMode = Kokkos::Impl::Experimental::
@@ -178,6 +179,7 @@ void MPISpace::impl_deallocate(
178179
}
179180

180181
void MPISpace::fence() const {
182+
Kokkos::fence();
181183
for (int i = 0; i < mpi_windows.size(); i++) {
182184
if (mpi_windows[i] != MPI_WIN_NULL) {
183185
MPI_Win_flush_all(mpi_windows[i]);

0 commit comments

Comments
 (0)