portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

No compile fix on clang

Browse Source
This commit is contained in:
Peter Boyle 2019-01-01 15:55:13 +00:00
parent 802404c78c
commit 38852737e4
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Grid/qcd/action/fermion/ImprovedStaggeredFermion.cc
View File

@ -482,16 +482,16 @@ void ImprovedStaggeredFermion<Impl>::DhopInternalOverlappedComms(StencilImpl &st
auto out_v = out.View(); auto out_v = out.View();
if (dag == DaggerYes) { if (dag == DaggerYes) {
int sz=st.surface_list.size(); int sz=st.surface_list.size();
parallel_for (int ss = 0; ss < sz; ss++) { thread_loop( (int ss = 0; ss < sz; ss++) ,{
int sU = st.surface_list[ss]; int sU = st.surface_list[ss];
Kernels::DhopSiteDag(st,lo,U_v,UUU_v,st.CommBuf(),1,sU,in_v,out_v,0,1); Kernels::DhopSiteDag(st,lo,U_v,UUU_v,st.CommBuf(),1,sU,in_v,out_v,0,1);
} });
} else { } else {
int sz=st.surface_list.size(); int sz=st.surface_list.size();
parallel_for (int ss = 0; ss < sz; ss++) { thread_loop( (int ss = 0; ss < sz; ss++) ,{
int sU = st.surface_list[ss]; int sU = st.surface_list[ss];
Kernels::DhopSite(st,lo,U_v,UUU_v,st.CommBuf(),1,sU,in_v,out_v,0,1); Kernels::DhopSite(st,lo,U_v,UUU_v,st.CommBuf(),1,sU,in_v,out_v,0,1);
} });
} }
} }
DhopComputeTime2 += usecond(); DhopComputeTime2 += usecond();

8
Grid/qcd/action/fermion/ImprovedStaggeredFermion5D.cc
View File

@ -386,16 +386,16 @@ void ImprovedStaggeredFermion5D<Impl>::DhopInternalOverlappedComms(StencilImpl &
auto out_v = out.View(); auto out_v = out.View();
if (dag == DaggerYes) { if (dag == DaggerYes) {
int sz=st.surface_list.size(); int sz=st.surface_list.size();
parallel_for (int ss = 0; ss < sz; ss++) { thread_loop( (int ss = 0; ss < sz; ss++) ,{
int sU = st.surface_list[ss]; int sU = st.surface_list[ss];
Kernels::DhopSiteDag(st,lo,U_v,UUU_v,st.CommBuf(),LLs,sU,in_v,out_v,0,1); //<---------- Kernels::DhopSiteDag(st,lo,U_v,UUU_v,st.CommBuf(),LLs,sU,in_v,out_v,0,1); //<----------
} });
} else { } else {
int sz=st.surface_list.size(); int sz=st.surface_list.size();
parallel_for (int ss = 0; ss < sz; ss++) { thread_loop( (int ss = 0; ss < sz; ss++) ,{
int sU = st.surface_list[ss]; int sU = st.surface_list[ss];
Kernels::DhopSite(st,lo,U_v,UUU_v,st.CommBuf(),LLs,sU,in_v,out_v,0,1);//<---------- Kernels::DhopSite(st,lo,U_v,UUU_v,st.CommBuf(),LLs,sU,in_v,out_v,0,1);//<----------
} });
} }
DhopComputeTime2+=usecond(); DhopComputeTime2+=usecond();
#else #else

8
Grid/qcd/action/fermion/WilsonFermion.cc
View File

@ -439,13 +439,13 @@ void WilsonFermion<Impl>::DhopInternalOverlappedComms(StencilImpl &st, LebesgueO
auto st_v = st.View(); auto st_v = st.View();
int Opt = WilsonKernelsStatic::Opt; int Opt = WilsonKernelsStatic::Opt;
if (dag == DaggerYes) { if (dag == DaggerYes) {
parallel_for (int sss = 0; sss < in.Grid()->oSites(); sss++) { thread_loop( (int sss = 0; sss < in.Grid()->oSites(); sss++) ,{
Kernels::DhopSiteDag(Opt,st_v,U_v,st.CommBuf(),sss,sss,1,1,in_v,out_v,0,1); Kernels::DhopSiteDag(Opt,st_v,U_v,st.CommBuf(),sss,sss,1,1,in_v,out_v,0,1);
} });
} else { } else {
parallel_for (int sss = 0; sss < in.Grid()->oSites(); sss++) { thread_loop( (int sss = 0; sss < in.Grid()->oSites(); sss++) ,{
Kernels::DhopSite(Opt,st_v,U_v,st.CommBuf(),sss,sss,1,1,in_v,out_v,0,1); Kernels::DhopSite(Opt,st_v,U_v,st.CommBuf(),sss,sss,1,1,in_v,out_v,0,1);
} });
} }
} }
#else #else

4
Grid/serialisation/Serialisation.h
View File

@ -36,7 +36,9 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
#include "BinaryIO.h" #include "BinaryIO.h"
#include "TextIO.h" #include "TextIO.h"
#include "XmlIO.h" #include "XmlIO.h"
//#include "JSON_IO.h" #ifndef GRID_NVCC
#include "JSON_IO.h"
#endif
#ifdef HAVE_HDF5 #ifdef HAVE_HDF5
#include "Hdf5IO.h" #include "Hdf5IO.h"