Changed files to accept a new GPU mode for hybrid neighboring.

This commit is contained in:
W. Michael Brown
2011-09-12 16:09:03 -04:00
parent f20b7ed31f
commit d4b1037036
44 changed files with 162 additions and 133 deletions

View File

@ -1,5 +1,5 @@
/***************************************************************************
base_atomic.h
base_atomic.cpp
-------------------
W. Michael Brown (ORNL)
@ -47,9 +47,11 @@ int BaseAtomicT::init_atomic(const int nlocal, const int nall,
nbor_time_avail=false;
screen=_screen;
bool gpu_nbor=false;
int gpu_nbor=0;
if (device->gpu_mode()==Device<numtyp,acctyp>::GPU_NEIGH)
gpu_nbor=true;
gpu_nbor=1;
else if (device->gpu_mode()==Device<numtyp,acctyp>::GPU_HYB_NEIGH)
gpu_nbor=2;
int _gpu_host=0;
int host_nlocal=hd_balancer.first_host_count(nlocal,gpu_split,gpu_nbor);
@ -57,7 +59,7 @@ int BaseAtomicT::init_atomic(const int nlocal, const int nall,
_gpu_host=1;
_threads_per_atom=device->threads_per_atom();
if (_threads_per_atom>1 && gpu_nbor==false) {
if (_threads_per_atom>1 && gpu_nbor==0) {
nbor->packing(true);
_nbor_data=&(nbor->dev_packed);
} else