ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove trailing whitespace

Browse Source
This commit is contained in:
Richard Berger
2020-04-10 15:10:41 -04:00
parent 1a1db599f6
commit 0608002451
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/gpu/Makefile.hip
View File

@ -1,4 +1,4 @@
# /* ---------------------------------------------------------------------- # /* ----------------------------------------------------------------------
# Generic Linux Makefile for HIP # Generic Linux Makefile for HIP
# - export HIP_PLATFORM=hcc (or nvcc) before execution # - export HIP_PLATFORM=hcc (or nvcc) before execution
# - change HIP_ARCH for your GPU # - change HIP_ARCH for your GPU
@ -16,13 +16,13 @@ LMP_INC = -DLAMMPS_SMALLBIG
HIP_PRECISION = -D_SINGLE_DOUBLE HIP_PRECISION = -D_SINGLE_DOUBLE
HIP_OPTS = -O3 HIP_OPTS = -O3
HIP_HOST_OPTS = -Wno-deprecated-declarations HIP_HOST_OPTS = -Wno-deprecated-declarations
HIP_HOST_INCLUDE = HIP_HOST_INCLUDE =
# use device sort # use device sort
# requires linking with hipcc and hipCUB + (rocPRIM or CUB for AMD or Nvidia respectively) # requires linking with hipcc and hipCUB + (rocPRIM or CUB for AMD or Nvidia respectively)
HIP_HOST_OPTS += -DUSE_HIP_DEVICE_SORT HIP_HOST_OPTS += -DUSE_HIP_DEVICE_SORT
# path to cub # path to cub
HIP_HOST_INCLUDE += -I./ HIP_HOST_INCLUDE += -I./
# path to hipcub # path to hipcub
@ -47,7 +47,7 @@ else ifeq (nvcc,$(HIP_PLATFORM))
HIP_ARCH = -gencode arch=compute_30,code=[sm_30,compute_30] -gencode arch=compute_32,code=[sm_32,compute_32] -gencode arch=compute_35,code=[sm_35,compute_35] \ HIP_ARCH = -gencode arch=compute_30,code=[sm_30,compute_30] -gencode arch=compute_32,code=[sm_32,compute_32] -gencode arch=compute_35,code=[sm_35,compute_35] \
-gencode arch=compute_50,code=[sm_50,compute_50] -gencode arch=compute_52,code=[sm_52,compute_52] -gencode arch=compute_53,code=[sm_53,compute_53]\ -gencode arch=compute_50,code=[sm_50,compute_50] -gencode arch=compute_52,code=[sm_52,compute_52] -gencode arch=compute_53,code=[sm_53,compute_53]\
-gencode arch=compute_60,code=[sm_60,compute_60] -gencode arch=compute_61,code=[sm_61,compute_61] -gencode arch=compute_62,code=[sm_62,compute_62]\ -gencode arch=compute_60,code=[sm_60,compute_60] -gencode arch=compute_61,code=[sm_61,compute_61] -gencode arch=compute_62,code=[sm_62,compute_62]\
-gencode arch=compute_70,code=[sm_70,compute_70] -gencode arch=compute_72,code=[sm_72,compute_72] -gencode arch=compute_75,code=[sm_75,compute_75] -gencode arch=compute_70,code=[sm_70,compute_70] -gencode arch=compute_72,code=[sm_72,compute_72] -gencode arch=compute_75,code=[sm_75,compute_75]
else else
$(error Specify HIP platform using 'export HIP_PLATFORM=(hcc,nvcc)') $(error Specify HIP platform using 'export HIP_PLATFORM=(hcc,nvcc)')
endif endif
@ -59,8 +59,8 @@ AR = ar
BSH = /bin/sh BSH = /bin/sh
# /* ---------------------------------------------------------------------- # /* ----------------------------------------------------------------------
# don't change section below without need # don't change section below without need
# ------------------------------------------------------------------------- */ # ------------------------------------------------------------------------- */
HIP_OPTS += -DUSE_HIP $(HIP_PRECISION) HIP_OPTS += -DUSE_HIP $(HIP_PRECISION)
@ -69,13 +69,13 @@ HIP_GPU_OPTS += $(HIP_OPTS) -I./
ifeq (hcc,$(HIP_PLATFORM)) ifeq (hcc,$(HIP_PLATFORM))
HIP_HOST_OPTS += -fPIC HIP_HOST_OPTS += -fPIC
HIP_GPU_CC = $(HIP_PATH)/bin/hipcc --genco HIP_GPU_CC = $(HIP_PATH)/bin/hipcc --genco
HIP_GPU_OPTS_S = -t="$(HIP_ARCH)" -f=\" HIP_GPU_OPTS_S = -t="$(HIP_ARCH)" -f=\"
HIP_GPU_OPTS_E = \" HIP_GPU_OPTS_E = \"
HIP_KERNEL_SUFFIX = .cpp HIP_KERNEL_SUFFIX = .cpp
HIP_LIBS_TARGET = export HCC_AMDGPU_TARGET := $(HIP_ARCH) HIP_LIBS_TARGET = export HCC_AMDGPU_TARGET := $(HIP_ARCH)
export HCC_AMDGPU_TARGET := $(HIP_ARCH) export HCC_AMDGPU_TARGET := $(HIP_ARCH)
else ifeq (nvcc,$(HIP_PLATFORM)) else ifeq (nvcc,$(HIP_PLATFORM))
HIP_GPU_CC = $(HIP_PATH)/bin/hipcc --fatbin HIP_GPU_CC = $(HIP_PATH)/bin/hipcc --fatbin
HIP_GPU_OPTS += $(HIP_ARCH) HIP_GPU_OPTS += $(HIP_ARCH)
HIP_GPU_SORT_ARCH = $(HIP_ARCH) HIP_GPU_SORT_ARCH = $(HIP_ARCH)
# fix nvcc can't handle -pthread flag # fix nvcc can't handle -pthread flag
@ -100,9 +100,9 @@ CUHS := $(addprefix $(OBJ_DIR)/, $(CUHS))
all: $(OBJ_DIR) $(CUHS) $(LIB_DIR)/libgpu.a $(BIN_DIR)/hip_get_devices all: $(OBJ_DIR) $(CUHS) $(LIB_DIR)/libgpu.a $(BIN_DIR)/hip_get_devices
$(OBJ_DIR): $(OBJ_DIR):
mkdir -p $@ mkdir -p $@
# GPU kernels compilation # GPU kernels compilation
$(OBJ_DIR)/pppm_f_cubin.h: lal_pppm.cu $(ALL_H) $(OBJ_DIR)/pppm_f_cubin.h: lal_pppm.cu $(ALL_H)
@cp $< $(OBJ_DIR)/temp_pppm_f.cu$(HIP_KERNEL_SUFFIX) @cp $< $(OBJ_DIR)/temp_pppm_f.cu$(HIP_KERNEL_SUFFIX)
@ -128,7 +128,7 @@ $(OBJ_DIR)/%_cubin.h: lal_%.cu $(ALL_H)
# host sources compilation # host sources compilation
$(OBJ_DIR)/lal_atom.o: lal_atom.cpp $(CUHS) $(ALL_H) $(OBJ_DIR)/lal_atom.o: lal_atom.cpp $(CUHS) $(ALL_H)
$(HIP_HOST_CC_CMD) -o $@ -c $< -I$(OBJ_DIR) $(HIP_GPU_SORT_ARCH) $(HIP_HOST_CC_CMD) -o $@ -c $< -I$(OBJ_DIR) $(HIP_GPU_SORT_ARCH)
$(OBJ_DIR)/lal_%.o: lal_%.cpp $(CUHS) $(ALL_H) $(OBJ_DIR)/lal_%.o: lal_%.cpp $(CUHS) $(ALL_H)
$(HIP_HOST_CC_CMD) -o $@ -c $< -I$(OBJ_DIR) $(HIP_HOST_CC_CMD) -o $@ -c $< -I$(OBJ_DIR)

