From 5e02392f9c3e20b42d0c3ac9db3483a924977a4c Mon Sep 17 00:00:00 2001 From: Guido Cossu Date: Mon, 20 Jun 2016 12:30:51 +0100 Subject: [PATCH 1/2] Fixed compilation error for benchmark_dwf Some parts were assuming floating point precision --- .gitignore | 1 + benchmarks/Benchmark_dwf.cc | 18 +++++++++--------- lib/.dirstamp | 0 lib/algorithms/approx/.dirstamp | 0 lib/communicator/.dirstamp | 0 lib/qcd/action/fermion/.dirstamp | 0 lib/qcd/hmc/.dirstamp | 0 lib/qcd/spin/.dirstamp | 0 lib/qcd/utils/.dirstamp | 0 lib/stencil/.dirstamp | 0 10 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 lib/.dirstamp create mode 100644 lib/algorithms/approx/.dirstamp create mode 100644 lib/communicator/.dirstamp create mode 100644 lib/qcd/action/fermion/.dirstamp create mode 100644 lib/qcd/hmc/.dirstamp create mode 100644 lib/qcd/spin/.dirstamp create mode 100644 lib/qcd/utils/.dirstamp create mode 100644 lib/stencil/.dirstamp diff --git a/.gitignore b/.gitignore index 03554467..80ea8e86 100644 --- a/.gitignore +++ b/.gitignore @@ -62,6 +62,7 @@ stamp-h1 config.sub config.guess INSTALL +.dirstamp # Packages # ############ diff --git a/benchmarks/Benchmark_dwf.cc b/benchmarks/Benchmark_dwf.cc index 0bf57182..5ceec95f 100644 --- a/benchmarks/Benchmark_dwf.cc +++ b/benchmarks/Benchmark_dwf.cc @@ -165,11 +165,11 @@ int main (int argc, char ** argv) if (1) { - typedef WilsonFermion5D WilsonFermion5DF; - LatticeFermionF ssrc(sFGrid); - LatticeFermionF sref(sFGrid); - LatticeFermionF sresult(sFGrid); - WilsonFermion5DF sDw(1,Umu,*sFGrid,*sFrbGrid,*sUGrid,M5,params); + typedef WilsonFermion5D WilsonFermion5DR; + LatticeFermion ssrc(sFGrid); + LatticeFermion sref(sFGrid); + LatticeFermion sresult(sFGrid); + WilsonFermion5DR sDw(1,Umu,*sFGrid,*sFrbGrid,*sUGrid,M5,params); for(int x=0;x site({s,x,y,z,t}); - SpinColourVectorF tmp; + SpinColourVector tmp; peekSite(tmp,src,site); pokeSite(tmp,ssrc,site); }}}}} @@ -217,7 +217,7 @@ int main (int argc, char ** argv) for(int t=0;t site({s,x,y,z,t}); - SpinColourVectorF normal, simd; + SpinColourVector normal, simd; peekSite(normal,result,site); peekSite(simd,sresult,site); sum=sum+norm2(normal-simd); @@ -230,8 +230,8 @@ int main (int argc, char ** argv) if (1) { - LatticeFermionF sr_eo(sFGrid); - LatticeFermionF serr(sFGrid); + LatticeFermion sr_eo(sFGrid); + LatticeFermion serr(sFGrid); LatticeFermion ssrc_e (sFrbGrid); LatticeFermion ssrc_o (sFrbGrid); diff --git a/lib/.dirstamp b/lib/.dirstamp new file mode 100644 index 00000000..e69de29b diff --git a/lib/algorithms/approx/.dirstamp b/lib/algorithms/approx/.dirstamp new file mode 100644 index 00000000..e69de29b diff --git a/lib/communicator/.dirstamp b/lib/communicator/.dirstamp new file mode 100644 index 00000000..e69de29b diff --git a/lib/qcd/action/fermion/.dirstamp b/lib/qcd/action/fermion/.dirstamp new file mode 100644 index 00000000..e69de29b diff --git a/lib/qcd/hmc/.dirstamp b/lib/qcd/hmc/.dirstamp new file mode 100644 index 00000000..e69de29b diff --git a/lib/qcd/spin/.dirstamp b/lib/qcd/spin/.dirstamp new file mode 100644 index 00000000..e69de29b diff --git a/lib/qcd/utils/.dirstamp b/lib/qcd/utils/.dirstamp new file mode 100644 index 00000000..e69de29b diff --git a/lib/stencil/.dirstamp b/lib/stencil/.dirstamp new file mode 100644 index 00000000..e69de29b From bfe14000a95a1e07b46e741fe72b3b75c0c44964 Mon Sep 17 00:00:00 2001 From: paboyle Date: Fri, 1 Jul 2016 16:33:51 +0100 Subject: [PATCH 2/2] Double compile fix --- .travis.yml | 4 ++++ benchmarks/Benchmark_dwf_sweep.cc | 17 ++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82066d87..a2154ead 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,3 +88,7 @@ script: - ../configure CXXFLAGS="-msse4.2 -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=single --enable-simd=SSE4 --enable-comms=none - make -j4 - ./benchmarks/Benchmark_dwf --threads 1 + - make clean + - ../configure CXXFLAGS="-msse4.2 -O3 -std=c++11" LIBS="-lmpfr -lgmp" --enable-precision=double --enable-simd=SSE4 --enable-comms=none + - make -j4 + - ./benchmarks/Benchmark_dwf --threads 1 diff --git a/benchmarks/Benchmark_dwf_sweep.cc b/benchmarks/Benchmark_dwf_sweep.cc index 94a00903..7b4eb66b 100644 --- a/benchmarks/Benchmark_dwf_sweep.cc +++ b/benchmarks/Benchmark_dwf_sweep.cc @@ -1,4 +1,3 @@ - /************************************************************************************* Grid physics library, www.github.com/paboyle/Grid @@ -282,11 +281,11 @@ void benchsDw(std::vector & latt4, int Ls, int threads, int report ) RealD mass=0.1; RealD M5 =1.8; - typedef WilsonFermion5D WilsonFermion5DF; - LatticeFermionF ssrc(sFGrid); - LatticeFermionF sref(sFGrid); - LatticeFermionF sresult(sFGrid); - WilsonFermion5DF sDw(1,Umu,*sFGrid,*sFrbGrid,*sUGrid,M5); + typedef WilsonFermion5D WilsonFermion5DR; + LatticeFermion ssrc(sFGrid); + LatticeFermion sref(sFGrid); + LatticeFermion sresult(sFGrid); + WilsonFermion5DR sDw(1,Umu,*sFGrid,*sFrbGrid,*sUGrid,M5); for(int x=0;x & latt4, int Ls, int threads, int report ) for(int t=0;t site({s,x,y,z,t}); - SpinColourVectorF tmp; + SpinColourVector tmp; peekSite(tmp,src,site); pokeSite(tmp,ssrc,site); }}}}} @@ -328,8 +327,8 @@ void benchsDw(std::vector & latt4, int Ls, int threads, int report ) } - LatticeFermionF sr_eo(sFGrid); - LatticeFermionF serr(sFGrid); + LatticeFermion sr_eo(sFGrid); + LatticeFermion serr(sFGrid); LatticeFermion ssrc_e (sFrbGrid); LatticeFermion ssrc_o (sFrbGrid);