Merge branch 'master' into hadrons

.travis.yml

@@ -0,0 +1,28 @@
+# Ubuntu 14.04 Trusty support
+sudo: required
+dist: trusty
+# Enable C++ support
+language: cpp
+# Compiler selection
+# Build steps
+script:
+  - ./scripts/reconfigure_script
+  - mkdir build
+  - cd build
+  - ../configure CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" LIBS="-fopenmp -lmpfr -lgmp" --enable-precision=single --enable-simd=AVX2 --enable-comms=none 
+  - make 
+  - ./benchmarks/Benchmark_dwf --threads 1
+matrix:
+  include:
+    - compiler: gcc-4.9
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+            - libmpfr-dev
+            - libgmp-dev
+            - libmpc-dev
+            - binutils-dev
+      env: CXX=g++-4.9

lib/lattice/Lattice_rng.h

@@ -122,7 +122,7 @@ namespace Grid {
     std::vector<RngEngine>                             _generators;
     std::vector<std::uniform_real_distribution<RealD>> _uniform;
     std::vector<std::normal_distribution<RealD>>       _gaussian;
-    std::vector<std::discrete_distribution<RealD>>     _bernoulli;
+    std::vector<std::discrete_distribution<int32_t>>     _bernoulli;
 
     void GetState(std::vector<RngStateType> & saved,int gen) {
       saved.resize(RngStateCount);
@@ -162,7 +162,7 @@ namespace Grid {
       _generators.resize(1);
       _uniform.resize(1,std::uniform_real_distribution<RealD>{0,1});
       _gaussian.resize(1,std::normal_distribution<RealD>(0.0,1.0) );
-      _bernoulli.resize(1,std::discrete_distribution<RealD>{1,1});
+      _bernoulli.resize(1,std::discrete_distribution<int32_t>{1,1});
       _seeded=0;
     }
 
@@ -268,7 +268,7 @@ namespace Grid {
       _generators.resize(_vol);
       _uniform.resize(_vol,std::uniform_real_distribution<RealD>{0,1});
       _gaussian.resize(_vol,std::normal_distribution<RealD>(0.0,1.0) );
-      _bernoulli.resize(_vol,std::discrete_distribution<RealD>{1,1});
+      _bernoulli.resize(_vol,std::discrete_distribution<int32_t>{1,1});
       _seeded=0;
     }
 

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,

lib/simd/Intel512wilson.h

@@ -27,7 +27,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
     /*  END LEGAL */
 #ifndef GRID_ASM_INTEL_512_QCD_H
 #define GRID_ASM_INTEL_512_QCD_H
-
+ 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Register allocations for Wilson Kernel are precision and IMCI/AVX512 indept
 //////////////////////////////////////////////////////////////////////////////////////////

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;
   }