Merge branch 'merge-gpu-patch' into lammps-icms
d8670ba7e328
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 24 2016, 20:31.

Description

Merge branch 'merge-gpu-patch' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 24 2016, 20:31

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS7c016aee735e: remove trailing whitespace and replace tabs with spaces in gpu library and…
rLAMMPS1bfe3a3ff5ba: Merge branch 'merge-pull-100' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd8670ba7e328: Merge branch 'merge-gpu-patch' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 24 2016, 20:31

Merged Changes

Commit	Author	Details	Committed
7c016aee735e	Axel Kohlmeyer	remove trailing whitespace and replace tabs with spaces in gpu library and…	Jun 24 2016
b56bdd2d7bf3	Axel Kohlmeyer	remove trailing whitespace in gpu library	Jun 24 2016
bc8c50615c6d	Axel Kohlmeyer	include patch from trung that addresses issues when using manybody potentials…	Jun 24 2016

Changes (249)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			lib/gpu/Makefile.linux
	M			lib/gpu/geryon/nvd_device.h
	M			lib/gpu/geryon/nvd_kernel.h
	M			lib/gpu/geryon/nvd_mat.h
	M			lib/gpu/geryon/nvd_memory.h
	M			lib/gpu/geryon/nvd_texture.h
	M			lib/gpu/geryon/nvd_timer.h
	M			lib/gpu/geryon/ocl_device.h
	M			lib/gpu/geryon/ocl_kernel.h
	M			lib/gpu/geryon/ocl_mat.h
	M			lib/gpu/geryon/ocl_memory.h
	M			lib/gpu/geryon/ocl_texture.h
	M			lib/gpu/geryon/ocl_timer.h
	M			lib/gpu/geryon/ucl_arg_kludge.h
	M			lib/gpu/geryon/ucl_basemat.h
	M			lib/gpu/geryon/ucl_copy.h
	M			lib/gpu/geryon/ucl_d_mat.h
	M			lib/gpu/geryon/ucl_d_vec.h
	M			lib/gpu/geryon/ucl_h_mat.h
	M			lib/gpu/geryon/ucl_h_vec.h
	M			lib/gpu/geryon/ucl_matrix.h
	M			lib/gpu/geryon/ucl_nv_kernel.h
	M			lib/gpu/geryon/ucl_print.h
	M			lib/gpu/geryon/ucl_s_obj_help.h
	M			lib/gpu/geryon/ucl_types.h
	M			lib/gpu/geryon/ucl_vector.h
	M			lib/gpu/lal_answer.cpp
	M			lib/gpu/lal_atom.cpp
	M			lib/gpu/lal_atom.cu
	M			lib/gpu/lal_atom.h
	M			lib/gpu/lal_balance.h
	M			lib/gpu/lal_base_atomic.cpp
	M			lib/gpu/lal_base_atomic.h
	M			lib/gpu/lal_base_charge.cpp
	M			lib/gpu/lal_base_charge.h
	M			lib/gpu/lal_base_dipole.cpp
	M			lib/gpu/lal_base_dipole.h
	M			lib/gpu/lal_base_dpd.cpp
	M			lib/gpu/lal_base_dpd.h
	M			lib/gpu/lal_base_ellipsoid.cpp
	M			lib/gpu/lal_base_ellipsoid.h
	M			lib/gpu/lal_base_three.cpp
	M			lib/gpu/lal_base_three.h
	M			lib/gpu/lal_beck.cpp
	M			lib/gpu/lal_beck.cu
	M			lib/gpu/lal_beck.h
	M			lib/gpu/lal_beck_ext.cpp
	M			lib/gpu/lal_born.cpp
	M			lib/gpu/lal_born.cu
	M			lib/gpu/lal_born.h
	M			lib/gpu/lal_born_coul_long.cpp
	M			lib/gpu/lal_born_coul_long.cu
	M			lib/gpu/lal_born_coul_long.h
	M			lib/gpu/lal_born_coul_long_ext.cpp
	M			lib/gpu/lal_born_coul_wolf.cpp
	M			lib/gpu/lal_born_coul_wolf.cu
	M			lib/gpu/lal_born_coul_wolf.h
	M			lib/gpu/lal_born_coul_wolf_ext.cpp
	M			lib/gpu/lal_born_ext.cpp
	M			lib/gpu/lal_buck.cpp
	M			lib/gpu/lal_buck.cu
	M			lib/gpu/lal_buck.h
	M			lib/gpu/lal_buck_coul.cpp
	M			lib/gpu/lal_buck_coul.cu
	M			lib/gpu/lal_buck_coul.h
	M			lib/gpu/lal_buck_coul_ext.cpp
	M			lib/gpu/lal_buck_coul_long.cpp
	M			lib/gpu/lal_buck_coul_long.cu
	M			lib/gpu/lal_buck_coul_long.h
	M			lib/gpu/lal_buck_coul_long_ext.cpp
	M			lib/gpu/lal_buck_ext.cpp
	M			lib/gpu/lal_cg_cmm.cpp
	M			lib/gpu/lal_cg_cmm.cu
	M			lib/gpu/lal_cg_cmm.h
	M			lib/gpu/lal_cg_cmm_ext.cpp
	M			lib/gpu/lal_cg_cmm_long.cpp
	M			lib/gpu/lal_cg_cmm_long.cu
	M			lib/gpu/lal_cg_cmm_long.h
	M			lib/gpu/lal_cg_cmm_long_ext.cpp
	M			lib/gpu/lal_charmm_long.cpp
	M			lib/gpu/lal_charmm_long.cu
	M			lib/gpu/lal_charmm_long.h
	M			lib/gpu/lal_charmm_long_ext.cpp
	M			lib/gpu/lal_colloid.cpp
	M			lib/gpu/lal_colloid.cu
	M			lib/gpu/lal_colloid.h
	M			lib/gpu/lal_colloid_ext.cpp
	M			lib/gpu/lal_coul.cpp
	M			lib/gpu/lal_coul.cu
	M			lib/gpu/lal_coul.h
	M			lib/gpu/lal_coul_debye.cpp
	M			lib/gpu/lal_coul_debye.cu
	M			lib/gpu/lal_coul_debye.h
	M			lib/gpu/lal_coul_debye_ext.cpp
	M			lib/gpu/lal_coul_dsf.cpp
	M			lib/gpu/lal_coul_dsf.cu
	M			lib/gpu/lal_coul_dsf.h
	M			lib/gpu/lal_coul_dsf_ext.cpp
	M			lib/gpu/lal_coul_ext.cpp
	M			lib/gpu/lal_coul_long.cpp
	M			lib/gpu/lal_coul_long.cu
	M			lib/gpu/lal_coul_long.h
	M			lib/gpu/lal_coul_long_ext.cpp
	M			lib/gpu/lal_device.cpp
	M			lib/gpu/lal_device.cu
	M			lib/gpu/lal_device.h
	M			lib/gpu/lal_dipole_lj.cpp
	M			lib/gpu/lal_dipole_lj.cu
	M			lib/gpu/lal_dipole_lj.h
	M			lib/gpu/lal_dipole_lj_ext.cpp
	M			lib/gpu/lal_dipole_lj_sf.cpp
	M			lib/gpu/lal_dipole_lj_sf.cu
	M			lib/gpu/lal_dipole_lj_sf.h
	M			lib/gpu/lal_dipole_lj_sf_ext.cpp
	M			lib/gpu/lal_dpd.cpp
	M			lib/gpu/lal_dpd.cu
	M			lib/gpu/lal_dpd.h
	M			lib/gpu/lal_dpd_ext.cpp
	M			lib/gpu/lal_eam.cpp
	M			lib/gpu/lal_eam.cu
	M			lib/gpu/lal_eam.h
	M			lib/gpu/lal_eam_alloy_ext.cpp
	M			lib/gpu/lal_eam_ext.cpp
	M			lib/gpu/lal_eam_fs_ext.cpp
	M			lib/gpu/lal_ellipsoid_extra.h
	M			lib/gpu/lal_ellipsoid_nbor.cu
	M			lib/gpu/lal_gauss.cpp
	M			lib/gpu/lal_gauss.cu
	M			lib/gpu/lal_gauss.h
	M			lib/gpu/lal_gauss_ext.cpp
	M			lib/gpu/lal_gayberne.cpp
	M			lib/gpu/lal_gayberne.cu
	M			lib/gpu/lal_gayberne.h
	M			lib/gpu/lal_gayberne_ext.cpp
	M			lib/gpu/lal_gayberne_lj.cu
	M			lib/gpu/lal_lj.cpp
	M			lib/gpu/lal_lj.cu
	M			lib/gpu/lal_lj.h
	M			lib/gpu/lal_lj96.cpp
	M			lib/gpu/lal_lj96.cu
	M			lib/gpu/lal_lj96.h
	M			lib/gpu/lal_lj96_ext.cpp
	M			lib/gpu/lal_lj_class2_long.cpp
	M			lib/gpu/lal_lj_class2_long.cu
	M			lib/gpu/lal_lj_class2_long.h
	M			lib/gpu/lal_lj_class2_long_ext.cpp
	M			lib/gpu/lal_lj_coul.cpp
	M			lib/gpu/lal_lj_coul.cu
	M			lib/gpu/lal_lj_coul.h
	M			lib/gpu/lal_lj_coul_debye.cpp
	M			lib/gpu/lal_lj_coul_debye.cu
	M			lib/gpu/lal_lj_coul_debye.h
	M			lib/gpu/lal_lj_coul_debye_ext.cpp
	M			lib/gpu/lal_lj_coul_ext.cpp
	M			lib/gpu/lal_lj_coul_long.cpp
	M			lib/gpu/lal_lj_coul_long.cu
	M			lib/gpu/lal_lj_coul_long.h
	M			lib/gpu/lal_lj_coul_long_ext.cpp
	M			lib/gpu/lal_lj_coul_msm.cpp
	M			lib/gpu/lal_lj_coul_msm.cu
	M			lib/gpu/lal_lj_coul_msm.h
	M			lib/gpu/lal_lj_coul_msm_ext.cpp
	M			lib/gpu/lal_lj_cubic.cpp
	M			lib/gpu/lal_lj_cubic.cu
	M			lib/gpu/lal_lj_cubic.h
	M			lib/gpu/lal_lj_cubic_ext.cpp
	M			lib/gpu/lal_lj_dsf.cpp
	M			lib/gpu/lal_lj_dsf.cu
	M			lib/gpu/lal_lj_dsf.h
	M			lib/gpu/lal_lj_dsf_ext.cpp
	M			lib/gpu/lal_lj_expand.cpp
	M			lib/gpu/lal_lj_expand.cu
	M			lib/gpu/lal_lj_expand.h
	M			lib/gpu/lal_lj_expand_ext.cpp
	M			lib/gpu/lal_lj_ext.cpp
	M			lib/gpu/lal_lj_gromacs.cpp
	M			lib/gpu/lal_lj_gromacs.cu
	M			lib/gpu/lal_lj_gromacs.h
	M			lib/gpu/lal_lj_gromacs_ext.cpp
	M			lib/gpu/lal_mie.cpp
	M			lib/gpu/lal_mie.cu
	M			lib/gpu/lal_mie.h
	M			lib/gpu/lal_mie_ext.cpp
	M			lib/gpu/lal_morse.cpp
	M			lib/gpu/lal_morse.cu
	M			lib/gpu/lal_morse.h
	M			lib/gpu/lal_morse_ext.cpp
	M			lib/gpu/lal_neighbor.cpp
	M			lib/gpu/lal_neighbor.h
	M			lib/gpu/lal_neighbor_cpu.cu
	M			lib/gpu/lal_neighbor_gpu.cu
	M			lib/gpu/lal_neighbor_shared.cpp
	M			lib/gpu/lal_neighbor_shared.h
	M			lib/gpu/lal_pppm.cpp
	M			lib/gpu/lal_pppm.cu
	M			lib/gpu/lal_pppm.h
	M			lib/gpu/lal_pppm_ext.cpp
	M			lib/gpu/lal_precision.h
	M			lib/gpu/lal_preprocessor.h
	M			lib/gpu/lal_re_squared.cpp
	M			lib/gpu/lal_re_squared.cu
	M			lib/gpu/lal_re_squared.h
	M			lib/gpu/lal_re_squared_ext.cpp
	M			lib/gpu/lal_re_squared_lj.cu
	M			lib/gpu/lal_soft.cpp
	M			lib/gpu/lal_soft.cu
	M			lib/gpu/lal_soft.h
	M			lib/gpu/lal_soft_ext.cpp
	M			lib/gpu/lal_sw.cpp
	M			lib/gpu/lal_sw.cu
	M			lib/gpu/lal_sw.h
	M			lib/gpu/lal_sw_ext.cpp
	M			lib/gpu/lal_table.cpp
	M			lib/gpu/lal_table.cu
	M			lib/gpu/lal_table.h
	M			lib/gpu/lal_table_ext.cpp
	M			lib/gpu/lal_tersoff.cpp
	M			lib/gpu/lal_tersoff.cu
	M			lib/gpu/lal_tersoff_ext.cpp
	M			lib/gpu/lal_tersoff_extra.h
	M			lib/gpu/lal_tersoff_mod.cpp
	M			lib/gpu/lal_tersoff_mod.cu
	M			lib/gpu/lal_tersoff_mod_ext.cpp
	M			lib/gpu/lal_tersoff_mod_extra.h
	M			lib/gpu/lal_tersoff_zbl.cpp
	M			lib/gpu/lal_tersoff_zbl.cu
	M			lib/gpu/lal_tersoff_zbl_ext.cpp
	M			lib/gpu/lal_tersoff_zbl_extra.h
	M			lib/gpu/lal_yukawa.cpp
	M			lib/gpu/lal_yukawa.cu
	M			lib/gpu/lal_yukawa.h
	M			lib/gpu/lal_yukawa_colloid.cpp
	M			lib/gpu/lal_yukawa_colloid.cu
	M			lib/gpu/lal_yukawa_colloid.h
	M			lib/gpu/lal_yukawa_colloid_ext.cpp
	M			lib/gpu/lal_yukawa_ext.cpp
	M			lib/gpu/lal_zbl.cpp
	M			lib/gpu/lal_zbl.cu
	M			lib/gpu/lal_zbl.h
	M			lib/gpu/lal_zbl_ext.cpp
	M			src/GPU/pair_born_coul_long_gpu.cpp
	M			src/GPU/pair_born_coul_wolf_gpu.cpp
	M			src/GPU/pair_born_gpu.cpp
	M			src/GPU/pair_lj_gromacs_gpu.cpp
	M			src/GPU/pair_sw_gpu.cpp
	M			src/GPU/pair_tersoff_gpu.cpp
	M			src/GPU/pair_tersoff_mod_gpu.cpp
	M			src/GPU/pair_tersoff_zbl_gpu.cpp
	M			src/GPU/pair_zbl_gpu.cpp