mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-11-04 05:54:32 +00:00 
			
		
		
		
	Updates in tests to make all of Grid compile
This commit is contained in:
		@@ -228,7 +228,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
    std::cout << GridLogMessage<<" resid["<<n<<"]  "<< norm2(tmp)/norm2(src[n])<<std::endl;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=zero;
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=Zero();
 | 
			
		||||
  int blockDim = 0;//not used for BlockCGVec
 | 
			
		||||
  BlockConjugateGradient<FermionField>    BCGV  (BlockCGVec,blockDim,stp,10000);
 | 
			
		||||
  BCGV.PrintInterval=10;
 | 
			
		||||
 
 | 
			
		||||
@@ -30,7 +30,6 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 | 
			
		||||
 | 
			
		||||
using namespace std;
 | 
			
		||||
using namespace Grid;
 | 
			
		||||
using namespace Grid::QCD;
 | 
			
		||||
 | 
			
		||||
int main (int argc, char ** argv)
 | 
			
		||||
{
 | 
			
		||||
@@ -42,12 +41,12 @@ int main (int argc, char ** argv)
 | 
			
		||||
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> latt_size   = GridDefaultLatt();
 | 
			
		||||
  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  std::vector<int> mpi_layout  = GridDefaultMpi();
 | 
			
		||||
  std::vector<int> mpi_split (mpi_layout.size(),1);
 | 
			
		||||
  std::vector<int> split_coor (mpi_layout.size(),1);
 | 
			
		||||
  std::vector<int> split_dim (mpi_layout.size(),1);
 | 
			
		||||
  auto latt_size   = GridDefaultLatt();
 | 
			
		||||
  auto simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  auto mpi_layout  = GridDefaultMpi();
 | 
			
		||||
  Coordinate mpi_split (mpi_layout.size(),1);
 | 
			
		||||
  Coordinate split_coor (mpi_layout.size(),1);
 | 
			
		||||
  Coordinate split_dim (mpi_layout.size(),1);
 | 
			
		||||
 | 
			
		||||
  std::vector<ComplexD> boundary_phases(Nd,1.);
 | 
			
		||||
  boundary_phases[Nd-1]=-1.;
 | 
			
		||||
@@ -108,7 +107,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  FermionField tmp(FGrid);
 | 
			
		||||
  std::cout << GridLogMessage << "Made the Fermion Fields"<<std::endl;
 | 
			
		||||
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=zero;
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=Zero();
 | 
			
		||||
  GridParallelRNG pRNG5(FGrid);  pRNG5.SeedFixedIntegers(seeds);
 | 
			
		||||
  for(int s=0;s<nrhs;s++) {
 | 
			
		||||
    random(pRNG5,src[s]);
 | 
			
		||||
@@ -131,7 +130,6 @@ int main (int argc, char ** argv)
 | 
			
		||||
    std::cout << GridLogMessage << "Intialised 4D RNG "<<std::endl;
 | 
			
		||||
    SU3::HotConfiguration(pRNG,Umu);
 | 
			
		||||
    std::cout << GridLogMessage << "Intialised the HOT Gauge Field"<<std::endl;
 | 
			
		||||
    std::cout << " Site zero "<< Umu._odata[0]   <<std::endl;
 | 
			
		||||
  } 
 | 
			
		||||
 | 
			
		||||
  /////////////////
 | 
			
		||||
@@ -170,7 +168,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  MdagMLinearOperator<MobiusFermionR,FermionField> HermOp(Ddwf);
 | 
			
		||||
  MdagMLinearOperator<MobiusFermionR,FermionField> HermOpCk(Dchk);
 | 
			
		||||
  ConjugateGradient<FermionField> CG((stp),100000);
 | 
			
		||||
  s_res = zero;
 | 
			
		||||
  s_res = Zero();
 | 
			
		||||
 | 
			
		||||
  CG(HermOp,s_src,s_res);
 | 
			
		||||
 | 
			
		||||
@@ -202,7 +200,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  for(int s=0;s<nrhs;s++){
 | 
			
		||||
    result[s]=zero;
 | 
			
		||||
    result[s]=Zero();
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /////////////////////////////////////////////////////////////
 | 
			
		||||
 
 | 
			
		||||
@@ -43,9 +43,9 @@ int main (int argc, char ** argv)
 | 
			
		||||
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> latt_size   = GridDefaultLatt();
 | 
			
		||||
  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  std::vector<int> mpi_layout  = GridDefaultMpi();
 | 
			
		||||
  auto latt_size   = GridDefaultLatt();
 | 
			
		||||
  auto simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  auto mpi_layout  = GridDefaultMpi();
 | 
			
		||||
 | 
			
		||||
  std::vector<ComplexD> boundary_phases(Nd,1.);
 | 
			
		||||
  boundary_phases[Nd-1]=-1.;
 | 
			
		||||
@@ -72,7 +72,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  FermionField tmp(FGrid);
 | 
			
		||||
  std::cout << GridLogMessage << "Made the Fermion Fields"<<std::endl;
 | 
			
		||||
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=zero;
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=Zero();
 | 
			
		||||
  GridParallelRNG pRNG5(FGrid);  pRNG5.SeedFixedIntegers(seeds);
 | 
			
		||||
  for(int s=0;s<nrhs;s++) {
 | 
			
		||||
    random(pRNG5,src[s]);
 | 
			
		||||
@@ -116,7 +116,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  ConjugateGradient<FermionField> CG((stp),100000);
 | 
			
		||||
 | 
			
		||||
  for(int rhs=0;rhs<1;rhs++){
 | 
			
		||||
    result[rhs] = zero;
 | 
			
		||||
    result[rhs] = Zero();
 | 
			
		||||
    CG(HermOp,src[rhs],result[rhs]);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -129,7 +129,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  /////////////////////////////////////////////////////////////
 | 
			
		||||
  int blockDim = 0;//not used for BlockCGVec
 | 
			
		||||
  for(int s=0;s<nrhs;s++){
 | 
			
		||||
      result[s]=zero;
 | 
			
		||||
      result[s]=Zero();
 | 
			
		||||
   }
 | 
			
		||||
  BlockConjugateGradient<FermionField>    BCGV  (BlockCGrQVec,blockDim,stp,100000);
 | 
			
		||||
  {
 | 
			
		||||
 
 | 
			
		||||
@@ -43,9 +43,9 @@ int main (int argc, char ** argv)
 | 
			
		||||
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> latt_size   = GridDefaultLatt();
 | 
			
		||||
  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  std::vector<int> mpi_layout  = GridDefaultMpi();
 | 
			
		||||
  auto latt_size   = GridDefaultLatt();
 | 
			
		||||
  auto simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  auto mpi_layout  = GridDefaultMpi();
 | 
			
		||||
 | 
			
		||||
  std::vector<ComplexD> boundary_phases(Nd,1.);
 | 
			
		||||
  boundary_phases[Nd-1]=-1.;
 | 
			
		||||
@@ -73,7 +73,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  FermionField tmp(FGrid);
 | 
			
		||||
  std::cout << GridLogMessage << "Made the Fermion Fields"<<std::endl;
 | 
			
		||||
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=zero;
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=Zero();
 | 
			
		||||
  GridParallelRNG pRNG4(UGrid);  pRNG4.SeedFixedIntegers(seeds);
 | 
			
		||||
  for(int s=0;s<nrhs;s++) {
 | 
			
		||||
    random(pRNG4,src4[s]);
 | 
			
		||||
@@ -120,7 +120,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  ConjugateGradient<FermionField> CG((stp),100000);
 | 
			
		||||
 | 
			
		||||
  for(int rhs=0;rhs<1;rhs++){
 | 
			
		||||
    result[rhs] = zero;
 | 
			
		||||
    result[rhs] = Zero();
 | 
			
		||||
    //    CG(HermOp,src[rhs],result[rhs]);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -133,7 +133,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  /////////////////////////////////////////////////////////////
 | 
			
		||||
  int blockDim = 0;//not used for BlockCGVec
 | 
			
		||||
  for(int s=0;s<nrhs;s++){
 | 
			
		||||
    result[s]=zero;
 | 
			
		||||
    result[s]=Zero();
 | 
			
		||||
  }
 | 
			
		||||
  BlockConjugateGradient<FermionField>    BCGV  (BlockCGrQVec,blockDim,stp,100000);
 | 
			
		||||
  {
 | 
			
		||||
 
 | 
			
		||||
@@ -43,9 +43,9 @@ int main (int argc, char ** argv)
 | 
			
		||||
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> latt_size   = GridDefaultLatt();
 | 
			
		||||
  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  std::vector<int> mpi_layout  = GridDefaultMpi();
 | 
			
		||||
  auto latt_size   = GridDefaultLatt();
 | 
			
		||||
  auto simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  auto mpi_layout  = GridDefaultMpi();
 | 
			
		||||
 | 
			
		||||
  std::vector<ComplexD> boundary_phases(Nd,1.);
 | 
			
		||||
  boundary_phases[Nd-1]=-1.;
 | 
			
		||||
@@ -72,7 +72,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  FermionField tmp(FGrid);
 | 
			
		||||
  std::cout << GridLogMessage << "Made the Fermion Fields"<<std::endl;
 | 
			
		||||
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=zero;
 | 
			
		||||
  for(int s=0;s<nrhs;s++) result[s]=Zero();
 | 
			
		||||
  GridParallelRNG pRNG5(FGrid);  pRNG5.SeedFixedIntegers(seeds);
 | 
			
		||||
  for(int s=0;s<nrhs;s++) {
 | 
			
		||||
    random(pRNG5,src[s]);
 | 
			
		||||
@@ -116,7 +116,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  ConjugateGradient<FermionField> CG((stp),100000);
 | 
			
		||||
 | 
			
		||||
  for(int rhs=0;rhs<1;rhs++){
 | 
			
		||||
    result[rhs] = zero;
 | 
			
		||||
    result[rhs] = Zero();
 | 
			
		||||
    CG(HermOp,src[rhs],result[rhs]);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -129,7 +129,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  /////////////////////////////////////////////////////////////
 | 
			
		||||
  int blockDim = 0;//not used for BlockCGVec
 | 
			
		||||
  for(int s=0;s<nrhs;s++){
 | 
			
		||||
    result[s]=zero;
 | 
			
		||||
    result[s]=Zero();
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -72,7 +72,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
#if 1
 | 
			
		||||
  random(pRNG5,src);
 | 
			
		||||
#else
 | 
			
		||||
  src=zero;
 | 
			
		||||
  src=Zero();
 | 
			
		||||
  ComplexField coor(FGrid);
 | 
			
		||||
  LatticeCoordinate(coor,0);
 | 
			
		||||
  for(int ss=0;ss<FGrid->oSites();ss++){
 | 
			
		||||
@@ -196,7 +196,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  std::cout << GridLogMessage << " Calling Block CG for "<<Ls <<" right hand sides" <<std::endl;
 | 
			
		||||
  std::cout << GridLogMessage << "************************************************************************ "<<std::endl;
 | 
			
		||||
  Ds.ZeroCounters();
 | 
			
		||||
  result_o=zero;
 | 
			
		||||
  result_o=Zero();
 | 
			
		||||
  {
 | 
			
		||||
    double t1=usecond();
 | 
			
		||||
    BCG(HermOp,src_o,result_o);
 | 
			
		||||
@@ -216,7 +216,7 @@ int main (int argc, char ** argv)
 | 
			
		||||
  std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
 | 
			
		||||
  std::vector<FermionField> src_v   (Ls,UrbGrid);
 | 
			
		||||
  std::vector<FermionField> result_v(Ls,UrbGrid);
 | 
			
		||||
  for(int s=0;s<Ls;s++) result_v[s] = zero;
 | 
			
		||||
  for(int s=0;s<Ls;s++) result_v[s] = Zero();
 | 
			
		||||
  for(int s=0;s<Ls;s++) {
 | 
			
		||||
    FermionField src4(UGrid);
 | 
			
		||||
    ExtractSlice(src4,src,s,0);
 | 
			
		||||
 
 | 
			
		||||
@@ -31,7 +31,6 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 | 
			
		||||
 | 
			
		||||
using namespace std;
 | 
			
		||||
using namespace Grid;
 | 
			
		||||
using namespace Grid::QCD;
 | 
			
		||||
 | 
			
		||||
template<class d>
 | 
			
		||||
struct scal {
 | 
			
		||||
@@ -52,9 +51,9 @@ int main (int argc, char ** argv)
 | 
			
		||||
 | 
			
		||||
  Grid_init(&argc,&argv);
 | 
			
		||||
 | 
			
		||||
  std::vector<int> latt_size   = GridDefaultLatt();
 | 
			
		||||
  std::vector<int> simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  std::vector<int> mpi_layout  = GridDefaultMpi();
 | 
			
		||||
  auto latt_size   = GridDefaultLatt();
 | 
			
		||||
  auto simd_layout = GridDefaultSimd(Nd,vComplex::Nsimd());
 | 
			
		||||
  auto mpi_layout  = GridDefaultMpi();
 | 
			
		||||
 | 
			
		||||
  GridCartesian               Grid(latt_size,simd_layout,mpi_layout);
 | 
			
		||||
  GridRedBlackCartesian     RBGrid(&Grid);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user