From 6bd3ddf908cc726b1e4ae462d61022d75654abd2 Mon Sep 17 00:00:00 2001 From: Stan Gerald Moore Date: Fri, 10 Dec 2021 13:27:57 -0700 Subject: [PATCH] Don't use fetch variant of atomic if not needed --- src/KOKKOS/nbin_ssa_kokkos.cpp | 12 ++++++------ src/KOKKOS/npair_ssa_kokkos.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/KOKKOS/nbin_ssa_kokkos.cpp b/src/KOKKOS/nbin_ssa_kokkos.cpp index d42b88ab79..b91ff7bd41 100644 --- a/src/KOKKOS/nbin_ssa_kokkos.cpp +++ b/src/KOKKOS/nbin_ssa_kokkos.cpp @@ -228,12 +228,12 @@ void NBinSSAKokkos::binIDAtomsItem(const int &i, int &update) const binID(i) = ibin; // Find the bounding box of the local atoms in the bins - if (loc[0] < d_lbinxlo()) Kokkos::atomic_fetch_min(&d_lbinxlo(),loc[0]); - if (loc[0] >= d_lbinxhi()) Kokkos::atomic_fetch_max(&d_lbinxhi(),loc[0] + 1); - if (loc[1] < d_lbinylo()) Kokkos::atomic_fetch_min(&d_lbinylo(),loc[1]); - if (loc[1] >= d_lbinyhi()) Kokkos::atomic_fetch_max(&d_lbinyhi(),loc[1] + 1); - if (loc[2] < d_lbinzlo()) Kokkos::atomic_fetch_min(&d_lbinzlo(),loc[2]); - if (loc[2] >= d_lbinzhi()) Kokkos::atomic_fetch_max(&d_lbinzhi(),loc[2] + 1); + if (loc[0] < d_lbinxlo()) Kokkos::atomic_min(&d_lbinxlo(),loc[0]); + if (loc[0] >= d_lbinxhi()) Kokkos::atomic_max(&d_lbinxhi(),loc[0] + 1); + if (loc[1] < d_lbinylo()) Kokkos::atomic_min(&d_lbinylo(),loc[1]); + if (loc[1] >= d_lbinyhi()) Kokkos::atomic_max(&d_lbinyhi(),loc[1] + 1); + if (loc[2] < d_lbinzlo()) Kokkos::atomic_min(&d_lbinzlo(),loc[2]); + if (loc[2] >= d_lbinzhi()) Kokkos::atomic_max(&d_lbinzhi(),loc[2] + 1); const int ac = Kokkos::atomic_fetch_add(&(bincount[ibin]), (int)1); if (update <= ac) update = ac + 1; diff --git a/src/KOKKOS/npair_ssa_kokkos.cpp b/src/KOKKOS/npair_ssa_kokkos.cpp index 0246d141fb..daa689d483 100644 --- a/src/KOKKOS/npair_ssa_kokkos.cpp +++ b/src/KOKKOS/npair_ssa_kokkos.cpp @@ -613,7 +613,7 @@ void NPairSSAKokkosExecute::build_locals_onePhase(const bool firstTr neigh_list.d_ilist(inum++) = i; if (n > neigh_list.maxneighs) { resize() = 1; - if (n > new_maxneighs()) Kokkos::atomic_fetch_max(&new_maxneighs(),n); + if (n > new_maxneighs()) Kokkos::atomic_max(&new_maxneighs(),n); } } } @@ -741,7 +741,7 @@ void NPairSSAKokkosExecute::build_ghosts_onePhase(int workPhase) con neigh_list.d_ilist(gNdx++) = i; if (n > neigh_list.maxneighs) { resize() = 1; - if (n > new_maxneighs()) Kokkos::atomic_fetch_max(&new_maxneighs(),n); + if (n > new_maxneighs()) Kokkos::atomic_max(&new_maxneighs(),n); } } }