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

BUGFIX: use Kokkos::atomic_fetch_max() to avoid a race on new_maxneighs

Browse Source
This commit is contained in:
Tim Mattox
2017-02-18 01:38:55 -05:00
parent 5c6e7b12c6
commit 01d0a5c4a2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/KOKKOS/npair_kokkos.cpp
View File

@ -422,10 +422,10 @@ void NeighborKokkosExecute<DeviceType>::
neigh_list.d_numneigh(i) = n; neigh_list.d_numneigh(i) = n;
if(n >= neigh_list.maxneighs) { if(n > neigh_list.maxneighs) {
resize() = 1; resize() = 1;
if(n >= new_maxneighs()) new_maxneighs() = n; if(n > new_maxneighs()) Kokkos::atomic_fetch_max(&new_maxneighs(),n);
} }
neigh_list.d_ilist(i) = i; neigh_list.d_ilist(i) = i;
@ -632,10 +632,10 @@ void NeighborKokkosExecute<DeviceType>::build_ItemCuda(typename Kokkos::TeamPoli
neigh_list.d_ilist(i) = i; neigh_list.d_ilist(i) = i;
} }
if(n >= neigh_list.maxneighs) { if(n > neigh_list.maxneighs) {
resize() = 1; resize() = 1;
if(n >= new_maxneighs()) new_maxneighs() = n; if(n > new_maxneighs()) Kokkos::atomic_fetch_max(&new_maxneighs(),n);
} }
} }
} }
@ -755,10 +755,10 @@ void NeighborKokkosExecute<DeviceType>::
neigh_list.d_numneigh(i) = n; neigh_list.d_numneigh(i) = n;
if(n >= neigh_list.maxneighs) { if(n > neigh_list.maxneighs) {
resize() = 1; resize() = 1;
if(n >= new_maxneighs()) new_maxneighs() = n; if(n > new_maxneighs()) Kokkos::atomic_fetch_max(&new_maxneighs(),n);
} }
neigh_list.d_ilist(i) = i; neigh_list.d_ilist(i) = i;
} }