Fixes for Gparity comparison with CPS (Instantiation, Gamma matrix convention)

configure.ac

@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(subdir-objects)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([lib/Grid.h])
-AC_CONFIG_HEADERS([lib/Config.h])
+AC_CONFIG_HEADERS([lib/GridConfig.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_MSG_NOTICE([

lib/Config.h.in

@@ -137,6 +137,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

lib/Grid.h

@@ -31,7 +31,7 @@
 // Grid headers
 ///////////////////
 #include <serialisation/Serialisation.h>
-#include <Config.h>
+#include <GridConfig.h>
 #include <Timer.h>
 #include <Log.h>
 #include <AlignedAllocator.h>

lib/qcd/QCD.h

@@ -59,7 +59,7 @@ namespace QCD {
     template<typename vtype> using iHalfSpinVector            = iScalar<iVector<iScalar<vtype>, Nhs> >;
     template<typename vtype> using iHalfSpinColourVector      = iScalar<iVector<iVector<vtype, Nc>, Nhs> >;
 
-    template<typename vtype> using iGparitySpinColourVector       = iVector<iVector<iVector<vtype, Nc>, Nhs>, Ngp >;
+    template<typename vtype> using iGparitySpinColourVector       = iVector<iVector<iVector<vtype, Nc>, Ns>, Ngp >;
     template<typename vtype> using iGparityHalfSpinColourVector   = iVector<iVector<iVector<vtype, Nc>, Nhs>, Ngp >;
 
     // Spin matrix

lib/qcd/action/Actions.h

@@ -56,8 +56,10 @@ typedef WilsonGaugeAction<LatticeGaugeFieldD>    WilsonGaugeActionD;
 #define FermOpTemplateInstantiate(A) \
   template class A<WilsonImplF>;		\
   template class A<WilsonImplD>; 
-  //  template class A<GparityWilsonImplF>;	\
+
-  //  template class A<GparityWilsonImplD>;		
+#define GparityFermOpTemplateInstantiate(A) \
+  template class A<GparityWilsonImplF>;	\
+  template class A<GparityWilsonImplD>;		
 
 ////////////////////////////////////////////
 // Fermion operators / actions

lib/qcd/action/fermion/CayleyFermion5D.cc

@@ -498,6 +498,7 @@ namespace QCD {
   }
 
   FermOpTemplateInstantiate(CayleyFermion5D);
+  GparityFermOpTemplateInstantiate(CayleyFermion5D);
 
 }}
 

lib/qcd/action/fermion/WilsonFermion.cc

@@ -289,6 +289,7 @@ PARALLEL_FOR_LOOP
   };
  
   FermOpTemplateInstantiate(WilsonFermion);
+  GparityFermOpTemplateInstantiate(WilsonFermion);
 
 }}
 

lib/qcd/action/fermion/WilsonFermion5D.cc

@@ -405,6 +405,7 @@ void WilsonFermion5D<Impl>::DW(const FermionField &in, FermionField &out,int dag
 }
 
 FermOpTemplateInstantiate(WilsonFermion5D);
+GparityFermOpTemplateInstantiate(WilsonFermion5D);
 
 }}
 

lib/qcd/action/fermion/WilsonKernels.cc

@@ -370,5 +370,6 @@ void WilsonKernels<Impl>::DiracOptDhopDir(StencilImpl &st,DoubledGaugeField &U,
 }
 
   FermOpTemplateInstantiate(WilsonKernels);
+  GparityFermOpTemplateInstantiate(WilsonKernels);
 
 }}

lib/qcd/action/fermion/WilsonKernels.h

@@ -39,7 +39,8 @@ namespace Grid {
        DiracOptDhopSite(st,U,buf,sF,sU,in,out); // will template override for Wilson Nc=3
      }
 #endif
