Merge pull request #643 from andeplane/gpu_opencl_compile_fix (e9277946) · Commits · 郑智淋 / lammps

lib/gpu/lal_sw.cu

+4 −4

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ __kernel void k_sw(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int nbor, nbor_end, i, numj;
		const int* nbor_mem = dev_packed;
		const __global int* nbor_mem = dev_packed;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
		n_stride,nbor_end,nbor);

		@@ -428,7 +428,7 @@ __kernel void k_sw_three_center(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end;
		const int* nbor_mem = dev_packed;
		const __global int* nbor_mem = dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);
		@@ -570,7 +570,7 @@ __kernel void k_sw_three_end(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end, k_end;
		const int* nbor_mem = dev_packed;
		const __global int* nbor_mem = dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);
		@@ -724,7 +724,7 @@ __kernel void k_sw_three_end_vatom(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end, k_end;
		const int* nbor_mem = dev_packed;
		const __global int* nbor_mem = dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);

lib/gpu/lal_tersoff.cu

+5 −5

Original line number	Diff line number	Diff line
		@@ -272,7 +272,7 @@ __kernel void k_tersoff_zeta(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int nbor_j, nbor_end, i, numj;
		const int* nbor_mem=dev_packed;
		const __global int* nbor_mem=dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);
		@@ -433,7 +433,7 @@ __kernel void k_tersoff_repulsive(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int nbor, nbor_end, i, numj;
		const int* nbor_mem=dev_packed;
		const __global int* nbor_mem=dev_packed;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
		n_stride,nbor_end,nbor);

		@@ -545,7 +545,7 @@ __kernel void k_tersoff_three_center(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end;
		const int* nbor_mem=dev_packed;
		const __global int* nbor_mem=dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);
		@@ -732,7 +732,7 @@ __kernel void k_tersoff_three_end(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end, k_end;
		const int* nbor_mem=dev_packed;
		const __global int* nbor_mem=dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);
		@@ -977,7 +977,7 @@ __kernel void k_tersoff_three_end_vatom(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end, k_end;
		const int* nbor_mem = dev_packed;
		const __global int* nbor_mem = dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);

lib/gpu/lal_vashishta.cu

+3 −3

Original line number	Diff line number	Diff line
		@@ -436,7 +436,7 @@ __kernel void k_vashishta_three_center(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end;
		const int* nbor_mem = dev_packed;
		const __global int* nbor_mem = dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);
		@@ -580,7 +580,7 @@ __kernel void k_vashishta_three_end(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end, k_end;
		const int* nbor_mem = dev_packed;
		const __global int* nbor_mem = dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);
		@@ -735,7 +735,7 @@ __kernel void k_vashishta_three_end_vatom(const __global numtyp4 *restrict x_,

		if (ii<inum) {
		int i, numj, nbor_j, nbor_end, k_end;
		const int* nbor_mem = dev_packed;
		const __global int* nbor_mem = dev_packed;
		int offset_j=offset/t_per_atom;
		nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset_j,i,numj,
		n_stride,nbor_end,nbor_j);

Admin message