ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kokkos enhancements

Browse Source 
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14804 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
stamoor
2016-04-06 23:08:54 +00:00
parent c855d51211
commit 65f40aa34d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/KOKKOS/comm_kokkos.cpp
View File

@ -364,7 +364,7 @@ void CommKokkos::exchange()
if(atom->nextra_grow + atom->nextra_border) {
if(!exchange_comm_classic) {
static int print = 1;
if(print) {
if(print && comm->me==0) {
error->warning(FLERR,"Fixes cannot send data in Kokkos communication, "
"switching to classic communication");
print = 0;
@ -995,4 +995,3 @@ void CommKokkos::grow_swap(int n)
memory->grow(maxsendlist,n,"comm:maxsendlist");
for (int i=0;i<maxswap;i++) maxsendlist[i]=size;
}

10
src/KOKKOS/neighbor_kokkos.cpp
View File

@ -14,6 +14,7 @@
#include "neighbor_kokkos.h"
#include "atom.h"
#include "pair.h"
#include "fix.h"
#include "neigh_request.h"
#include "memory.h"
#include "update.h"
@ -136,6 +137,10 @@ int NeighborKokkos::init_lists_kokkos()
Pair *pair = (Pair *) requests[i]->requestor;
pair->init_list(requests[i]->id,lists_host[i]);
}
if (requests[i]->fix) {
Fix *fix = (Fix *) requests[i]->requestor;
fix->init_list(requests[i]->id,lists_host[i]);
}
}
lists_device = new NeighListKokkos<LMPDeviceType>*[nrequest];
@ -156,6 +161,10 @@ int NeighborKokkos::init_lists_kokkos()
Pair *pair = (Pair *) requests[i]->requestor;
pair->init_list(requests[i]->id,lists_device[i]);
}
if (requests[i]->fix) {
Fix *fix = (Fix *) requests[i]->requestor;
fix->init_list(requests[i]->id,lists_device[i]);
}
}
// 1st time allocation of xhold
@ -598,4 +607,3 @@ void NeighborKokkos::build_topology_kokkos() {
// include to trigger instantiation of templated functions
#include "neigh_full_kokkos.h"