Merge branch 'feature/bugfix-ck-cj' into develop

This commit is contained in:
paboyle committed 2016-07-16 01:59:52 +01:00
commit 27f3ecc833
4 files changed
+178 -5

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
HFILES=./algorithms/approx/bigfloat.h ./algorithms/approx/bigfloat_double.h ./algorithms/approx/Chebyshev.h ./algorithms/approx/MultiShiftFunction.h ./algorithms/approx/Remez.h ./algorithms/approx/Zolotarev.h ./algorithms/CoarsenedMatrix.h ./algorithms/iterative/AdefGeneric.h ./algorithms/iterative/ConjugateGradient.h ./algorithms/iterative/ConjugateGradientMixedPrec.h ./algorithms/iterative/ConjugateGradientMultiShift.h ./algorithms/iterative/ConjugateResidual.h ./algorithms/iterative/DenseMatrix.h ./algorithms/iterative/EigenSort.h ./algorithms/iterative/Francis.h ./algorithms/iterative/Householder.h ./algorithms/iterative/ImplicitlyRestartedLanczos.h ./algorithms/iterative/Matrix.h ./algorithms/iterative/MatrixUtils.h ./algorithms/iterative/NormalEquations.h ./algorithms/iterative/PrecConjugateResidual.h ./algorithms/iterative/PrecGeneralisedConjugateResidual.h ./algorithms/iterative/SchurRedBlack.h ./algorithms/LinearOperator.h ./algorithms/Preconditioner.h ./algorithms/SparseMatrix.h ./Algorithms.h ./AlignedAllocator.h ./cartesian/Cartesian_base.h ./cartesian/Cartesian_full.h ./cartesian/Cartesian_red_black.h ./Cartesian.h ./communicator/Communicator_base.h ./Communicator.h ./cshift/Cshift_common.h ./cshift/Cshift_mpi.h ./cshift/Cshift_none.h ./Cshift.h ./Eigen/src/Cholesky/LDLT.h ./Eigen/src/Cholesky/LLT.h ./Eigen/src/Cholesky/LLT_MKL.h ./Eigen/src/CholmodSupport/CholmodSupport.h ./Eigen/src/Core/arch/AltiVec/Complex.h ./Eigen/src/Core/arch/AltiVec/PacketMath.h ./Eigen/src/Core/arch/Default/Settings.h ./Eigen/src/Core/arch/NEON/Complex.h ./Eigen/src/Core/arch/NEON/PacketMath.h ./Eigen/src/Core/arch/SSE/Complex.h ./Eigen/src/Core/arch/SSE/MathFunctions.h ./Eigen/src/Core/arch/SSE/PacketMath.h ./Eigen/src/Core/Array.h ./Eigen/src/Core/ArrayBase.h ./Eigen/src/Core/ArrayWrapper.h ./Eigen/src/Core/Assign.h ./Eigen/src/Core/Assign_MKL.h ./Eigen/src/Core/BandMatrix.h ./Eigen/src/Core/Block.h ./Eigen/src/Core/BooleanRedux.h ./Eigen/src/Core/CommaInitializer.h ./Eigen/src/Core/CoreIterators.h ./Eigen/src/Core/CwiseBinaryOp.h ./Eigen/src/Core/CwiseNullaryOp.h ./Eigen/src/Core/CwiseUnaryOp.h ./Eigen/src/Core/CwiseUnaryView.h ./Eigen/src/Core/DenseBase.h ./Eigen/src/Core/DenseCoeffsBase.h ./Eigen/src/Core/DenseStorage.h ./Eigen/src/Core/Diagonal.h ./Eigen/src/Core/DiagonalMatrix.h ./Eigen/src/Core/DiagonalProduct.h ./Eigen/src/Core/Dot.h ./Eigen/src/Core/EigenBase.h ./Eigen/src/Core/Flagged.h ./Eigen/src/Core/ForceAlignedAccess.h ./Eigen/src/Core/Functors.h ./Eigen/src/Core/Fuzzy.h ./Eigen/src/Core/GeneralProduct.h ./Eigen/src/Core/GenericPacketMath.h ./Eigen/src/Core/GlobalFunctions.h ./Eigen/src/Core/IO.h ./Eigen/src/Core/Map.h ./Eigen/src/Core/MapBase.h ./Eigen/src/Core/MathFunctions.h ./Eigen/src/Core/Matrix.h ./Eigen/src/Core/MatrixBase.h ./Eigen/src/Core/NestByValue.h ./Eigen/src/Core/NoAlias.h ./Eigen/src/Core/NumTraits.h ./Eigen/src/Core/PermutationMatrix.h ./Eigen/src/Core/PlainObjectBase.h ./Eigen/src/Core/ProductBase.h ./Eigen/src/Core/products/CoeffBasedProduct.h ./Eigen/src/Core/products/GeneralBlockPanelKernel.h ./Eigen/src/Core/products/GeneralMatrixMatrix.h ./Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h ./Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h ./Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h ./Eigen/src/Core/products/GeneralMatrixVector.h ./Eigen/src/Core/products/GeneralMatrixVector_MKL.h ./Eigen/src/Core/products/Parallelizer.h ./Eigen/src/Core/products/SelfadjointMatrixMatrix.h ./Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h ./Eigen/src/Core/products/SelfadjointMatrixVector.h ./Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h ./Eigen/src/Core/products/SelfadjointProduct.h ./Eigen/src/Core/products/SelfadjointRank2Update.h ./Eigen/src/Core/products/TriangularMatrixMatrix.h ./Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h ./Eigen/src/Core/products/TriangularMatrixVector.h ./Eigen/src/Core/products/TriangularMatrixVector_MKL.h ./Eigen/src/Core/products/TriangularSolverMatrix.h ./Eigen/src/Core/products/TriangularSolverMatrix_MKL.h ./Eigen/src/Core/products/TriangularSolverVector.h ./Eigen/src/Core/Random.h ./Eigen/src/Core/Redux.h ./Eigen/src/Core/Ref.h ./Eigen/src/Core/Replicate.h ./Eigen/src/Core/ReturnByValue.h ./Eigen/src/Core/Reverse.h ./Eigen/src/Core/Select.h ./Eigen/src/Core/SelfAdjointView.h ./Eigen/src/Core/SelfCwiseBinaryOp.h ./Eigen/src/Core/SolveTriangular.h ./Eigen/src/Core/StableNorm.h ./Eigen/src/Core/Stride.h ./Eigen/src/Core/Swap.h ./Eigen/src/Core/Transpose.h ./Eigen/src/Core/Transpositions.h ./Eigen/src/Core/TriangularMatrix.h ./Eigen/src/Core/util/BlasUtil.h ./Eigen/src/Core/util/Constants.h ./Eigen/src/Core/util/DisableStupidWarnings.h ./Eigen/src/Core/util/ForwardDeclarations.h ./Eigen/src/Core/util/Macros.h ./Eigen/src/Core/util/Memory.h ./Eigen/src/Core/util/Meta.h ./Eigen/src/Core/util/MKL_support.h ./Eigen/src/Core/util/NonMPL2.h ./Eigen/src/Core/util/ReenableStupidWarnings.h ./Eigen/src/Core/util/StaticAssert.h ./EiLine truncated
HFILES=./algorithms/approx/bigfloat.h ./algorithms/approx/bigfloat_double.h ./algorithms/approx/Chebyshev.h ./algorithms/approx/MultiShiftFunction.h ./algorithms/approx/Remez.h ./algorithms/approx/Zolotarev.h ./algorithms/CoarsenedMatrix.h ./algorithms/iterative/AdefGeneric.h ./algorithms/iterative/ConjugateGradient.h ./algorithms/iterative/ConjugateGradientMixedPrec.h ./algorithms/iterative/ConjugateGradientMultiShift.h ./algorithms/iterative/ConjugateResidual.h ./algorithms/iterative/DenseMatrix.h ./algorithms/iterative/EigenSort.h ./algorithms/iterative/Francis.h ./algorithms/iterative/Householder.h ./algorithms/iterative/ImplicitlyRestartedLanczos.h ./algorithms/iterative/Matrix.h ./algorithms/iterative/MatrixUtils.h ./algorithms/iterative/NormalEquations.h ./algorithms/iterative/PrecConjugateResidual.h ./algorithms/iterative/PrecGeneralisedConjugateResidual.h ./algorithms/iterative/SchurRedBlack.h ./algorithms/LinearOperator.h ./algorithms/Preconditioner.h ./algorithms/SparseMatrix.h ./Algorithms.h ./AlignedAllocator.h ./cartesian/Cartesian_base.h ./cartesian/Cartesian_full.h ./cartesian/Cartesian_red_black.h ./Cartesian.h ./communicator/Communicator_base.h ./Communicator.h ./cshift/Cshift_common.h ./cshift/Cshift_mpi.h ./cshift/Cshift_none.h ./Cshift.h ./Eigen/src/Cholesky/LDLT.h ./Eigen/src/Cholesky/LLT.h ./Eigen/src/Cholesky/LLT_MKL.h ./Eigen/src/CholmodSupport/CholmodSupport.h ./Eigen/src/Core/arch/AltiVec/Complex.h ./Eigen/src/Core/arch/AltiVec/PacketMath.h ./Eigen/src/Core/arch/Default/Settings.h ./Eigen/src/Core/arch/NEON/Complex.h ./Eigen/src/Core/arch/NEON/PacketMath.h ./Eigen/src/Core/arch/SSE/Complex.h ./Eigen/src/Core/arch/SSE/MathFunctions.h ./Eigen/src/Core/arch/SSE/PacketMath.h ./Eigen/src/Core/Array.h ./Eigen/src/Core/ArrayBase.h ./Eigen/src/Core/ArrayWrapper.h ./Eigen/src/Core/Assign.h ./Eigen/src/Core/Assign_MKL.h ./Eigen/src/Core/BandMatrix.h ./Eigen/src/Core/Block.h ./Eigen/src/Core/BooleanRedux.h ./Eigen/src/Core/CommaInitializer.h ./Eigen/src/Core/CoreIterators.h ./Eigen/src/Core/CwiseBinaryOp.h ./Eigen/src/Core/CwiseNullaryOp.h ./Eigen/src/Core/CwiseUnaryOp.h ./Eigen/src/Core/CwiseUnaryView.h ./Eigen/src/Core/DenseBase.h ./Eigen/src/Core/DenseCoeffsBase.h ./Eigen/src/Core/DenseStorage.h ./Eigen/src/Core/Diagonal.h ./Eigen/src/Core/DiagonalMatrix.h ./Eigen/src/Core/DiagonalProduct.h ./Eigen/src/Core/Dot.h ./Eigen/src/Core/EigenBase.h ./Eigen/src/Core/Flagged.h ./Eigen/src/Core/ForceAlignedAccess.h ./Eigen/src/Core/Functors.h ./Eigen/src/Core/Fuzzy.h ./Eigen/src/Core/GeneralProduct.h ./Eigen/src/Core/GenericPacketMath.h ./Eigen/src/Core/GlobalFunctions.h ./Eigen/src/Core/IO.h ./Eigen/src/Core/Map.h ./Eigen/src/Core/MapBase.h ./Eigen/src/Core/MathFunctions.h ./Eigen/src/Core/Matrix.h ./Eigen/src/Core/MatrixBase.h ./Eigen/src/Core/NestByValue.h ./Eigen/src/Core/NoAlias.h ./Eigen/src/Core/NumTraits.h ./Eigen/src/Core/PermutationMatrix.h ./Eigen/src/Core/PlainObjectBase.h ./Eigen/src/Core/ProductBase.h ./Eigen/src/Core/products/CoeffBasedProduct.h ./Eigen/src/Core/products/GeneralBlockPanelKernel.h ./Eigen/src/Core/products/GeneralMatrixMatrix.h ./Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h ./Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h ./Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h ./Eigen/src/Core/products/GeneralMatrixVector.h ./Eigen/src/Core/products/GeneralMatrixVector_MKL.h ./Eigen/src/Core/products/Parallelizer.h ./Eigen/src/Core/products/SelfadjointMatrixMatrix.h ./Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h ./Eigen/src/Core/products/SelfadjointMatrixVector.h ./Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h ./Eigen/src/Core/products/SelfadjointProduct.h ./Eigen/src/Core/products/SelfadjointRank2Update.h ./Eigen/src/Core/products/TriangularMatrixMatrix.h ./Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h ./Eigen/src/Core/products/TriangularMatrixVector.h ./Eigen/src/Core/products/TriangularMatrixVector_MKL.h ./Eigen/src/Core/products/TriangularSolverMatrix.h ./Eigen/src/Core/products/TriangularSolverMatrix_MKL.h ./Eigen/src/Core/products/TriangularSolverVector.h ./Eigen/src/Core/Random.h ./Eigen/src/Core/Redux.h ./Eigen/src/Core/Ref.h ./Eigen/src/Core/Replicate.h ./Eigen/src/Core/ReturnByValue.h ./Eigen/src/Core/Reverse.h ./Eigen/src/Core/Select.h ./Eigen/src/Core/SelfAdjointView.h ./Eigen/src/Core/SelfCwiseBinaryOp.h ./Eigen/src/Core/SolveTriangular.h ./Eigen/src/Core/StableNorm.h ./Eigen/src/Core/Stride.h ./Eigen/src/Core/Swap.h ./Eigen/src/Core/Transpose.h ./Eigen/src/Core/Transpositions.h ./Eigen/src/Core/TriangularMatrix.h ./Eigen/src/Core/util/BlasUtil.h ./Eigen/src/Core/util/Constants.h ./Eigen/src/Core/util/DisableStupidWarnings.h ./Eigen/src/Core/util/ForwardDeclarations.h ./Eigen/src/Core/util/Macros.h ./Eigen/src/Core/util/Memory.h ./Eigen/src/Core/util/Meta.h ./Eigen/src/Core/util/MKL_support.h ./Eigen/src/Core/util/NonMPL2.h ./Eigen/src/Core/util/ReenableStupidWarnings.h ./Eigen/src/Core/util/StaticAssert.h ./EiLine truncated
CCFILES=./algorithms/approx/MultiShiftFunction.cc ./algorithms/approx/Remez.cc ./algorithms/approx/Zolotarev.cc ./Init.cc ./Log.cc ./PerfCount.cc ./pugixml/pugixml.cc ./qcd/action/fermion/CayleyFermion5D.cc ./qcd/action/fermion/CayleyFermion5Dcache.cc ./qcd/action/fermion/CayleyFermion5Ddense.cc ./qcd/action/fermion/CayleyFermion5Dssp.cc ./qcd/action/fermion/CayleyFermion5Dvec.cc ./qcd/action/fermion/ContinuedFractionFermion5D.cc ./qcd/action/fermion/PartialFractionFermion5D.cc ./qcd/action/fermion/WilsonFermion.cc ./qcd/action/fermion/WilsonFermion5D.cc ./qcd/action/fermion/WilsonKernels.cc ./qcd/action/fermion/WilsonKernelsAsm.cc ./qcd/action/fermion/WilsonKernelsHand.cc ./qcd/action/fermion/WilsonTMFermion.cc ./qcd/hmc/HMC.cc ./qcd/spin/Dirac.cc ./qcd/utils/SpaceTimeGrid.cc ./serialisation/BinaryIO.cc ./serialisation/TextIO.cc ./serialisation/XmlIO.cc ./stencil/Lebesgue.cc ./stencil/Stencil_common.cc
+3 -3
View File
@@ -452,10 +452,10 @@ PARALLEL_FOR_LOOP
// DhopDir provides U or Uconj depending on coor/flavour.
GaugeLinkField link(mat._grid);
// use lorentz for flavour as hack.
auto tmp = TraceIndex<SpinIndex>(outerProduct(Btilde,A));
PARALLEL_FOR_LOOP
for(auto ss=tmp.begin();ss<tmp.end();ss++){
link[ss]() = tmp[ss](0,0) - conjugate(tmp[ss](1,1)) ; // IS THIS SIGN RIGHT?
for(auto ss=link.begin();ss<link.end();ss++){
auto ttmp = traceIndex<SpinIndex>(outerProduct(Btilde[ss],A[ss]));
link[ss]() = ttmp(0,0) + conjugate(ttmp(1,1)) ;
}
PokeIndex<LorentzIndex>(mat,link,mu);
return;
+5 -1
View File
@@ -1,5 +1,5 @@
bin_PROGRAMS += Test_contfrac_force Test_dwf_force Test_dwf_gpforce Test_gp_rect_force Test_gpdwf_force Test_partfrac_force Test_rect_force Test_wilson_force Test_wilson_force_phiMdagMphi Test_wilson_force_phiMphi
bin_PROGRAMS += Test_contfrac_force Test_dwf_force Test_dwf_gpforce Test_gp_rect_force Test_gpdwf_force Test_gpwilson_force Test_partfrac_force Test_rect_force Test_wilson_force Test_wilson_force_phiMdagMphi Test_wilson_force_phiMphi
Test_contfrac_force_SOURCES=Test_contfrac_force.cc
@@ -22,6 +22,10 @@ Test_gpdwf_force_SOURCES=Test_gpdwf_force.cc
Test_gpdwf_force_LDADD=-lGrid
Test_gpwilson_force_SOURCES=Test_gpwilson_force.cc
Test_gpwilson_force_LDADD=-lGrid
Test_partfrac_force_SOURCES=Test_partfrac_force.cc
Test_partfrac_force_LDADD=-lGrid
+169
View File
@@ -0,0 +1,169 @@
/*************************************************************************************
Grid physics library, www.github.com/paboyle/Grid
Source file: ./tests/Test_gpdwf_force.cc
Copyright (C) 2015
Author: paboyle <paboyle@ph.ed.ac.uk>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#include <Grid/Grid.h>
using namespace std;
using namespace Grid;
using namespace Grid::QCD;
#define parallel_for PARALLEL_FOR_LOOP for
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();
const int Ls=8;
GridCartesian * UGrid = SpaceTimeGrid::makeFourDimGrid(GridDefaultLatt(),
GridDefaultSimd(Nd,vComplex::Nsimd()),
GridDefaultMpi());
GridRedBlackCartesian * UrbGrid = SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
GridCartesian * FGrid = UGrid;
GridRedBlackCartesian * FrbGrid = UrbGrid;
std::vector<int> seeds4({1,2,3,4});
GridParallelRNG RNG4(UGrid); RNG4.SeedFixedIntegers(seeds4);
int threads = GridThread::GetThreads();
std::cout<<GridLogMessage << "Grid is setup to use "<<threads<<" threads"<<std::endl;
typedef typename GparityDomainWallFermionR::FermionField FermionField;
FermionField phi (FGrid); gaussian(RNG4,phi);
FermionField Mphi (FGrid);
FermionField MphiPrime (FGrid);
LatticeGaugeField U(UGrid);
SU3::HotConfiguration(RNG4,U);
////////////////////////////////////
// Unmodified matrix element
////////////////////////////////////
RealD mass=0.01;
RealD M5=1.8;
const int nu = 3;
std::vector<int> twists(Nd,0); twists[nu] = 1;
GparityWilsonFermionR::ImplParams params; params.twists = twists;
GparityWilsonFermionR Wil(U,*UGrid,*UrbGrid,mass,params);
Wil.M (phi,Mphi);
ComplexD S = innerProduct(Mphi,Mphi); // pdag MdagM p
// get the deriv of phidag MdagM phi with respect to "U"
LatticeGaugeField UdSdU(UGrid);
LatticeGaugeField tmp(UGrid);
Wil.MDeriv(tmp , Mphi, phi,DaggerNo ); UdSdU=tmp;
Wil.MDeriv(tmp , phi, Mphi,DaggerYes ); UdSdU=(UdSdU+tmp);
FermionField Ftmp (FGrid);
////////////////////////////////////
// Modify the gauge field a little
////////////////////////////////////
RealD dt = 0.00001;
LatticeColourMatrix mommu(UGrid);
LatticeColourMatrix forcemu(UGrid);
LatticeGaugeField mom(UGrid);
LatticeGaugeField Uprime(UGrid);
for(int mu=0;mu<Nd;mu++){
SU3::GaussianLieAlgebraMatrix(RNG4, mommu); // Traceless antihermitian momentum; gaussian in lie alg
PokeIndex<LorentzIndex>(mom,mommu,mu);
// fourth order exponential approx
parallel_for(auto i=mom.begin();i<mom.end();i++){
Uprime[i](mu) =
U[i](mu)
+ mom[i](mu)*U[i](mu)*dt
+ mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt/2.0)
+ mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt/6.0)
+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt/24.0)
+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt/120.0)
+ mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *mom[i](mu) *U[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
;
}
}
Wil.ImportGauge(Uprime);
Wil.M (phi,MphiPrime);
ComplexD Sprime = innerProduct(MphiPrime ,MphiPrime);
//////////////////////////////////////////////
// Use derivative to estimate dS
//////////////////////////////////////////////
LatticeComplex dS(UGrid); dS = zero;
for(int mu=0;mu<Nd;mu++){
mommu = PeekIndex<LorentzIndex>(UdSdU,mu);
mommu=Ta(mommu)*2.0;
PokeIndex<LorentzIndex>(UdSdU,mommu,mu);
}
for(int mu=0;mu<Nd;mu++){
forcemu = PeekIndex<LorentzIndex>(UdSdU,mu);
mommu = PeekIndex<LorentzIndex>(mom,mu);
// Update PF action density
dS = dS+trace(mommu*forcemu)*dt;
}
Complex dSpred = sum(dS);
// From TwoFlavourPseudoFermion:
//////////////////////////////////////////////////////
// dS/du = - phi^dag (Mdag M)^-1 [ Mdag dM + dMdag M ] (Mdag M)^-1 phi
// = - phi^dag M^-1 dM (MdagM)^-1 phi - phi^dag (MdagM)^-1 dMdag dM (Mdag)^-1 phi
//
// = - Ydag dM X - Xdag dMdag Y
//
//////////////////////////////////////////////////////
// So must take dSdU - adj(dSdU) and left multiply by mom to get dS/dt.
//
//
std::cout << GridLogMessage << " S "<<S<<std::endl;
std::cout << GridLogMessage << " Sprime "<<Sprime<<std::endl;
std::cout << GridLogMessage << "dS "<<Sprime-S<<std::endl;
std::cout << GridLogMessage << "predict dS "<< dSpred <<std::endl;
std::cout<< GridLogMessage << "Done" <<std::endl;
Grid_finalize();
}