From 841a37f9415059a514737ac14ba82de4e903ff57 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Tue, 29 Dec 2015 23:49:41 +0000
Subject: [PATCH] Fix to WilsonCompressor that fixes a bug in comms phase due
 to the sign change on gamma matrix in hopping term. Add logging of time spent
 in CG.

---
 lib/algorithms/iterative/ConjugateGradient.h | 20 ++++++++++++++++----
 lib/qcd/action/fermion/WilsonCompressor.h    |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/algorithms/iterative/ConjugateGradient.h b/lib/algorithms/iterative/ConjugateGradient.h
index e41b9614..aff0cc30 100644
--- a/lib/algorithms/iterative/ConjugateGradient.h
+++ b/lib/algorithms/iterative/ConjugateGradient.h
@@ -56,14 +56,22 @@ public:
       }
       
       std::cout<<GridLogIterative << std::setprecision(4)<< "ConjugateGradient: k=0 residual "<<cp<<" rsq"<<rsq<<std::endl;
-      
+
+      GridStopWatch LinalgTimer;
+      GridStopWatch MatrixTimer;
+      GridStopWatch SolverTimer;
+
+      SolverTimer.Start();
       int k;
       for (k=1;k<=MaxIterations;k++){
 	
 	c=cp;
-	
-	Linop.HermOpAndNorm(p,mmp,d,qq);
 
+	MatrixTimer.Start();
+	Linop.HermOpAndNorm(p,mmp,d,qq);
+	MatrixTimer.Stop();
+
+	LinalgTimer.Start();
 	RealD    qqck = norm2(mmp);
 	ComplexD dck  = innerProduct(p,mmp);
       
@@ -77,11 +85,13 @@ public:
 	psi= a*p+psi;
 	p  = p*b+r;
 	  
+	LinalgTimer.Stop();
 	std::cout<<GridLogIterative<<"ConjugateGradient: Iteration " <<k<<" residual "<<cp<< " target"<< rsq<<std::endl;
 	
 	// Stopping condition
 	if ( cp <= rsq ) { 
 	  
+	  SolverTimer.Stop();
 	  Linop.HermOpAndNorm(psi,mmp,d,qq);
 	  p=mmp-src;
 	  
@@ -94,7 +104,9 @@ public:
 	  std::cout<<GridLogMessage<<"ConjugateGradient: Converged on iteration " <<k
 		   <<" computed residual "<<sqrt(cp/ssq)
 		   <<" true residual     "<<true_residual
-		   <<" target "<<Tolerance<<std::endl;
+		   <<" target "<<Tolerance;
+	  std::cout<<" Time elapsed: Total "<< SolverTimer.Elapsed() << " Matrix  "<<MatrixTimer.Elapsed() << " Linalg "<<LinalgTimer.Elapsed();
+	  std::cout<<std::endl;
 	  
 	  assert(true_residual/Tolerance < 1000.0);
 
diff --git a/lib/qcd/action/fermion/WilsonCompressor.h b/lib/qcd/action/fermion/WilsonCompressor.h
index 6c6d560b..32117b46 100644
--- a/lib/qcd/action/fermion/WilsonCompressor.h
+++ b/lib/qcd/action/fermion/WilsonCompressor.h
@@ -27,7 +27,7 @@ namespace QCD {
     {
       SiteHalfSpinor ret;
       int mudag=mu;
-      if (dag) {
+      if (!dag) {
 	mudag=(mu+Nd)%(2*Nd);
       }
       switch(mudag) {