From 1eb169ac0b0c4957183d411972353f96992ff6a4 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Tue, 23 Feb 2016 16:36:50 +0000
Subject: [PATCH 1/6] compatibility fix

---
 lib/Init.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/Init.cc b/lib/Init.cc
index 5cea0bff..d7bc7731 100644
--- a/lib/Init.cc
+++ b/lib/Init.cc
@@ -45,9 +45,6 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #include <algorithm>
 #include <iterator>
 
-#define __X86_64
-
-
 namespace Grid {
 
 //////////////////////////////////////////////////////

From e0511197698f80f6356ab07a2ca60c98b152056b Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Wed, 2 Mar 2016 07:00:00 -0800
Subject: [PATCH 2/6] extern "C" should have been in the header file, but Cray
 is apparently not C++ friendly.

---
 lib/AlignedAllocator.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/AlignedAllocator.h b/lib/AlignedAllocator.h
index 6faf6302..22b6297e 100644
--- a/lib/AlignedAllocator.h
+++ b/lib/AlignedAllocator.h
@@ -40,8 +40,13 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #ifdef HAVE_MM_MALLOC_H
 #include <mm_malloc.h>
 #endif
+
 #ifdef GRID_COMMS_SHMEM
+extern "C" { 
 #include <mpp/shmem.h>
+extern void * shmem_align(size_t, size_t);
+extern void  shmem_free(void *);
+}
 #endif
 
 namespace Grid {

From 68b02da483af6597a9a0eb9b3b685e5fa6851573 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Wed, 2 Mar 2016 07:00:43 -0800
Subject: [PATCH 3/6] Backing off the colour

---
 lib/Log.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Log.h b/lib/Log.h
index 247faa44..a677b82f 100644
--- a/lib/Log.h
+++ b/lib/Log.h
@@ -71,7 +71,8 @@ public:
             StopWatch.Start();
             stream << BLACK<< log.topName << BLACK<< " : ";
             stream << log.COLOUR <<std::setw(10) << std::left << log.name << BLACK << " : ";
-            stream << YELLOW<< now <<BLACK << " : " << log.COLOUR;
+	    //	    stream << YELLOW<< now <<BLACK << " : " ;
+	    stream << log.COLOUR;
             return stream;
         } else { 
             return devnull;

From 03fcd3b33a85b4c8c7765c41d2b5d0827887f5b5 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Wed, 2 Mar 2016 07:01:15 -0800
Subject: [PATCH 4/6] Back out of the colour

---
 lib/Log.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/Log.cc b/lib/Log.cc
index b16ac1e7..36d30dde 100644
--- a/lib/Log.cc
+++ b/lib/Log.cc
@@ -43,7 +43,9 @@ std::string Logger::PURPLE("\033[35m");
 std::string Logger::CYAN("\033[36m");
 std::string Logger::WHITE("\033[37m");
 std::string Logger::NORMAL("\033[0;39m");
+std::string EMPTY("");
 
+#if 0  
   GridLogger GridLogError      (1,"Error",Logger::RED);
   GridLogger GridLogWarning    (1,"Warning",Logger::YELLOW);
   GridLogger GridLogMessage    (1,"Message",Logger::BLACK);
@@ -51,6 +53,15 @@ std::string Logger::NORMAL("\033[0;39m");
   GridLogger GridLogPerformance(1,"Performance",Logger::GREEN);
   GridLogger GridLogIterative  (1,"Iterative",Logger::BLUE);
   GridLogger GridLogIntegrator (1,"Integrator",Logger::BLUE);
+#else
+  GridLogger GridLogError      (1,"Error",EMPTY);
+  GridLogger GridLogWarning    (1,"Warning",EMPTY);
+  GridLogger GridLogMessage    (1,"Message",EMPTY);
+  GridLogger GridLogDebug      (1,"Debug",EMPTY);
+  GridLogger GridLogPerformance(1,"Performance",EMPTY);
+  GridLogger GridLogIterative  (1,"Iterative",EMPTY);
+  GridLogger GridLogIntegrator (1,"Integrator",EMPTY);
+#endif
 
 void GridLogConfigure(std::vector<std::string> &logstreams)
 {

From ff129d9ad9f5cd35c7ab505b3df92584f3311d45 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Wed, 2 Mar 2016 07:02:37 -0800
Subject: [PATCH 5/6] Redundant operations removed

---
 lib/algorithms/iterative/ConjugateGradient.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/algorithms/iterative/ConjugateGradient.h b/lib/algorithms/iterative/ConjugateGradient.h
index e1062359..b0a936ae 100644
--- a/lib/algorithms/iterative/ConjugateGradient.h
+++ b/lib/algorithms/iterative/ConjugateGradient.h
@@ -101,8 +101,8 @@ public:
 	MatrixTimer.Stop();
 
 	LinalgTimer.Start();
-	RealD    qqck = norm2(mmp);
-	ComplexD dck  = innerProduct(p,mmp);
+	//	RealD    qqck = norm2(mmp);
+	//	ComplexD dck  = innerProduct(p,mmp);
       
 	a      = c/d;
 	b_pred = a*(a*qq-d)/c;

From 61413565d0a73326e73a51de58da625af63d99ea Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Wed, 2 Mar 2016 07:03:09 -0800
Subject: [PATCH 6/6] Back off the inlined spin proj as not working

---
 lib/qcd/action/fermion/WilsonFermion5D.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/qcd/action/fermion/WilsonFermion5D.cc b/lib/qcd/action/fermion/WilsonFermion5D.cc
index 1d729202..762bff6a 100644
--- a/lib/qcd/action/fermion/WilsonFermion5D.cc
+++ b/lib/qcd/action/fermion/WilsonFermion5D.cc
@@ -305,8 +305,8 @@ void WilsonFermion5D<Impl>::DhopInternalCommsThenCompute(StencilImpl & st, Lebes
   int nwork = U._grid->oSites();
   
   commtime -=usecond();
-  auto handle = st.HaloExchangeOptBegin(in,compressor);
-  st.HaloExchangeOptComplete(handle);
+  auto handle = st.HaloExchangeBegin(in,compressor);
+  st.HaloExchangeComplete(handle);
   commtime +=usecond();
 
   jointime -=usecond();