From ed75c87cd6ac21d1c2a1aac88320b2590bb4addf Mon Sep 17 00:00:00 2001 From: stamoor Date: Tue, 3 May 2016 14:36:02 +0000 Subject: [PATCH] Collapsing kokkos half and half/thread neighbor lists git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14922 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- doc/package.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/doc/package.txt b/doc/package.txt index 776b7befe2..df7e01bf47 100644 --- a/doc/package.txt +++ b/doc/package.txt @@ -76,10 +76,9 @@ args = arguments specific to the style :l {kokkos} args = keyword value ... zero or more keyword/value pairs may be appended keywords = {neigh} or {newton} or {binsize} or {comm} or {comm/exchange} or {comm/forward} - {neigh} value = {full} or {half/thread} or {half} or {n2} or {full/cluster} + {neigh} value = {full} or {half} or {n2} or {full/cluster} full = full neighbor list - half/thread = half neighbor list built in thread-safe manner - half = half neighbor list, not thread-safe, only use when 1 thread/MPI task + half = half neighbor list built in thread-safe manner n2 = non-binning neighbor list build, O(N^2) algorithm full/cluster = full neighbor list with clustered groups of atoms {newton} = {off} or {on} @@ -110,7 +109,7 @@ package gpu 1 split 0.75 package gpu 2 split -1.0 package cuda 2 gpuID 0 2 package cuda 1 test 3948 -package kokkos neigh half/thread comm device +package kokkos neigh half comm device package omp 0 neigh no package omp 4 package intel 1 @@ -447,10 +446,8 @@ All of the settings are optional keyword/value pairs. Each has a default value as listed below. The {neigh} keyword determines how neighbor lists are built. A value -of {half} uses half-neighbor lists, the same as used by most pair -styles in LAMMPS. A value of {half/thread} uses a thread-safe variant -of the half-neighbor list. It should be used instead of {half} when -running with more than 1 threads per MPI task on a CPU. A value of +of {half} uses a thread-safe variant of half-neighbor lists, +the same as used by most pair styles in LAMMPS. A value of {n2} uses an O(N^2) algorithm to build the neighbor list without binning, where N = # of atoms on a processor. It is typically slower than the other methods, which use binning.