Merge pull request #1807 from ndtrung81/gpu-readme-update

Updates to README and Makefile's in the GPU package
lammps · Dec 19, 2019 · 8283e68 · 8283e68
2 parents 27180e0 + 4c3ec14
commit 8283e68
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/lib/gpu/Makefile.lammps.standard b/lib/gpu/Makefile.lammps.standard
@@ -7,5 +7,5 @@ endif
 
 gpu_SYSINC =
 gpu_SYSLIB =  -lcudart -lcuda
-gpu_SYSPATH = -L$(CUDA_HOME)/lib64
+gpu_SYSPATH = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs
 
diff --git a/lib/gpu/Makefile.linux b/lib/gpu/Makefile.linux
@@ -54,7 +54,7 @@ LMP_INC = -DLAMMPS_SMALLBIG
 CUDA_PRECISION = -D_SINGLE_DOUBLE
 
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib64
+CUDA_LIB = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs
 CUDA_OPTS = -DUNIX -O3 --use_fast_math $(LMP_INC) -Xcompiler -fPIC
 
 CUDR_CPP = mpicxx -DMPI_GERYON -DUCL_NO_EXIT -DMPICH_IGNORE_CXX_SEEK -DOMPI_SKIP_MPICXX=1 -fPIC

diff --git a/lib/gpu/Makefile.linux.double b/lib/gpu/Makefile.linux.double
@@ -32,7 +32,7 @@ LMP_INC = -DLAMMPS_SMALLBIG
 CUDA_PRECISION = -D_DOUBLE_DOUBLE
 
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib64
+CUDA_LIB = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs
 CUDA_OPTS = -DUNIX -O3 --use_fast_math
 
 CUDR_CPP = mpic++ -DMPI_GERYON -DUCL_NO_EXIT -DMPICH_IGNORE_CXX_SEEK

diff --git a/lib/gpu/Makefile.linux.mixed b/lib/gpu/Makefile.linux.mixed
@@ -32,7 +32,7 @@ LMP_INC = -DLAMMPS_SMALLBIG
 CUDA_PRECISION = -D_SINGLE_DOUBLE
 
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib64
+CUDA_LIB = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs
 CUDA_OPTS = -DUNIX -O3 --use_fast_math
 
 CUDR_CPP = mpic++ -DMPI_GERYON -DUCL_NO_EXIT -DMPICH_IGNORE_CXX_SEEK

diff --git a/lib/gpu/Makefile.linux.single b/lib/gpu/Makefile.linux.single
@@ -32,7 +32,7 @@ LMP_INC = -DLAMMPS_SMALLBIG
 CUDA_PRECISION = -D_SINGLE_SINGLE
 
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib64
+CUDA_LIB = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs
 CUDA_OPTS = -DUNIX -O3 --use_fast_math
 
 CUDR_CPP = mpic++ -DMPI_GERYON -DUCL_NO_EXIT -DMPICH_IGNORE_CXX_SEEK

diff --git a/lib/gpu/Makefile.linux_multi b/lib/gpu/Makefile.linux_multi
@@ -40,7 +40,7 @@ LMP_INC = -DLAMMPS_SMALLBIG
 CUDA_PRECISION = -D_SINGLE_DOUBLE
 
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib64
+CUDA_LIB = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs
 CUDA_OPTS = -DUNIX -O3 --use_fast_math $(LMP_INC) -Xcompiler "-fPIC -std=c++98"
 
 CUDR_CPP = mpicxx -DMPI_GERYON -DUCL_NO_EXIT -DMPICH_IGNORE_CXX_SEEK -DOMPI_SKIP_MPICXX=1 -fPIC

diff --git a/lib/gpu/Makefile.mac b/lib/gpu/Makefile.mac
@@ -14,7 +14,7 @@ NVCC = nvcc -m64
 CUDA_ARCH = -arch=sm_11
 CUDA_PRECISION = -D_SINGLE_SINGLE
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib
+CUDA_LIB = -L$(CUDA_HOME)/lib -L$(CUDA_HOME)/lib/stubs
 CUDA_OPTS = -DUNIX -DUCL_NO_EXIT -O3 --use_fast_math
 
 CUDR_CPP = mpic++ -m64

diff --git a/lib/gpu/Makefile.serial b/lib/gpu/Makefile.serial
@@ -34,7 +34,7 @@ LMP_INC = -DLAMMPS_SMALLBIG
 CUDA_PRECISION = -D_SINGLE_DOUBLE
 
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib64 -L../../src/STUBS -lmpi_stubs
+CUDA_LIB = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs -L../../src/STUBS -lmpi_stubs
 CUDA_OPTS = -DUNIX -O3 --use_fast_math $(LMP_INC)
 
 CUDR_CPP = g++ -DMPI_GERYON -DUCL_NO_EXIT -fPIC -I../../src/STUBS

diff --git a/lib/gpu/Makefile.shannon b/lib/gpu/Makefile.shannon
@@ -32,7 +32,7 @@ LMP_INC = -DLAMMPS_SMALLBIG
 CUDA_PRECISION = -D_DOUBLE_DOUBLE
 
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib64
+CUDA_LIB = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs
 CUDA_OPTS = -DUNIX -O3 --use_fast_math
 
 CUDR_CPP = mpic++ -DMPI_GERYON -DUCL_NO_EXIT -DMPICH_IGNORE_CXX_SEEK

diff --git a/lib/gpu/Makefile.xk7 b/lib/gpu/Makefile.xk7
@@ -14,7 +14,7 @@ CUDA_ARCH = -arch=sm_35
 
 CUDA_PRECISION = -D_SINGLE_DOUBLE
 CUDA_INCLUDE = -I$(CUDA_HOME)/include
-CUDA_LIB = -L$(CUDA_HOME)/lib64
+CUDA_LIB = -L$(CUDA_HOME)/lib64 -L$(CUDA_HOME)/lib64/stubs
 CUDA_OPTS = -DUNIX -O3 --use_fast_math
 
 CUDR_CPP = CC -DCUDA_PROXY -DMPI_GERYON -DUCL_NO_EXIT -DMPICH_IGNORE_CXX_SEEK

diff --git a/lib/gpu/README b/lib/gpu/README
@@ -3,7 +3,7 @@
                   --------------------------------
 
                        W. Michael Brown (ORNL)
-                        Trung Dac Nguyen (ORNL)
+                        Trung Dac Nguyen (ORNL/Northwestern)
                           Peng Wang (NVIDIA)
                        Axel Kohlmeyer (Temple)
                          Steve Plimpton (SNL)
@@ -129,7 +129,8 @@ that ships with the CUDA toolkit, but also with the CUDA driver library
 on the head node of a GPU cluster, this library may not be installed,
 so you may need to copy it over from one of the compute nodes (best into
 this directory). Recent CUDA toolkits starting from CUDA 9 provide a dummy
-libcuda.so library, that can be used for linking (but not for running).
+libcuda.so library (typically under $(CUDA_HOME)/lib64/stubs), that can be used for
+linking.
 
 The gpu library supports 3 precision modes as determined by 
 the CUDA_PRECISION variable: