From f01103dd08851b06436da298635e02bfb39cb255 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 9 Aug 2017 19:08:23 -0400 Subject: [PATCH] correctly use the term CUDA (instead of Cuda) when not referring to the KOKKOS device flag (which is Cuda) --- doc/src/Section_start.txt | 2 +- doc/src/accelerate_gpu.txt | 4 ++-- doc/src/accelerate_kokkos.txt | 2 +- doc/src/suffix.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/src/Section_start.txt b/doc/src/Section_start.txt index c798005f5e..53a36b8c22 100644 --- a/doc/src/Section_start.txt +++ b/doc/src/Section_start.txt @@ -909,7 +909,7 @@ src/MAKE/OPTIONS, which include the settings. Note that the USER-INTEL and KOKKOS packages can use settings that build LAMMPS for different hardware. The USER-INTEL package can be compiled for Intel CPUs and KNLs; the KOKKOS package builds for CPUs (OpenMP), GPUs -(Cuda), and Intel KNLs. +(CUDA), and Intel KNLs. Makefile.intel_cpu Makefile.intel_phi diff --git a/doc/src/accelerate_gpu.txt b/doc/src/accelerate_gpu.txt index 2723b6e971..816a31c788 100644 --- a/doc/src/accelerate_gpu.txt +++ b/doc/src/accelerate_gpu.txt @@ -62,7 +62,7 @@ respectively to your input script. [Required hardware/software:] To use this package, you currently need to have an NVIDIA GPU and -install the NVIDIA Cuda software on your system: +install the NVIDIA CUDA software on your system: Check if you have an NVIDIA GPU: cat /proc/driver/nvidia/gpus/0/information Go to http://www.nvidia.com/object/cuda_get.html @@ -85,7 +85,7 @@ The GPU library is in lammps/lib/gpu. Select a Makefile.machine (in lib/gpu) appropriate for your system. You should pay special attention to 3 settings in this makefile. -CUDA_HOME = needs to be where NVIDIA Cuda software is installed on your system +CUDA_HOME = needs to be where NVIDIA CUDA software is installed on your system CUDA_ARCH = needs to be appropriate to your GPUs CUDA_PREC = precision (double, mixed, single) you desire :ul diff --git a/doc/src/accelerate_kokkos.txt b/doc/src/accelerate_kokkos.txt index 712a05300c..8d87751f94 100644 --- a/doc/src/accelerate_kokkos.txt +++ b/doc/src/accelerate_kokkos.txt @@ -113,7 +113,7 @@ To build with Kokkos support for CPUs, your compiler must support the OpenMP interface. You should have one or more multi-core CPUs so that multiple threads can be launched by each MPI task running on a CPU. -To build with Kokkos support for NVIDIA GPUs, NVIDIA Cuda software +To build with Kokkos support for NVIDIA GPUs, NVIDIA CUDA software version 7.5 or later must be installed on your system. See the discussion for the "GPU"_accelerate_gpu.html package for details of how to check and do this. diff --git a/doc/src/suffix.txt b/doc/src/suffix.txt index 7a4adb50b6..74f69b6dfe 100644 --- a/doc/src/suffix.txt +++ b/doc/src/suffix.txt @@ -50,7 +50,7 @@ Intel(R) Xeon Phi(TM) coprocessors. :l KOKKOS = a collection of atom, pair, and fix styles optimized to run using the Kokkos library on various kinds of hardware, including GPUs -via Cuda and many-core chips via OpenMP or threading. :l +via CUDA and many-core chips via OpenMP or threading. :l USER-OMP = a collection of pair, bond, angle, dihedral, improper, kspace, compute, and fix styles with support for OpenMP