Feb2021 GPU Package Update - GPU Package Files

This commit is contained in:
Michael Brown
2021-02-15 08:20:50 -08:00
parent 16004e8f45
commit e7e2d2323b
345 changed files with 13424 additions and 7708 deletions

View File

@ -38,16 +38,19 @@ __kernel void k_lj(const __global numtyp4 *restrict x_,
int tid, ii, offset;
atom_info(t_per_atom,ii,tid,offset);
acctyp energy=(acctyp)0;
int n_stride;
local_allocate_store_pair();
acctyp4 f;
f.x=(acctyp)0; f.y=(acctyp)0; f.z=(acctyp)0;
acctyp virial[6];
for (int i=0; i<6; i++)
virial[i]=(acctyp)0;
acctyp energy, virial[6];
if (EVFLAG) {
energy=(acctyp)0;
for (int i=0; i<6; i++) virial[i]=(acctyp)0;
}
if (ii<inum) {
int i, numj, nbor, nbor_end;
__local int n_stride;
nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
n_stride,nbor_end,nbor);
@ -81,11 +84,11 @@ __kernel void k_lj(const __global numtyp4 *restrict x_,
f.y+=dely*force;
f.z+=delz*force;
if (eflag>0) {
if (EVFLAG && eflag) {
numtyp e=r6inv*(lj3[mtype].x*r6inv-lj3[mtype].y);
energy+=factor_lj*(e-lj3[mtype].z);
}
if (vflag>0) {
if (EVFLAG && vflag) {
virial[0] += delx*delx*force;
virial[1] += dely*dely*force;
virial[2] += delz*delz*force;
@ -96,9 +99,9 @@ __kernel void k_lj(const __global numtyp4 *restrict x_,
}
} // for nbor
store_answers(f,energy,virial,ii,inum,tid,t_per_atom,offset,eflag,vflag,
ans,engv);
} // if ii
store_answers(f,energy,virial,ii,inum,tid,t_per_atom,offset,eflag,vflag,
ans,engv);
}
__kernel void k_lj_fast(const __global numtyp4 *restrict x_,
@ -114,6 +117,7 @@ __kernel void k_lj_fast(const __global numtyp4 *restrict x_,
int tid, ii, offset;
atom_info(t_per_atom,ii,tid,offset);
#ifndef ONETYPE
__local numtyp4 lj1[MAX_SHARED_TYPES*MAX_SHARED_TYPES];
__local numtyp4 lj3[MAX_SHARED_TYPES*MAX_SHARED_TYPES];
__local numtyp sp_lj[4];
@ -121,38 +125,58 @@ __kernel void k_lj_fast(const __global numtyp4 *restrict x_,
sp_lj[tid]=sp_lj_in[tid];
if (tid<MAX_SHARED_TYPES*MAX_SHARED_TYPES) {
lj1[tid]=lj1_in[tid];
if (eflag>0)
if (EVFLAG && eflag)
lj3[tid]=lj3_in[tid];
}
__syncthreads();
#else
const numtyp lj1x=lj1_in[ONETYPE].x;
const numtyp lj1y=lj1_in[ONETYPE].y;
const numtyp cutsq=lj1_in[ONETYPE].z;
numtyp lj3x, lj3y, lj3z;
if (EVFLAG && eflag) {
lj3x=lj3_in[ONETYPE].x;
lj3y=lj3_in[ONETYPE].y;
lj3z=lj3_in[ONETYPE].z;
}
#endif
int n_stride;
local_allocate_store_pair();
acctyp energy=(acctyp)0;
acctyp4 f;
f.x=(acctyp)0; f.y=(acctyp)0; f.z=(acctyp)0;
acctyp virial[6];
for (int i=0; i<6; i++)
virial[i]=(acctyp)0;
__syncthreads();
acctyp energy, virial[6];
if (EVFLAG) {
energy=(acctyp)0;
for (int i=0; i<6; i++) virial[i]=(acctyp)0;
}
if (ii<inum) {
int i, numj, nbor, nbor_end;
__local int n_stride;
nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
n_stride,nbor_end,nbor);
numtyp4 ix; fetch4(ix,i,pos_tex); //x_[i];
#ifndef ONETYPE
int iw=ix.w;
int itype=fast_mul((int)MAX_SHARED_TYPES,iw);
numtyp factor_lj;
for ( ; nbor<nbor_end; nbor+=n_stride) {
#endif
NOUNROLL
for ( ; nbor<nbor_end; nbor+=n_stride) {
int j=dev_packed[nbor];
#ifndef ONETYPE
factor_lj = sp_lj[sbmask(j)];
j &= NEIGHMASK;
#endif
numtyp4 jx; fetch4(jx,j,pos_tex); //x_[j];
#ifndef ONETYPE
int mtype=itype+jx.w;
numtyp cutsq=lj1[mtype].z;
#endif
// Compute r12
numtyp delx = ix.x-jx.x;
@ -160,20 +184,37 @@ __kernel void k_lj_fast(const __global numtyp4 *restrict x_,
numtyp delz = ix.z-jx.z;
numtyp r2inv = delx*delx+dely*dely+delz*delz;
if (r2inv<lj1[mtype].z) {
if (r2inv<cutsq) {
#ifndef ONETYPE
numtyp lj1x=lj1[mtype].x;
numtyp lj1y=lj1[mtype].y;
#endif
r2inv=ucl_recip(r2inv);
numtyp r6inv = r2inv*r2inv*r2inv;
numtyp force = factor_lj*r2inv*r6inv*(lj1[mtype].x*r6inv-lj1[mtype].y);
numtyp force = r2inv*r6inv*(lj1x*r6inv-lj1y);
#ifndef ONETYPE
force*=factor_lj;
#endif
f.x+=delx*force;
f.y+=dely*force;
f.z+=delz*force;
if (eflag>0) {
numtyp e=r6inv*(lj3[mtype].x*r6inv-lj3[mtype].y);
energy+=factor_lj*(e-lj3[mtype].z);
if (EVFLAG && eflag) {
#ifndef ONETYPE
numtyp lj3x=lj3[mtype].x;
numtyp lj3y=lj3[mtype].y;
numtyp lj3z=lj3[mtype].z;
#endif
numtyp e=r6inv*(lj3x*r6inv-lj3y);
#ifndef ONETYPE
energy+=factor_lj*(e-lj3z);
#else
energy+=(e-lj3z);
#endif
}
if (vflag>0) {
if (EVFLAG && vflag) {
virial[0] += delx*delx*force;
virial[1] += dely*dely*force;
virial[2] += delz*delz*force;
@ -182,10 +223,9 @@ __kernel void k_lj_fast(const __global numtyp4 *restrict x_,
virial[5] += dely*delz*force;
}
}
} // for nbor
store_answers(f,energy,virial,ii,inum,tid,t_per_atom,offset,eflag,vflag,
ans,engv);
} // if ii
store_answers(f,energy,virial,ii,inum,tid,t_per_atom,offset,eflag,vflag,
ans,engv);
}