Unverified Commit 0d15c57f authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1555 from stanmoore1/kk_neigh 

Fix issue in Kokkos neighbor binning when using non-Kokkos lists on GPUs
parents c00f2adb 5013fd69

src/KOKKOS/nbin_kokkos.cpp

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ NBinKokkos<DeviceType>::NBinKokkos(LAMMPS *lmp) : NBinStandard(lmp) { 
#endif

  h_resize() = 1;



  kokkos = 1;

}



/* ----------------------------------------------------------------------

src/KOKKOS/neighbor_kokkos.cpp

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ void NeighborKokkos::build_kokkos(int topoflag) 


  if (style != Neighbor::NSQ) {

    for (int i = 0; i < nbin; i++) {

      if (!neigh_bin[i]->kokkos) atomKK->sync(Host,ALL_MASK);

      neigh_bin[i]->bin_atoms_setup(nall);

      neigh_bin[i]->bin_atoms();

    }

src/nbin.cpp

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ NBin::NBin(LAMMPS *lmp) : Pointers(lmp) 


  dimension = domain->dimension;

  triclinic = domain->triclinic;



  kokkos = 0;

}



/* ---------------------------------------------------------------------- */

src/nbin.h

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ class NBin : protected Pointers { 
  virtual void setup_bins(int) = 0;

  virtual void bin_atoms() = 0;



  // Kokkos package



  int kokkos;                       // 1 if class stores Kokkos data



 protected:



  // data from Neighbor class

CRA Git | Maintained and supported by SUSTech CRA and CCSE