tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use fetch variant of atomic if not needed

Browse Source
This commit is contained in:
Stan Gerald Moore
2021-12-10 13:27:57 -07:00
parent e49b7d0514
commit 6bd3ddf908
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/KOKKOS/nbin_ssa_kokkos.cpp
View File

@ -228,12 +228,12 @@ void NBinSSAKokkos<DeviceType>::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;

4
src/KOKKOS/npair_ssa_kokkos.cpp
View File

@ -613,7 +613,7 @@ void NPairSSAKokkosExecute<DeviceType>::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<DeviceType>::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);
}
}
}