-#define HANDOPT
+// doesn't seem to work with Gparity at the moment
+#undef HANDOPT
 #ifdef HANDOPT
      void DiracOptHandDhopSite(StencilImpl &st,DoubledGaugeField &U,
 			       std::vector<SiteHalfSpinor,alignedAllocator<SiteHalfSpinor> >  &buf,

lib/qcd/spin/TwoSpinor.h

@@ -45,13 +45,13 @@ namespace QCD {
   // To fail is not to err (Cryptic clue: suggest to Google SFINAE ;) )
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spProjXp (iVector<vtype,Nhs> &hspin,const iVector<vtype,Ns> &fspin)
     {
-      hspin(0)=fspin(0)+timesI(fspin(3));
+      hspin(0)=fspin(0)-timesI(fspin(3));
-      hspin(1)=fspin(1)+timesI(fspin(2));
+      hspin(1)=fspin(1)-timesI(fspin(2));
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spProjXm (iVector<vtype,Nhs> &hspin,const iVector<vtype,Ns> &fspin)
     {
-      hspin(0)=fspin(0)-timesI(fspin(3));
+      hspin(0)=fspin(0)+timesI(fspin(3));
-      hspin(1)=fspin(1)-timesI(fspin(2));
+      hspin(1)=fspin(1)+timesI(fspin(2));
     }
 
       //  0 0  0  -1  [0] -+ [3]
@@ -60,13 +60,13 @@ namespace QCD {
       // -1 0  0  0
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spProjYp (iVector<vtype,Nhs> &hspin,const iVector<vtype,Ns> &fspin)
     {
-      hspin(0)=fspin(0)-fspin(3);
+      hspin(0)=fspin(0)+fspin(3);
-      hspin(1)=fspin(1)+fspin(2);
+      hspin(1)=fspin(1)-fspin(2);
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spProjYm (iVector<vtype,Nhs> &hspin,const iVector<vtype,Ns> &fspin)
     {
-      hspin(0)=fspin(0)+fspin(3);
+      hspin(0)=fspin(0)-fspin(3);
-      hspin(1)=fspin(1)-fspin(2);
+      hspin(1)=fspin(1)+fspin(2);
     }
 	    /*Gz
 	     *  0 0  i  0   [0]+-i[2]
@@ -76,14 +76,14 @@ namespace QCD {
 	     */
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spProjZp (iVector<vtype,Nhs> &hspin,const iVector<vtype,Ns> &fspin)
     {
-      hspin(0)=fspin(0)+timesI(fspin(2));
+      hspin(0)=fspin(0)-timesI(fspin(2));
-      hspin(1)=fspin(1)-timesI(fspin(3));
+      hspin(1)=fspin(1)+timesI(fspin(3));
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spProjZm (iVector<vtype,Nhs> &hspin,const iVector<vtype,Ns> &fspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
-      hspin(0)=fspin(0)-timesI(fspin(2));
+      hspin(0)=fspin(0)+timesI(fspin(2));
-      hspin(1)=fspin(1)+timesI(fspin(3));
+      hspin(1)=fspin(1)-timesI(fspin(3));
     }
 	    /*Gt
 	     *  0 0  1  0 [0]+-[2]
@@ -94,14 +94,14 @@ namespace QCD {
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spProjTp (iVector<vtype,Nhs> &hspin,const iVector<vtype,Ns> &fspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
-      hspin(0)=fspin(0)+fspin(2);
+      hspin(0)=fspin(0)-fspin(2);
-      hspin(1)=fspin(1)+fspin(3);
+      hspin(1)=fspin(1)-fspin(3);
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spProjTm (iVector<vtype,Nhs> &hspin,const iVector<vtype,Ns> &fspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
-      hspin(0)=fspin(0)-fspin(2);
+      hspin(0)=fspin(0)+fspin(2);
-      hspin(1)=fspin(1)-fspin(3);
+      hspin(1)=fspin(1)+fspin(3);
     }
 	    /*G5
 	     *  1 0  0  0 
@@ -157,32 +157,32 @@ namespace QCD {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)=hspin(0);
       fspin(1)=hspin(1);
-      fspin(2)=timesMinusI(hspin(1));
+      fspin(2)=timesI(hspin(1));
-      fspin(3)=timesMinusI(hspin(0));
+      fspin(3)=timesI(hspin(0));
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spReconXm (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)=hspin(0);
       fspin(1)=hspin(1);
-      fspin(2)=timesI(hspin(1));
+      fspin(2)=timesMinusI(hspin(1));
-      fspin(3)=timesI(hspin(0));
+      fspin(3)=timesMinusI(hspin(0));
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void accumReconXp (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)+=hspin(0);
       fspin(1)+=hspin(1);
-      fspin(2)-=timesI(hspin(1));
+      fspin(2)+=timesI(hspin(1));
-      fspin(3)-=timesI(hspin(0));
+      fspin(3)+=timesI(hspin(0));
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void accumReconXm (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)+=hspin(0);
       fspin(1)+=hspin(1);
-      fspin(2)+=timesI(hspin(1));
+      fspin(2)-=timesI(hspin(1));
-      fspin(3)+=timesI(hspin(0));
+      fspin(3)-=timesI(hspin(0));
     }
 
       //  0 0  0  -1  [0] -+ [3]
@@ -195,32 +195,32 @@ namespace QCD {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)=hspin(0);
       fspin(1)=hspin(1);
-      fspin(2)= hspin(1);
+      fspin(2)=-hspin(1);
-      fspin(3)=-hspin(0);//Unary minus?
+      fspin(3)= hspin(0);
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spReconYm (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)=hspin(0);
       fspin(1)=hspin(1);
-      fspin(2)=-hspin(1);
+      fspin(2)= hspin(1);
-      fspin(3)= hspin(0);
+      fspin(3)=-hspin(0);//Unary minus?
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void accumReconYp (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)+=hspin(0);
       fspin(1)+=hspin(1);
-      fspin(2)+=hspin(1);
+      fspin(2)-=hspin(1);
-      fspin(3)-=hspin(0);
+      fspin(3)+=hspin(0);
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void accumReconYm (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)+=hspin(0);
       fspin(1)+=hspin(1);
-      fspin(2)-=hspin(1);
+      fspin(2)+=hspin(1);
-      fspin(3)+=hspin(0);
+      fspin(3)-=hspin(0);
     }
 
 	    /*Gz
@@ -234,32 +234,32 @@ namespace QCD {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)=hspin(0);
       fspin(1)=hspin(1);
-      fspin(2)=timesMinusI(hspin(0));
+      fspin(2)=     timesI(hspin(0));
-      fspin(3)=timesI(hspin(1));
+      fspin(3)=timesMinusI(hspin(1));
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spReconZm (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)=hspin(0);
       fspin(1)=hspin(1);
-      fspin(2)=     timesI(hspin(0));
+      fspin(2)=timesMinusI(hspin(0));
-      fspin(3)=timesMinusI(hspin(1));
+      fspin(3)=timesI(hspin(1));
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void accumReconZp (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)+=hspin(0);
       fspin(1)+=hspin(1);
-      fspin(2)-=timesI(hspin(0));
+      fspin(2)+=timesI(hspin(0));
-      fspin(3)+=timesI(hspin(1));
+      fspin(3)-=timesI(hspin(1));
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void accumReconZm (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)+=hspin(0);
       fspin(1)+=hspin(1);
-      fspin(2)+=timesI(hspin(0));
+      fspin(2)-=timesI(hspin(0));
-      fspin(3)-=timesI(hspin(1));
+      fspin(3)+=timesI(hspin(1));
     }
 	    /*Gt
 	     *  0 0  1  0 [0]+-[2]
@@ -272,32 +272,32 @@ namespace QCD {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)=hspin(0);
       fspin(1)=hspin(1);
-      fspin(2)=hspin(0);
+      fspin(2)=-hspin(0);
-      fspin(3)=hspin(1);
+      fspin(3)=-hspin(1);
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void spReconTm (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)=hspin(0);
       fspin(1)=hspin(1);
-      fspin(2)=-hspin(0);
+      fspin(2)=hspin(0);
-      fspin(3)=-hspin(1);
+      fspin(3)=hspin(1);
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void accumReconTp (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)+=hspin(0);
       fspin(1)+=hspin(1);
-      fspin(2)+=hspin(0);
+      fspin(2)-=hspin(0);
-      fspin(3)+=hspin(1);
+      fspin(3)-=hspin(1);
     }
   template<class vtype,IfSpinor<iVector<vtype,Ns> > = 0> strong_inline void accumReconTm (iVector<vtype,Ns> &fspin,const iVector<vtype,Nhs> &hspin)
     {
       //typename std::enable_if<matchGridTensorIndex<iVector<vtype,Ns>,SpinorIndex>::value,iVector<vtype,Ns> >::type *SFINAE;
       fspin(0)+=hspin(0);
       fspin(1)+=hspin(1);
-      fspin(2)-=hspin(0);
+      fspin(2)+=hspin(0);
-      fspin(3)-=hspin(1);
+      fspin(3)+=hspin(1);
     }
 	    /*G5
 	     *  1 0  0  0 

lib/simd/Grid_sse4.h

@@ -7,7 +7,7 @@
 // Time-stamp: <2015-06-16 23:27:54 neo>
 //----------------------------------------------------------------------
 
-#include <pmmintrin.h>
+#include <x86intrin.h>
 
 namespace Optimization {
 

lib/stamp-h1

@@ -1 +1 @@
-timestamp for lib/Config.h
+timestamp for lib/GridConfig.h