diff --git a/bench/GPU/README b/bench/GPU/README index 91dba179ba..a85d6302ba 100644 --- a/bench/GPU/README +++ b/bench/GPU/README @@ -39,9 +39,10 @@ mpirun -np 8 ../lmp_linux_mixed -sf gpu -c off -v g 2 -v x 32 -v y 32 -v z 64 -v The "xyz" settings determine the problem size. The "t" setting determines the number of timesteps. The "np" setting determines how -many CPUs the problem will be run on, and the "g" settings determines -how many GPUs the problem will run on, i.e. 1 or 2 in this case. You -can use more CPUs than GPUs with the GPU package. +many MPI tasks per compute node the problem will run on, and the "g" +setting determines how many GPUs per compute node the problem will run +on, i.e. 1 or 2 in this case. Note that you can use more MPI tasks +than GPUs (both per compute node) with the GPU package. ------------------------------------------------------------------------ @@ -54,7 +55,7 @@ mpirun -np 2 ../lmp_linux_double -sf cuda -v g 2 -v x 32 -v y 64 -v z 64 -v t 10 The "xyz" settings determine the problem size. The "t" setting determines the number of timesteps. The "np" setting determines how -many CPUs the problem will be run on, and the "g" setting determines -how many GPUs the problem will run on, i.e. 1 or 2 in this case. You -should make the number of CPUs and number of GPUs equal for the -USER-CUDA package. +many MPI tasks per compute node the problem will run on, and the "g" +setting determines how many GPUs per compute node the problem will run +on, i.e. 1 or 2 in this case. For the USER-CUDA package, the number +of MPI tasks and GPUs (both per compute node) must be equal. diff --git a/doc/Manual.html b/doc/Manual.html index 6dc80d4376..576b6b0114 100644 --- a/doc/Manual.html +++ b/doc/Manual.html @@ -1,7 +1,7 @@ LAMMPS-ICMS Users Manual - + @@ -22,7 +22,7 @@

LAMMPS-ICMS Documentation

-

27 May 2014 version +

29 May 2014 version

Version info:

diff --git a/doc/Manual.txt b/doc/Manual.txt index dd9a4a3b05..52fbbc10a0 100644 --- a/doc/Manual.txt +++ b/doc/Manual.txt @@ -1,6 +1,6 @@ LAMMPS-ICMS Users Manual - + @@ -18,7 +18,7 @@

LAMMPS-ICMS Documentation :c,h3 -27 May 2014 version :c,h4 +29 May 2014 version :c,h4 Version info: :h4 diff --git a/doc/Section_accelerate.html b/doc/Section_accelerate.html index 1b48220bc6..4de4fa10fe 100644 --- a/doc/Section_accelerate.html +++ b/doc/Section_accelerate.html @@ -24,7 +24,8 @@ kinds of machines. 5.5 USER-OMP package
5.6 GPU package
5.7 USER-CUDA package
-5.8 Comparison of GPU and USER-CUDA packages
+5.8 KOKKOS package
+5.9 Comparison of GPU and USER-CUDA packages

@@ -146,14 +147,14 @@ command is identical, their functionality is the same, and the numerical results it produces should also be identical, except for precision and round-off issues.

-

For example, all of these variants of the basic Lennard-Jones pair -style exist in LAMMPS: +

For example, all of these styles are variants of the basic +Lennard-Jones pair style pair_style lj/cut:

-