portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-24 20:55:55 +01:00
Code Releases Activity

Reorganise a little to let the PV inverter be defined outside

Browse Source 
the Reconstruct class.

This lets the multiple choices for PV inversion be composed without
changing the routine and no if/else case enumeration.

Implemented SchurDiagMooee PV inversion (red black) and Unprec PV inversion.
Red black cuts from 190 iterations to 90 iterations at 10^-12 on 8^4 test system

Will revisit multiple Schur options and add a Fourier based multishift PV inverse, similar
to the one Rudy Arthur did in BFM
This commit is contained in:
Peter Boyle 2018-10-10 13:22:01 +01:00
parent be40aaf751
commit 9bfd641b22
2 changed files with 111 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
Grid/algorithms/iterative/Reconstruct5Dprop.h
View File

@ -31,80 +31,125 @@ namespace Grid {
namespace QCD { namespace QCD {
template<class Field> class Reconstruct5DfromPhysical { template<class Field>
class PauliVillarsSolverUnprec
{
public:
ConjugateGradient<Field> & CG;
PauliVillarsSolverUnprec( ConjugateGradient<Field> &_CG) : CG(_CG){};
template<class Matrix>
void operator() (Matrix &_Matrix,const Field &src,Field &sol)
{
RealD m = _Matrix.Mass();
Field A (_Matrix.FermionGrid());
MdagMLinearOperator<Matrix,Field> HermOp(_Matrix);
_Matrix.SetMass(1.0);
_Matrix.Mdag(src,A);
CG(HermOp,A,sol);
_Matrix.SetMass(m);
};
};
template<class Field>
class PauliVillarsSolverRBprec
{
public:
ConjugateGradient<Field> & CG;
PauliVillarsSolverRBprec( ConjugateGradient<Field> &_CG) : CG(_CG){};
template<class Matrix>
void operator() (Matrix &_Matrix,const Field &src,Field &sol)
{
RealD m = _Matrix.Mass();
Field A (_Matrix.FermionGrid());
_Matrix.SetMass(1.0);
SchurRedBlackDiagMooeeSolve<Field> SchurSolver(CG);
SchurSolver(_Matrix,src,sol);
_Matrix.SetMass(m);
};
};
template<class Field,class PVinverter> class Reconstruct5DfromPhysical {
private: private:
OperatorFunction<Field> & _PauliVillarsSolver; PVinverter & PauliVillarsSolver;
public: public:
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
// Wrap the usual normal equations Schur trick // First cut works, 10 Oct 2018.
//
// Must form a plan to get this into production for Zmobius acceleration
// of the Mobius exact AMA corrections.
//
// TODO : understand absence of contact term in eqns in Hantao's thesis
// sol4 is contact term subtracted.
//
// Options
// a) Defect correction approach:
// 1) Compute defect from current soln (initially guess).
// This is ...... outerToInner check !!!!
// 2) Deflated Zmobius solve to get 4d soln
// Ensure deflation is working
// 3) Refine 5d Outer using the inner 4d delta soln
//
// Step 1: localise PV inverse in a routine. [DONE]
// Step 2: Schur based PV inverse [DONE]
// Step 3: Fourier accelerated PV inverse
// Step 4:
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
Reconstruct5DfromPhysical(OperatorFunction<Field> &PauliVillarsSolver) :
_PauliVillarsSolver(PauliVillarsSolver) Reconstruct5DfromPhysical(PVinverter &_PauliVillarsSolver)
{ }; : PauliVillarsSolver(_PauliVillarsSolver)
/* {
void SliceDump(const Field &f) };
{
std::vector<TComplex> C1;
Field ff(f._grid);
Gamma G5 ( Gamma::Algebra::Gamma5);
ff= f+ G5*f;
ff=ff*0.5;
{
auto ip = localInnerProduct(ff,ff);
sliceSum(ip,C1,0);
for(int s=0;s<C1.size();s++){
std::cout << " P+ C[" <<s<<"] = "<<C1[s]<<std::endl;
}
}
ff= f- G5*f;
ff=ff*0.5;
{
auto ip = localInnerProduct(ff,ff);
sliceSum(ip,C1,0);
for(int s=0;s<C1.size();s++){
std::cout << " P- C[" <<s<<"] = "<<C1[s]<<std::endl;
}
}
}
*/
template<class Matrix>
void PV(Matrix &_Matrix,const Field &src,Field &sol)
{
RealD m = _Matrix.Mass();
_Matrix.SetMass(1.0);
_Matrix.M(src,sol);
_Matrix.SetMass(m);
}
template<class Matrix>
void PVdag(Matrix &_Matrix,const Field &src,Field &sol)
{
RealD m = _Matrix.Mass();
_Matrix.SetMass(1.0);
_Matrix.Mdag(src,sol);
_Matrix.SetMass(m);
}
template<class Matrix> template<class Matrix>
void operator() (Matrix & _Matrix,const Field &sol4,const Field &src4, Field &sol5){ void operator() (Matrix & _Matrix,const Field &sol4,const Field &src4, Field &sol5){
int Ls = _Matrix.Ls; int Ls = _Matrix.Ls;
RealD m = _Matrix.Mass();
Field psi4(_Matrix.GaugeGrid()); Field psi4(_Matrix.GaugeGrid());
Field psi(_Matrix.FermionGrid()); Field psi(_Matrix.FermionGrid());
Field A (_Matrix.FermionGrid()); Field A (_Matrix.FermionGrid());
Field B (_Matrix.FermionGrid()); Field B (_Matrix.FermionGrid());
Field c (_Matrix.FermionGrid()); Field c (_Matrix.FermionGrid());
Field b (_Matrix.FermionGrid());
typedef typename Matrix::Coeff_t Coeff_t; typedef typename Matrix::Coeff_t Coeff_t;
MdagMLinearOperator<Matrix,Field> HermOp(_Matrix);
std::cout << GridLogMessage<< " ************************************************" << std::endl;
std::cout << GridLogMessage<< " Reconstruct5Dprop: c.f. MADWF algorithm " << std::endl;
std::cout << GridLogMessage<< " ************************************************" << std::endl;
/////////////////////////////////////// ///////////////////////////////////////
//Import source, include Dminus factors //Import source, include Dminus factors
/////////////////////////////////////// ///////////////////////////////////////
_Matrix.ImportPhysicalFermionSource(src4,b); // Includes D_- factor _Matrix.ImportPhysicalFermionSource(src4,B);
/////////////////////////////////////// ///////////////////////////////////////
// Set up c from src4 // Set up c from src4
/////////////////////////////////////// ///////////////////////////////////////
std::cout << GridLogMessage<< " ************************************************" << std::endl; PauliVillarsSolver(_Matrix,B,A);
std::cout << GridLogMessage<< " Reconstrucing 5D propagator using Pauli Villars" << std::endl; _Matrix.Pdag(A,c);
std::cout << GridLogMessage<< " ************************************************" << std::endl;
_Matrix.SetMass(1.0); // PauliVillars mass
_Matrix.Mdag(b,B); _PauliVillarsSolver(HermOp,B,A);
_Matrix.Pdag(A,c);
_Matrix.SetMass(m); // Back to physical mass
////////////////////////////////////// //////////////////////////////////////
// Build Pdag PV^-1 Dm P [-sol4,c2,c3... cL] // Build Pdag PV^-1 Dm P [-sol4,c2,c3... cL]
@ -115,22 +160,24 @@ template<class Field> class Reconstruct5DfromPhysical {
ExtractSlice(psi4,c,s,0); ExtractSlice(psi4,c,s,0);
InsertSlice(psi4,psi,s,0); InsertSlice(psi4,psi,s,0);
} }
/////////////////////////////
// Pdag PV^-1 Dm P // Pdag PV^-1 Dm P
/////////////////////////////
_Matrix.P(psi,B); _Matrix.P(psi,B);
_Matrix.M(B,A); _Matrix.M(B,A);
PauliVillarsSolver(_Matrix,A,B);
_Matrix.Pdag(B,A);
// PauliVillars invert //////////////////////////////
_Matrix.SetMass(1.0); // Reinsert surface prop
_Matrix.Mdag(A,B); _PauliVillarsSolver(HermOp,B,A); //////////////////////////////
_Matrix.SetMass(m); InsertSlice(sol4,A,0,0);
_Matrix.Pdag(A,B); //////////////////////////////
// Convert from y back to x
InsertSlice(sol4,B,0,0); //////////////////////////////
_Matrix.P(A,sol5);
// Convert from y back to x with P+ circular shift
_Matrix.P(B,sol5);
} }
}; };

15
tests/debug/Test_cayley_cg.cc
View File

@ -229,16 +229,14 @@ void TestReconstruct5D(What & Ddwf,
Ddwf.M(result,src_NE); Ddwf.M(result,src_NE);
src_NE = src_NE - src; src_NE = src_NE - src;
std::cout <<GridLogMessage<< " True residual is " << norm2(src_NE)<<std::endl; std::cout <<GridLogMessage<< " True residual is " << norm2(src_NE)<<std::endl;
Reconstruct5DfromPhysical<LatticeFermion> reconstructor(CG);
std::cout <<GridLogMessage<< " True result " << norm2(result)<<std::endl;
std::cout <<GridLogMessage<< " 4d result " << norm2(res4)<<std::endl;
std::cout <<GridLogMessage<< " Reconstructing " <<std::endl; std::cout <<GridLogMessage<< " Reconstructing " <<std::endl;
result_rec = result; // typedef PauliVillarsSolverUnprec<LatticeFermion> PVinverter;
typedef PauliVillarsSolverRBprec<LatticeFermion> PVinverter;
PVinverter PVinverse(CG);
Reconstruct5DfromPhysical<LatticeFermion,PVinverter> reconstructor(PVinverse);
reconstructor(Ddwf,res4,src4,result_rec); reconstructor(Ddwf,res4,src4,result_rec);
std::cout <<GridLogMessage << "Result "<<norm2(result)<<std::endl; std::cout <<GridLogMessage << "Result "<<norm2(result)<<std::endl;
@ -246,7 +244,6 @@ void TestReconstruct5D(What & Ddwf,
result_rec = result_rec - result; result_rec = result_rec - result;
std::cout <<GridLogMessage << "Difference "<<norm2(result_rec)<<std::endl; std::cout <<GridLogMessage << "Difference "<<norm2(result_rec)<<std::endl;
// reconstructor.SliceDump(result_rec);
} }