20
src/MAKE/OPTIONS/Makefile.hip
View File

@ -7,14 +7,14 @@ SHELL = /bin/sh
# specify flags and libraries needed for your compiler # specify flags and libraries needed for your compiler
CC = mpicxx CC = mpicxx
CCFLAGS = -g -O3 CCFLAGS = -g -O3
SHFLAGS = -fPIC SHFLAGS = -fPIC
DEPFLAGS = -M DEPFLAGS = -M
HIP_PATH ?= $(wildcard /opt/rocm/hip) HIP_PATH ?= $(wildcard /opt/rocm/hip)
LINK = $(HIP_PATH)/bin/hipcc LINK = $(HIP_PATH)/bin/hipcc
LINKFLAGS = -g -O3 $(shell mpicxx --showme:link) LINKFLAGS = -g -O3 $(shell mpicxx --showme:link)
LIB = LIB =
SIZE = size SIZE = size
ARCHIVE = ar ARCHIVE = ar
@ -41,8 +41,8 @@ LMP_INC = -DLAMMPS_GZIP -DLAMMPS_MEMALIGN=64
# LIB = name of MPI library # LIB = name of MPI library
MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1 MPI_INC = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX=1
MPI_PATH = MPI_PATH =
MPI_LIB = MPI_LIB =
# FFT library # FFT library
# see discussion in Section 2.2 (step 6) of manual # see discussion in Section 2.2 (step 6) of manual
@ -51,9 +51,9 @@ MPI_LIB =
# PATH = path for FFT library # PATH = path for FFT library
# LIB = name of FFT library # LIB = name of FFT library
FFT_INC = FFT_INC =
FFT_PATH = FFT_PATH =
FFT_LIB = FFT_LIB =
# JPEG and/or PNG library # JPEG and/or PNG library
# see discussion in Section 2.2 (step 7) of manual # see discussion in Section 2.2 (step 7) of manual
@ -62,9 +62,9 @@ FFT_LIB =
# PATH = path(s) for JPEG library and/or PNG library # PATH = path(s) for JPEG library and/or PNG library
# LIB = name(s) of JPEG library and/or PNG library # LIB = name(s) of JPEG library and/or PNG library
JPG_INC = JPG_INC =
JPG_PATH = JPG_PATH =
JPG_LIB = JPG_LIB =
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# build rules and dependencies # build rules and dependencies