jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6960 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2011-09-14 19:55:01 +00:00
parent 68006592f7
commit 1e7562efc2
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cuda/Makefile.common
View File

@ -14,7 +14,7 @@ SHELL = /bin/sh
# System-specific settings
CUDA_INSTALL_PATH = /usr/local/cuda-3.2
CUDA_INSTALL_PATH = /usr/local/cuda
# e.g. in Gentoo
# CUDA_INSTALL_PATH = /opt/cuda
@ -35,8 +35,8 @@ endif
#shell echo "Compiling with precision = " ${precision} ", arch = " ${arch} ", cufft = " ${cufft} ", dbg = " ${dbg} ", prec_timer = " ${prec_timer}
CUDA_FLAGS := -DUNIX
CUDA_USRLIB_CONDITIONAL :=
CUDA_FLAGS := -I${CUDA_INSTALL_PATH}/include -DUNIX
CUDA_USRLIB_CONDITIONAL := -L${CUDA_INSTALL_PATH}/lib -L${CUDA_INSTALL_PATH}/lib64
# debug setting
ifeq ($(strip $(dbg)), 1)

5
lib/cuda/Makefile.cudalib
View File

@ -45,6 +45,11 @@ endif
include Makefile.common
tmp := $(shell sed -i '2 d' Makefile.lammps)
tmp := $(shell sed -i '2 d' Makefile.lammps)
tmp := $(shell sed -i '1a CUDA_FLAGS := ${CUDA_FLAGS}' Makefile.lammps)
tmp := $(shell sed -i '2a CUDA_USRLIB_CONDITIONAL := ${CUDA_USRLIB_CONDITIONAL}' Makefile.lammps)
# verbose nvcc output during compilation
ifeq ($(verbose), 1)
VERBOSE :=

12
lib/cuda/Makefile.lammps
View File

@ -1,8 +1,8 @@
# Settings that the LAMMPS build will import when this package library is used
CUDA_FLAGS = -I/usr/local/cuda/include -I../../lib/cuda -DUNIX -DFFT_CUFFT -DCUDA_PRECISION=1 -DCUDA_ARCH=20
CUDA_USRLIB_CONDITIONAL = -L/usr/local/cuda/lib -L/usr/local/cuda/lib64 -lcufft
user-cuda_SYSINC = ${CUDA_FLAGS}
user-cuda_SYSLIB = -lcuda -lcudart -lrt
user-cuda_SYSPATH = $(CUDA_USRLIB_CONDITIONAL)
CUDA_INSTALL_PATH = /usr/local/cuda
CUDA_USRLIB_CONDITIONAL =
user-cuda_SYSINC = -I$(CUDA_INSTALL_PATH)/include
user-cuda_SYSLIB = -lcuda -lcudart -lrt
user-cuda_SYSPATH = -L$(CUDA_INSTALL_PATH)/lib64 -L$(CUDA_INSTALL_PATH)/lib $(CUDA_USRLIB_CONDITIONAL)