From 53419779487a93775b49449a7d14aa8c19f67a3e Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Sat, 30 Apr 2016 03:34:16 -0700
Subject: [PATCH] IMCI fixes. Thought I had committed these. The "real"
 disambiguation between std::real and Grid::real shouldn't have been necessary
 and I don't know why only the icpc v16.0 on babbage hits it. May need a
 longer term rename of Grid::real or some careful EnableIf work.

---
 lib/qcd/action/fermion/WilsonKernels.cc | 2 +-
 tests/Test_synthetic_lanczos.cc         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/qcd/action/fermion/WilsonKernels.cc b/lib/qcd/action/fermion/WilsonKernels.cc
index 387ac0cd..e3415ae0 100644
--- a/lib/qcd/action/fermion/WilsonKernels.cc
+++ b/lib/qcd/action/fermion/WilsonKernels.cc
@@ -518,7 +518,7 @@ void WilsonKernels<Impl>::DiracOptDhopDir(StencilImpl &st,DoubledGaugeField &U,
   vstream(out._odata[sF],result);
 }
 
-#if ( ! defined(IMCI) && ! defined(AVX512) )
+#if ( ! defined(AVX512) )
 template<class Impl> 
 void WilsonKernels<Impl>::DiracOptAsmDhopSite(StencilImpl &st,DoubledGaugeField &U,
 					      std::vector<SiteHalfSpinor,alignedAllocator<SiteHalfSpinor> >  &buf,
diff --git a/tests/Test_synthetic_lanczos.cc b/tests/Test_synthetic_lanczos.cc
index 5e5219cc..0c9ab120 100644
--- a/tests/Test_synthetic_lanczos.cc
+++ b/tests/Test_synthetic_lanczos.cc
@@ -67,7 +67,7 @@ public:
 
     random(pRNG,scale);
 
-    scale = exp(-real(scale)*3.0);
+    scale = exp(-Grid::real(scale)*3.0);
     std::cout << " True matrix \n"<< scale <<std::endl;
   }