From 7cf833dfe911eb81246b060fb4d3abdc7e91f78e Mon Sep 17 00:00:00 2001
From: Guido Cossu <guido.cossu@ed.ac.uk>
Date: Tue, 17 Jan 2017 11:00:54 +0000
Subject: [PATCH 1/2] Fixed compilation error in tests hadrons (capital letter
 in dir name)

---
 tests/hadrons/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/hadrons/Makefile.am b/tests/hadrons/Makefile.am
index fae0d212..c8ec1612 100644
--- a/tests/hadrons/Makefile.am
+++ b/tests/hadrons/Makefile.am
@@ -1,3 +1,3 @@
-AM_LDFLAGS += -L../../extras/hadrons
+AM_LDFLAGS += -L../../extras/Hadrons
 
 include Make.inc

From ef8d3831eb171e26de039e5d56df91f050301a3c Mon Sep 17 00:00:00 2001
From: Guido Cossu <guido.cossu@ed.ac.uk>
Date: Wed, 25 Jan 2017 18:12:04 +0000
Subject: [PATCH 2/2] Temporary patch the threading error in InsertSlice and
 ExtractSlice

Find source and fix the error
---
 lib/lattice/Lattice_transfer.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/lattice/Lattice_transfer.h b/lib/lattice/Lattice_transfer.h
index a49b1b5f..27b4aa7e 100644
--- a/lib/lattice/Lattice_transfer.h
+++ b/lib/lattice/Lattice_transfer.h
@@ -386,7 +386,8 @@ void InsertSlice(Lattice<vobj> &lowDim,Lattice<vobj> & higherDim,int slice, int
   }
 
   // the above should guarantee that the operations are local
-  PARALLEL_FOR_LOOP
+  // Guido: check the threading here
+  //PARALLEL_FOR_LOOP
   for(int idx=0;idx<lg->lSites();idx++){
     std::vector<int> lcoor(nl);
     std::vector<int> hcoor(nh);
@@ -428,7 +429,7 @@ void ExtractSlice(Lattice<vobj> &lowDim, Lattice<vobj> & higherDim,int slice, in
     }
   }
   // the above should guarantee that the operations are local
-  PARALLEL_FOR_LOOP
+  //PARALLEL_FOR_LOOP
   for(int idx=0;idx<lg->lSites();idx++){
     std::vector<int> lcoor(nl);
     std::vector<int> hcoor(nh);