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

Fixed missing commas in the argument list of the macros in amoeba and hippo cu files, added amoeba_convolution_gpu.cpp and .h to the source file list in GPU.cmake

Browse Source
This commit is contained in:
ndtrung
2022-09-23 11:53:09 -05:00
parent 785131932c
commit 166701f13a
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Modules/Packages/GPU.cmake
View File

@ -3,7 +3,9 @@ set(GPU_SOURCES ${GPU_SOURCES_DIR}/gpu_extra.h
${GPU_SOURCES_DIR}/fix_gpu.h ${GPU_SOURCES_DIR}/fix_gpu.h
${GPU_SOURCES_DIR}/fix_gpu.cpp ${GPU_SOURCES_DIR}/fix_gpu.cpp
${GPU_SOURCES_DIR}/fix_nh_gpu.h ${GPU_SOURCES_DIR}/fix_nh_gpu.h
${GPU_SOURCES_DIR}/fix_nh_gpu.cpp) ${GPU_SOURCES_DIR}/fix_nh_gpu.cpp
${GPU_SOURCES_DIR}/amoeba_convolution_gpu.h
${GPU_SOURCES_DIR}/amoeba_convolution_gpu.cpp)
target_compile_definitions(lammps PRIVATE -DLMP_GPU) target_compile_definitions(lammps PRIVATE -DLMP_GPU)
set(GPU_API "opencl" CACHE STRING "API used by GPU package") set(GPU_API "opencl" CACHE STRING "API used by GPU package")

2
lib/gpu/lal_amoeba.cu
View File

@ -158,7 +158,7 @@ _texture( q_tex,int2);
fieldp[ii+inum] = fp; \ fieldp[ii+inum] = fp; \
} }
#define store_answers_acc(f,energy,e_coul, virial, ii, inum, tid, t_per_atom \ #define store_answers_acc(f,energy,e_coul, virial, ii, inum, tid, t_per_atom, \
offset, eflag, vflag, ans, engv, ev_stride) \ offset, eflag, vflag, ans, engv, ev_stride) \
if (t_per_atom>1) { \ if (t_per_atom>1) { \
simd_reduce_add3(t_per_atom, red_acc, offset, tid, f.x, f.y, f.z); \ simd_reduce_add3(t_per_atom, red_acc, offset, tid, f.x, f.y, f.z); \

2
lib/gpu/lal_hippo.cu
View File

@ -158,7 +158,7 @@ _texture( q_tex,int2);
fieldp[ii+inum] = fp; \ fieldp[ii+inum] = fp; \
} }
#define store_answers_acc(f,energy,e_coul, virial, ii, inum, tid, t_per_atom \ #define store_answers_acc(f,energy,e_coul, virial, ii, inum, tid, t_per_atom, \
offset, eflag, vflag, ans, engv, ev_stride) \ offset, eflag, vflag, ans, engv, ev_stride) \
if (t_per_atom>1) { \ if (t_per_atom>1) { \
simd_reduce_add3(t_per_atom, red_acc, offset, tid, f.x, f.y, f.z); \ simd_reduce_add3(t_per_atom, red_acc, offset, tid, f.x, f.y, f.z); \