portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Gparity works now even if simd distributed in a Gparity twist direction.

Browse Source 
Tested by doubling lattice in t-direction.
This commit is contained in:
Peter Boyle 2015-08-14 12:57:42 +01:00
parent 7d3512ab21
commit 4dc7c36aa8
5 changed files with 90 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/lattice/Lattice_where.h
View File

@ -22,7 +22,6 @@ inline void whereWolf(Lattice<vobj> &ret,const Lattice<iobj> &predicate,Lattice<
typedef typename iobj::vector_type mask_type; typedef typename iobj::vector_type mask_type;
const int Nsimd = grid->Nsimd(); const int Nsimd = grid->Nsimd();
const int words = sizeof(vobj)/sizeof(vector_type);
std::vector<Integer> mask(Nsimd); std::vector<Integer> mask(Nsimd);
std::vector<scalar_object> truevals (Nsimd); std::vector<scalar_object> truevals (Nsimd);

73
lib/qcd/action/fermion/FermionOperator.h
View File

@ -7,7 +7,7 @@ namespace Grid {
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
// Hardwire to four spinors, allow to select // Hardwire to four spinors, allow to select
// between gauge representation rank, and gparity/flavour index, // between gauge representation rank bc's, flavours etc.
// and single/double precision. // and single/double precision.
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
@ -37,8 +37,7 @@ namespace Grid {
typedef WilsonCompressor<SiteHalfSpinor,SiteSpinor> Compressor; typedef WilsonCompressor<SiteHalfSpinor,SiteSpinor> Compressor;
// provide the multiply by link that is differentiated between Gparity (with flavour index) and non-Gparity static inline void multLink(SiteHalfSpinor &phi,const SiteDoubledGaugeField &U,const SiteHalfSpinor &chi,int mu,StencilEntry *SE,CartesianStencil &St){
static inline void multLink(SiteHalfSpinor &phi,const SiteDoubledGaugeField &U,const SiteHalfSpinor &chi,int mu,StencilEntry *SE){
mult(&phi(),&U(mu),&chi()); mult(&phi(),&U(mu),&chi());
} }
static inline void DoubleStore(GridBase *GaugeGrid,DoubledGaugeField &Uds,const GaugeField &Umu) static inline void DoubleStore(GridBase *GaugeGrid,DoubledGaugeField &Uds,const GaugeField &Umu)
@ -94,15 +93,73 @@ namespace Grid {
// provide the multiply by link that is differentiated between Gparity (with flavour index) and // provide the multiply by link that is differentiated between Gparity (with flavour index) and
// non-Gparity // non-Gparity
static inline void multLink(SiteHalfSpinor &phi,const SiteDoubledGaugeField &U,const SiteHalfSpinor &chi,int mu,StencilEntry *SE){ static inline void multLink(SiteHalfSpinor &phi,const SiteDoubledGaugeField &U,const SiteHalfSpinor &chi,int mu,StencilEntry *SE,CartesianStencil &St){
// FIXME; need to be more careful. If this is a simd direction we are still stuffed // FIXME; need to be more careful. If this is a simd direction we are still stuffed
if ( SE->_around_the_world && ((mu==Xp)||(mu==Xm)) ) { // Need access to _simd_layout[mu]. mu is not necessarily dim.
mult(&phi(0),&U(0)(mu),&chi(1)); typedef SiteHalfSpinor vobj;
mult(&phi(1),&U(1)(mu),&chi(0)); typedef typename SiteHalfSpinor::scalar_object sobj;
vobj vtmp;
sobj stmp;
std::vector<int> gpbc({0,0,0,1,0,0,0,1});
GridBase *grid = St._grid;
const int Nsimd = grid->Nsimd();
int direction = St._directions[mu];
int distance = St._distances[mu];
int ptype = St._permute_type[mu];
int sl = St._grid->_simd_layout[direction];
// assert our assumptions
assert((distance==1)||(distance==-1)); // nearest neighbour stencil hard code
assert((sl==1)||(sl==2));
std::vector<int> icoor;
if ( SE->_around_the_world && gpbc[mu] ) {
if ( sl == 2 ) {
// std::cout << "multLink for mu= "<<mu<<" simd length "<<sl<<std::endl;
std::vector<sobj> vals(Nsimd);
extract(chi,vals);
for(int s=0;s<Nsimd;s++){
grid->iCoorFromIindex(icoor,s);
assert((icoor[direction]==0)||(icoor[direction]==1));
int permute_lane;
if ( distance == 1) {
permute_lane = icoor[direction]?1:0;
} else {
permute_lane = icoor[direction]?0:1;
}
if ( permute_lane ) {
stmp(0) = vals[s](1);
stmp(1) = vals[s](0);
vals[s] = stmp;
}
}
merge(vtmp,vals);
} else {
vtmp(0) = chi(1);
vtmp(1) = chi(0);
}
mult(&phi(0),&U(0)(mu),&vtmp(0));
mult(&phi(1),&U(1)(mu),&vtmp(1));
} else { } else {
mult(&phi(0),&U(0)(mu),&chi(0)); mult(&phi(0),&U(0)(mu),&chi(0));
mult(&phi(1),&U(1)(mu),&chi(1)); mult(&phi(1),&U(1)(mu),&chi(1));
} }
} }
static inline void InsertForce(GaugeField &mat,const FermionField &Btilde,const FermionField &A,int mu){ static inline void InsertForce(GaugeField &mat,const FermionField &Btilde,const FermionField &A,int mu){
@ -120,7 +177,7 @@ namespace Grid {
Lattice<iScalar<vInteger> > coor(GaugeGrid); Lattice<iScalar<vInteger> > coor(GaugeGrid);
std::vector<int> gpdirs({1,0,0,0}); std::vector<int> gpdirs({0,0,0,1});
for(int mu=0;mu<Nd;mu++){ for(int mu=0;mu<Nd;mu++){

74
lib/qcd/action/fermion/WilsonCompressor.h
View File

@ -63,80 +63,6 @@ namespace QCD {
} }
}; };
/*
template<class SiteHalfSpinor,class SiteSpinor>
class GparityWilsonCompressor : public WilsonCompressor<SiteHalfSpinor,SiteSpinor>{
public:
GparityWilsonCompressor(int _dag) : WilsonCompressor<SiteHalfSpinor,SiteSpinor> (_dag){};
SiteHalfSpinor operator () (const SiteSpinor &in,int dim,int plane,int osite,GridBase *grid)
{
std::vector<int> Gbcs({1,0,0,0});
typedef typename SiteHalfSpinor::scalar_object scalar_object;
const int Nsimd = grid->Nsimd();
int checkered=grid->CheckerBoarded(dim);
int ocb=grid->CheckerBoardFromOindex(osite);
SiteHalfSpinor tmp = this->spinproject(in); // spin projected
//////////////////////////////////////////////////////////////
// Check whether we must flavour flip
// do this if source is plane 0 on processor 0 in dimension dim
//////////////////////////////////////////////////////////////
int do_flip = 0;
int flipicoor= 0;
if(Gbcs[this->mu]){
std::cout << "Applying Gparity BC's in direction "<<this->mu<<std::endl;
if ( (this->mu==Xp)||(this->mu==Yp)||(this->mu==Zp)||(this->mu==Tp) ) {
if ( (grid->_processor_coor[dim] == 0)
&& (plane==0)
&& ( (!checkered)||(ocb==0) ) ) {
do_flip=1;
flipicoor=0;
}
}
if ( (this->mu==Xm)||(this->mu==Ym)||(this->mu==Zm)||(this->mu==Tm) ) {
if ( (grid->_processor_coor[dim] == (grid->_processors[dim]-1) )
&& (plane==grid->_rdimensions[dim]-1)
&& ( (!checkered)||(ocb==1) ) ) {
do_flip=1;
flipicoor=grid->_simd_layout[dim]-1;
}
}
}
if ( do_flip ) {
std::cout << "Applying Gparity BC's in direction "<<this->mu<< " osite " << osite << " plane "<<plane <<std::endl;
std::vector<scalar_object> flat(Nsimd);
std::vector<int> coor;
extract(tmp,flat);
for(int i=0;i<Nsimd;i++) {
grid->iCoorFromIindex(coor,i);
if ( coor[dim]==flipicoor ) {
scalar_object stmp;
stmp(0) = flat[i](1);
stmp(1) = flat[i](0);
flat[i] = stmp;
}
}
merge(tmp,flat);
}
return tmp;
}
};
*/
}} // namespace close }} // namespace close
#endif #endif

48
lib/qcd/action/fermion/WilsonKernels.cc
View File

@ -24,7 +24,7 @@ void WilsonKernels<Impl>::DiracOptDhopSite(CartesianStencil &st,DoubledGaugeFiel
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Xp,SE); Impl::multLink(Uchi,U._odata[sU],chi,Xp,SE,st);
spReconXp(result,Uchi); spReconXp(result,Uchi);
// Yp // Yp
@ -37,7 +37,7 @@ void WilsonKernels<Impl>::DiracOptDhopSite(CartesianStencil &st,DoubledGaugeFiel
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Yp,SE); Impl::multLink(Uchi,U._odata[sU],chi,Yp,SE,st);
accumReconYp(result,Uchi); accumReconYp(result,Uchi);
// Zp // Zp
@ -50,7 +50,7 @@ void WilsonKernels<Impl>::DiracOptDhopSite(CartesianStencil &st,DoubledGaugeFiel
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Zp,SE); Impl::multLink(Uchi,U._odata[sU],chi,Zp,SE,st);
accumReconZp(result,Uchi); accumReconZp(result,Uchi);
// Tp // Tp
@ -63,7 +63,7 @@ void WilsonKernels<Impl>::DiracOptDhopSite(CartesianStencil &st,DoubledGaugeFiel
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Tp,SE); Impl::multLink(Uchi,U._odata[sU],chi,Tp,SE,st);
accumReconTp(result,Uchi); accumReconTp(result,Uchi);
// Xm // Xm
@ -76,7 +76,7 @@ void WilsonKernels<Impl>::DiracOptDhopSite(CartesianStencil &st,DoubledGaugeFiel
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Xm,SE); Impl::multLink(Uchi,U._odata[sU],chi,Xm,SE,st);
accumReconXm(result,Uchi); accumReconXm(result,Uchi);
// Ym // Ym
@ -89,7 +89,7 @@ void WilsonKernels<Impl>::DiracOptDhopSite(CartesianStencil &st,DoubledGaugeFiel
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Ym,SE); Impl::multLink(Uchi,U._odata[sU],chi,Ym,SE,st);
accumReconYm(result,Uchi); accumReconYm(result,Uchi);
// Zm // Zm
@ -102,7 +102,7 @@ void WilsonKernels<Impl>::DiracOptDhopSite(CartesianStencil &st,DoubledGaugeFiel
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Zm,SE); Impl::multLink(Uchi,U._odata[sU],chi,Zm,SE,st);
accumReconZm(result,Uchi); accumReconZm(result,Uchi);
// Tm // Tm
@ -115,7 +115,7 @@ void WilsonKernels<Impl>::DiracOptDhopSite(CartesianStencil &st,DoubledGaugeFiel
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Tm,SE); Impl::multLink(Uchi,U._odata[sU],chi,Tm,SE,st);
accumReconTm(result,Uchi); accumReconTm(result,Uchi);
vstream(out._odata[sF],result*(-0.5)); vstream(out._odata[sF],result*(-0.5));
@ -143,7 +143,7 @@ void WilsonKernels<Impl>::DiracOptDhopSiteDag(CartesianStencil &st,DoubledGaugeF
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Xm,SE); Impl::multLink(Uchi,U._odata[sU],chi,Xm,SE,st);
spReconXp(result,Uchi); spReconXp(result,Uchi);
// Yp // Yp
@ -156,7 +156,7 @@ void WilsonKernels<Impl>::DiracOptDhopSiteDag(CartesianStencil &st,DoubledGaugeF
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Ym,SE); Impl::multLink(Uchi,U._odata[sU],chi,Ym,SE,st);
accumReconYp(result,Uchi); accumReconYp(result,Uchi);
// Zp // Zp
@ -169,7 +169,7 @@ void WilsonKernels<Impl>::DiracOptDhopSiteDag(CartesianStencil &st,DoubledGaugeF
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Zm,SE); Impl::multLink(Uchi,U._odata[sU],chi,Zm,SE,st);
accumReconZp(result,Uchi); accumReconZp(result,Uchi);
// Tp // Tp
@ -182,7 +182,7 @@ void WilsonKernels<Impl>::DiracOptDhopSiteDag(CartesianStencil &st,DoubledGaugeF
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Tm,SE); Impl::multLink(Uchi,U._odata[sU],chi,Tm,SE,st);
accumReconTp(result,Uchi); accumReconTp(result,Uchi);
// Xm // Xm
@ -195,7 +195,7 @@ void WilsonKernels<Impl>::DiracOptDhopSiteDag(CartesianStencil &st,DoubledGaugeF
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Xp,SE); Impl::multLink(Uchi,U._odata[sU],chi,Xp,SE,st);
accumReconXm(result,Uchi); accumReconXm(result,Uchi);
// Ym // Ym
@ -208,7 +208,7 @@ void WilsonKernels<Impl>::DiracOptDhopSiteDag(CartesianStencil &st,DoubledGaugeF
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Yp,SE); Impl::multLink(Uchi,U._odata[sU],chi,Yp,SE,st);
accumReconYm(result,Uchi); accumReconYm(result,Uchi);
// Zm // Zm
@ -221,7 +221,7 @@ void WilsonKernels<Impl>::DiracOptDhopSiteDag(CartesianStencil &st,DoubledGaugeF
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Zp,SE); Impl::multLink(Uchi,U._odata[sU],chi,Zp,SE,st);
accumReconZm(result,Uchi); accumReconZm(result,Uchi);
// Tm // Tm
@ -234,7 +234,7 @@ void WilsonKernels<Impl>::DiracOptDhopSiteDag(CartesianStencil &st,DoubledGaugeF
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,Tp,SE); Impl::multLink(Uchi,U._odata[sU],chi,Tp,SE,st);
accumReconTm(result,Uchi); accumReconTm(result,Uchi);
vstream(out._odata[sF],result*(-0.5)); vstream(out._odata[sF],result*(-0.5));
@ -264,7 +264,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(CartesianStencil &st,DoubledGaugeField
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,dir,SE); Impl::multLink(Uchi,U._odata[sU],chi,dir,SE,st);
spReconXp(result,Uchi); spReconXp(result,Uchi);
} }
@ -278,7 +278,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(CartesianStencil &st,DoubledGaugeField
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,dir,SE); Impl::multLink(Uchi,U._odata[sU],chi,dir,SE,st);
spReconYp(result,Uchi); spReconYp(result,Uchi);
} }
@ -292,7 +292,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(CartesianStencil &st,DoubledGaugeField
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,dir,SE); Impl::multLink(Uchi,U._odata[sU],chi,dir,SE,st);
spReconZp(result,Uchi); spReconZp(result,Uchi);
} }
@ -306,7 +306,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(CartesianStencil &st,DoubledGaugeField
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,dir,SE); Impl::multLink(Uchi,U._odata[sU],chi,dir,SE,st);
spReconTp(result,Uchi); spReconTp(result,Uchi);
} }
@ -320,7 +320,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(CartesianStencil &st,DoubledGaugeField
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,dir,SE); Impl::multLink(Uchi,U._odata[sU],chi,dir,SE,st);
spReconXm(result,Uchi); spReconXm(result,Uchi);
} }
@ -334,7 +334,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(CartesianStencil &st,DoubledGaugeField
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,dir,SE); Impl::multLink(Uchi,U._odata[sU],chi,dir,SE,st);
spReconYm(result,Uchi); spReconYm(result,Uchi);
} }
@ -348,7 +348,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(CartesianStencil &st,DoubledGaugeField
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,dir,SE); Impl::multLink(Uchi,U._odata[sU],chi,dir,SE,st);
spReconZm(result,Uchi); spReconZm(result,Uchi);
} }
@ -362,7 +362,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(CartesianStencil &st,DoubledGaugeField
} else { } else {
chi=buf[SE->_offset]; chi=buf[SE->_offset];
} }
Impl::multLink(Uchi,U._odata[sU],chi,dir,SE); Impl::multLink(Uchi,U._odata[sU],chi,dir,SE,st);
spReconTm(result,Uchi); spReconTm(result,Uchi);
} }

2
tests/Test_gparity.cc
View File

@ -44,7 +44,7 @@ void Replicate(Lattice<vobj> &coarse,Lattice<vobj> & fine)
int main (int argc, char ** argv) int main (int argc, char ** argv)
{ {
const int nu = 0; const int nu = 3;
Grid_init(&argc,&argv); Grid_init(&argc,&argv);