From 53419779487a93775b49449a7d14aa8c19f67a3e Mon Sep 17 00:00:00 2001 From: paboyle Date: Sat, 30 Apr 2016 03:34:16 -0700 Subject: [PATCH 01/12] 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::DiracOptDhopDir(StencilImpl &st,DoubledGaugeField &U, vstream(out._odata[sF],result); } -#if ( ! defined(IMCI) && ! defined(AVX512) ) +#if ( ! defined(AVX512) ) template void WilsonKernels::DiracOptAsmDhopSite(StencilImpl &st,DoubledGaugeField &U, std::vector > &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 < Date: Sat, 30 Apr 2016 03:42:24 -0700 Subject: [PATCH 02/12] The Bernoulli gives a no compile due to a static assertion that the type be integral in 4.7 random.h Probably need to go through an Integer type, and then conver to real after the random draw to make clean. --- lib/lattice/Lattice_rng.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h index da0f2207..1c14a2b7 100644 --- a/lib/lattice/Lattice_rng.h +++ b/lib/lattice/Lattice_rng.h @@ -122,7 +122,7 @@ namespace Grid { std::vector _generators; std::vector> _uniform; std::vector> _gaussian; - std::vector> _bernoulli; + // std::vector> _bernoulli; void GetState(std::vector & saved,int gen) { saved.resize(RngStateCount); @@ -162,7 +162,7 @@ namespace Grid { _generators.resize(1); _uniform.resize(1,std::uniform_real_distribution{0,1}); _gaussian.resize(1,std::normal_distribution(0.0,1.0) ); - _bernoulli.resize(1,std::discrete_distribution{1,1}); + // _bernoulli.resize(1,std::discrete_distribution{1,1}); _seeded=0; } @@ -268,7 +268,7 @@ namespace Grid { _generators.resize(_vol); _uniform.resize(_vol,std::uniform_real_distribution{0,1}); _gaussian.resize(_vol,std::normal_distribution(0.0,1.0) ); - _bernoulli.resize(_vol,std::discrete_distribution{1,1}); + // _bernoulli.resize(_vol,std::discrete_distribution{1,1}); _seeded=0; } @@ -372,9 +372,9 @@ PARALLEL_FOR_LOOP rng.fill(l,rng._gaussian); } - template inline void bernoulli(GridParallelRNG &rng,Lattice &l){ - rng.fill(l,rng._bernoulli); - } + // template inline void bernoulli(GridParallelRNG &rng,Lattice &l){ + // rng.fill(l,rng._bernoulli); + // } template inline void random(GridSerialRNG &rng,sobj &l){ rng.fill(l,rng._uniform); @@ -384,9 +384,9 @@ PARALLEL_FOR_LOOP rng.fill(l,rng._gaussian); } - template inline void bernoulli(GridSerialRNG &rng,sobj &l){ - rng.fill(l,rng._bernoulli); - } + // template inline void bernoulli(GridSerialRNG &rng,sobj &l){ + // rng.fill(l,rng._bernoulli); + // } } #endif From f7ca6ca889b91b54b61eefae752005ac3d01e677 Mon Sep 17 00:00:00 2001 From: paboyle Date: Sat, 30 Apr 2016 03:48:28 -0700 Subject: [PATCH 03/12] Bernoulli reenabled -- using integral type for the discrete_distribution, but then casts in the fill --- lib/lattice/Lattice_rng.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h index 1c14a2b7..3254af30 100644 --- a/lib/lattice/Lattice_rng.h +++ b/lib/lattice/Lattice_rng.h @@ -122,7 +122,7 @@ namespace Grid { std::vector _generators; std::vector> _uniform; std::vector> _gaussian; - // std::vector> _bernoulli; + std::vector> _bernoulli; void GetState(std::vector & saved,int gen) { saved.resize(RngStateCount); @@ -162,7 +162,7 @@ namespace Grid { _generators.resize(1); _uniform.resize(1,std::uniform_real_distribution{0,1}); _gaussian.resize(1,std::normal_distribution(0.0,1.0) ); - // _bernoulli.resize(1,std::discrete_distribution{1,1}); + _bernoulli.resize(1,std::discrete_distribution{1,1}); _seeded=0; } @@ -268,7 +268,7 @@ namespace Grid { _generators.resize(_vol); _uniform.resize(_vol,std::uniform_real_distribution{0,1}); _gaussian.resize(_vol,std::normal_distribution(0.0,1.0) ); - // _bernoulli.resize(_vol,std::discrete_distribution{1,1}); + _bernoulli.resize(_vol,std::discrete_distribution{1,1}); _seeded=0; } @@ -372,9 +372,9 @@ PARALLEL_FOR_LOOP rng.fill(l,rng._gaussian); } - // template inline void bernoulli(GridParallelRNG &rng,Lattice &l){ - // rng.fill(l,rng._bernoulli); - // } + template inline void bernoulli(GridParallelRNG &rng,Lattice &l){ + rng.fill(l,rng._bernoulli); + } template inline void random(GridSerialRNG &rng,sobj &l){ rng.fill(l,rng._uniform); @@ -384,9 +384,9 @@ PARALLEL_FOR_LOOP rng.fill(l,rng._gaussian); } - // template inline void bernoulli(GridSerialRNG &rng,sobj &l){ - // rng.fill(l,rng._bernoulli); - // } + template inline void bernoulli(GridSerialRNG &rng,sobj &l){ + rng.fill(l,rng._bernoulli); + } } #endif From a762a0d9ff3801d7b8213e387b8a8fa0a02e4448 Mon Sep 17 00:00:00 2001 From: paboyle Date: Sat, 30 Apr 2016 06:29:41 -0700 Subject: [PATCH 04/12] Attempt at CIT testing --- .travis.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..d75f8f12 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +# Ubuntu 14.04 Trusty support +sudo: required +dist: trusty +# Enable C++ support +language: cpp +# Compiler selection +compiler: + - gcc +# Build steps +script: + - mkdir build + - cd build + - ../configure --enable-precision=single --enable-simd=AVX2 --enable-comms=none +matrix: + include: + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.9 + env: CXX=g++-4.9 + env: CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" + env: LIBS="-fopenmp -lmpfr -lgmp" From c23375cd6576dc6d72d2fba2371b0cb50579aa81 Mon Sep 17 00:00:00 2001 From: paboyle Date: Sat, 30 Apr 2016 06:30:56 -0700 Subject: [PATCH 05/12] Testing travis CI integration --- lib/simd/Intel512wilson.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/simd/Intel512wilson.h b/lib/simd/Intel512wilson.h index 243b89ed..84a2bccb 100644 --- a/lib/simd/Intel512wilson.h +++ b/lib/simd/Intel512wilson.h @@ -27,7 +27,7 @@ Author: paboyle /* 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 ////////////////////////////////////////////////////////////////////////////////////////// From 0d99f620278e379e859489e7a456d8ec11cad3f1 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sat, 30 Apr 2016 17:08:42 +0100 Subject: [PATCH 06/12] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d75f8f12..0c12ad8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,11 @@ compiler: - gcc # Build steps script: + - ./scripts/reconfigure_script - mkdir build - cd build - ../configure --enable-precision=single --enable-simd=AVX2 --enable-comms=none + - make -j 4 matrix: include: - compiler: gcc From e2d8f67f63186e54bf5f28a86970e534e3a9e1b5 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sat, 30 Apr 2016 17:11:57 +0100 Subject: [PATCH 07/12] Update .travis.yml --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c12ad8f..073feeb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,10 @@ script: - mkdir build - cd build - ../configure --enable-precision=single --enable-simd=AVX2 --enable-comms=none - - make -j 4 + - env + - cat config.log + - make + - ./benchmarks/Benchmark_dwf --threads 1 matrix: include: - compiler: gcc From 0ddb7e707bc334a583231c412ea2b9d90ac96997 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sat, 30 Apr 2016 17:22:22 +0100 Subject: [PATCH 08/12] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 073feeb1..0ca06828 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,8 @@ matrix: - ubuntu-toolchain-r-test packages: - g++-4.9 + - libmpfr-dev + - libgmp-dev env: CXX=g++-4.9 env: CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" env: LIBS="-fopenmp -lmpfr -lgmp" From 2ae1c14c03f00307b6ae8620d97fcae95ccfa5f6 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sat, 30 Apr 2016 17:34:38 +0100 Subject: [PATCH 09/12] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0ca06828..51b332e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ matrix: - g++-4.9 - libmpfr-dev - libgmp-dev + - libmpc-dev env: CXX=g++-4.9 env: CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" env: LIBS="-fopenmp -lmpfr -lgmp" From 122195384ea37140782efdbfee066c60de2257e3 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sat, 30 Apr 2016 17:41:23 +0100 Subject: [PATCH 10/12] Update .travis.yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51b332e1..9e5af4c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ dist: trusty language: cpp # Compiler selection compiler: - - gcc + - gcc-4.9 # Build steps script: - ./scripts/reconfigure_script @@ -18,7 +18,7 @@ script: - ./benchmarks/Benchmark_dwf --threads 1 matrix: include: - - compiler: gcc + - compiler: gcc-4.9 addons: apt: sources: @@ -28,6 +28,7 @@ matrix: - libmpfr-dev - libgmp-dev - libmpc-dev + - binutils-dev env: CXX=g++-4.9 env: CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" env: LIBS="-fopenmp -lmpfr -lgmp" From 0eec752216bff64e61a93045ff0f46e1876a3e03 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sat, 30 Apr 2016 17:46:44 +0100 Subject: [PATCH 11/12] Update .travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e5af4c8..192e4cfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ script: - ./scripts/reconfigure_script - mkdir build - cd build - - ../configure --enable-precision=single --enable-simd=AVX2 --enable-comms=none + - ../configure CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" LIBS="-fopenmp -lmpfr -lgmp" --enable-precision=single --enable-simd=AVX2 --enable-comms=none - env - cat config.log - make @@ -30,5 +30,3 @@ matrix: - libmpc-dev - binutils-dev env: CXX=g++-4.9 - env: CXXFLAGS="-mavx2 -mfma -fopenmp -O3 -std=c++11" - env: LIBS="-fopenmp -lmpfr -lgmp" From 465e6f01b702e9bc5083964656bb5c8fb7ebafc9 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Sat, 30 Apr 2016 18:04:36 +0100 Subject: [PATCH 12/12] Update .travis.yml --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 192e4cfb..be429bd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,12 @@ dist: trusty # Enable C++ support language: cpp # Compiler selection -compiler: - - gcc-4.9 # 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 - - env - - cat config.log - make - ./benchmarks/Benchmark_dwf --threads 1 matrix: