Modified entire test directory to suit new GPU constructs for looping

tests/core/Test_qed.cc

@@ -29,7 +29,6 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace QCD;
 
 typedef PeriodicGaugeImpl<QedGImplR>  QedPeriodicGImplR;
 typedef PhotonR::GaugeField           EmField;

tests/core/Test_staggered5D.cc

@@ -30,7 +30,6 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
- ;
 
 int main (int argc, char ** argv)
 {

tests/core/Test_staggered5Dvec.cc

@@ -30,10 +30,11 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
- ;
+
 
 int main (int argc, char ** argv)
 {
+#ifndef GRID_NVCC
   Grid_init(&argc,&argv);
 
   Coordinate latt_size   = GridDefaultLatt();
@@ -193,4 +194,5 @@ int main (int argc, char ** argv)
 
 
   Grid_finalize();
+#endif
 }

tests/core/Test_wilson_clover.cc

@@ -29,7 +29,6 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
 
 int main(int argc, char **argv)
 {

tests/debug/Test_split_laplacian.cc

@@ -29,7 +29,6 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
 
 
 int main (int argc, char ** argv)

tests/forces/Test_contfrac_force.cc

@@ -101,7 +101,7 @@ int main (int argc, char ** argv)
     auto mom_v = mom.View();
     auto Uprime_v = Uprime.View();
     auto U_v = U.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach( i,mom_v,{
       Uprime_v[i](mu) =
 	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 

tests/forces/Test_dwf_force.cc

@@ -111,12 +111,11 @@ int main (int argc, char ** argv)
 
     // fourth order exponential approx
 
-#if 0
     auto mom_v    = mom.View();
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach( i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
@@ -126,22 +125,6 @@ int main (int argc, char ** argv)
 	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
 	;
     });
-#else
-    auto mom_v    = mom.View();
-    auto U_v      = U.View();
-    auto Uprime_v = Uprime.View();
-
-    accelerator_loop( i,mom_v,{
-      Uprime_v[i](mu) =	  U_v[i](mu)
-	+ mom_v[i](mu)*U_v[i](mu)*dt 
-	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
-	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt/6.0)
-	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt/24.0)
-	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt*dt/120.0)
-	+ mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt*dt*dt/720.0)
-	;
-    });
-#endif
   }
   
   Ddwf.ImportGauge(Uprime);

tests/forces/Test_dwf_force_eofa.cc

@@ -114,7 +114,7 @@ int main (int argc, char** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/forces/Test_dwf_gpforce.cc

@@ -123,7 +123,7 @@ int main (int argc, char ** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/forces/Test_dwf_gpforce_eofa.cc

@@ -118,7 +118,7 @@ int main (int argc, char** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/forces/Test_gp_plaq_force.cc

@@ -88,7 +88,7 @@ int main (int argc, char ** argv)
     auto Uprime_v = Uprime.View();
     auto U_v = U.View();
     auto mom_v = mom.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{ // exp(pmu dt) * Umu
+    thread_foreach(i,mom_v,{ // exp(pmu dt) * Umu
       Uprime_v[i](mu) = U_v[i](mu) + mom_v[i](mu)*U_v[i](mu)*dt ;
     });
   }

tests/forces/Test_gp_rect_force.cc

@@ -90,7 +90,7 @@ int main (int argc, char ** argv)
     auto mom_v   = mom.View();
     auto Uprime_v= Uprime.View();
     auto U_v     = U.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{ // exp(pmu dt) * Umu
+    thread_foreach(i,mom_v,{ // exp(pmu dt) * Umu
       Uprime_v[i](mu) = U_v[i](mu) + mom_v[i](mu)*U_v[i](mu)*dt ;
     });
   }

tests/forces/Test_gpdwf_force.cc

@@ -108,7 +108,7 @@ int main (int argc, char ** argv)
     auto U_v = U.View();
     auto mom_v = mom.View();
     auto Uprime_v = Uprime.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) = U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/forces/Test_gpwilson_force.cc

@@ -103,7 +103,7 @@ int main (int argc, char ** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/forces/Test_mobius_force.cc

@@ -104,7 +104,7 @@ int main (int argc, char ** argv)
     auto U_v      = U.View();
     auto mom_v    = mom.View();
     auto Uprime_v = Uprime.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/forces/Test_mobius_force_eofa.cc

@@ -116,7 +116,7 @@ int main (int argc, char** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/forces/Test_mobius_gpforce_eofa.cc

@@ -119,7 +119,7 @@ int main (int argc, char** argv)
     auto mom_v    = mom.View();
     auto Uprime_v = Uprime.View();
     // fourth order exponential approx
-    thread_loop( (auto i=mom_v.begin(); i<mom_v.end(); i++),{
+    thread_foreach( i, mom_v,{
       Uprime_v[i](mu) = U_v[i](mu) + mom_v[i](mu)*U_v[i](mu)*dt + mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)
                         + mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt/6.0)
                         + mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt*dt*dt/24.0)

tests/forces/Test_partfrac_force.cc

@@ -104,7 +104,7 @@ int main (int argc, char ** argv)
     auto U_v = U.View();
     auto mom_v = mom.View();
     auto Uprime_v = Uprime.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/forces/Test_rect_force.cc

@@ -89,7 +89,7 @@ int main (int argc, char ** argv)
     auto Uprime_v = Uprime.View();
     auto U_v      = U.View();
     auto mom_v    = mom.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{ // exp(pmu dt) * Umu
+    thread_foreach(i,mom_v,{ // exp(pmu dt) * Umu
       Uprime_v[i](mu) = U_v[i](mu) + mom_v[i](mu)*U_v[i](mu)*dt ;
     });
   }

tests/forces/Test_wilson_force.cc

@@ -108,7 +108,7 @@ int main (int argc, char ** argv)
     auto U_v = U.View();
     auto mom_v = mom.View();
     auto Uprime_v = Uprime.View();
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++) ,{
+    thread_foreach( i,mom_v,{
       Uprime_v[i](mu)  =	  U_v[i](mu);
       Uprime_v[i](mu) += mom_v[i](mu)*U_v[i](mu)*dt ;
       Uprime_v[i](mu) += mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0);

tests/forces/Test_wilsonclover_force.cc

@@ -29,7 +29,6 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
 
 int main(int argc, char **argv)
 {
@@ -109,7 +108,7 @@ int main(int argc, char **argv)
     auto Uprime_v = Uprime.View();
     auto U_v      = U.View();
     auto mom_v    = mom.View();
-    thread_loop( (int ss = 0; ss < mom.Grid()->oSites(); ss++),
+    thread_foreach(ss,mom_v,
     {
       Uprime_v[ss]._internal[mu] = ProjectOnGroup(Exponentiate(mom_v[ss]._internal[mu], dt, 12) * U_v[ss]._internal[mu]);
     });

tests/forces/Test_zmobius_force.cc

@@ -118,7 +118,7 @@ int main (int argc, char ** argv)
     auto U_v      = U.View();
     auto Uprime_v = Uprime.View();
 
-    thread_loop( (auto i=mom_v.begin();i<mom_v.end();i++),{
+    thread_foreach(i,mom_v,{
       Uprime_v[i](mu) =	  U_v[i](mu)
 	+ mom_v[i](mu)*U_v[i](mu)*dt 
 	+ mom_v[i](mu) *mom_v[i](mu) *U_v[i](mu)*(dt*dt/2.0)

tests/hmc/Test_hmc_EOWilsonCloverFermionGauge.cc

@@ -30,7 +30,6 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();

tests/hmc/Test_hmc_WC2ASFG_Production.cc

@@ -69,7 +69,6 @@ namespace Grid{
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
 
   typedef Representations< FundamentalRepresentation, TwoIndexAntiSymmetricRepresentation > TheRepresentations;  
 

tests/hmc/Test_hmc_WC2SFG_Production.cc

@@ -69,7 +69,7 @@ namespace Grid{
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   typedef Representations< FundamentalRepresentation, TwoIndexSymmetricRepresentation > TheRepresentations;  
 

tests/hmc/Test_hmc_WCFG_Production.cc

@@ -69,7 +69,7 @@ namespace Grid{
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();

tests/hmc/Test_hmc_WCMixedRepFG_Production.cc

@@ -70,7 +70,7 @@ namespace Grid{
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   // Here change the allowed (higher) representations
   typedef Representations< FundamentalRepresentation, TwoIndexAntiSymmetricRepresentation> TheRepresentations;

tests/hmc/Test_hmc_WCadjFG_Production.cc

@@ -69,7 +69,7 @@ namespace Grid{
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   typedef Representations< FundamentalRepresentation, AdjointRepresentation > TheRepresentations;  
 

tests/hmc/Test_hmc_WG_Production.cc

@@ -47,7 +47,7 @@ namespace Grid{
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   Grid_init(&argc, &argv);
   GridLogLayout();

tests/hmc/Test_hmc_WilsonCloverFermionGauge.cc

@@ -31,7 +31,7 @@ directory
 int main(int argc, char **argv)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();

tests/solver/Test_mobius_bcg_nosplit.cc

@@ -31,7 +31,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/algorithms/iterative/BlockConjugateGradient.h>
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_mobius_bcg_phys_nosplit.cc

@@ -31,7 +31,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/algorithms/iterative/BlockConjugateGradient.h>
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_mobius_bcg_prec_nosplit.cc

@@ -31,7 +31,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/algorithms/iterative/BlockConjugateGradient.h>
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_staggered_cagmres_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_staggered_fcagmres_prec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_staggered_fgmres_prec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_staggered_gmres_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_staggered_mr_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilson_cagmres_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilson_fcagmres_prec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilson_fgmres_prec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilson_gmres_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilson_mg_mp.cc

@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main(int argc, char **argv) {
 

tests/solver/Test_wilson_mr_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilsonclover_cagmres_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilsonclover_fcagmres_prec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilsonclover_fgmres_prec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilsonclover_gmres_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {

tests/solver/Test_wilsonclover_mg.cc

@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main(int argc, char **argv) {
 

tests/solver/Test_wilsonclover_mg_mp.cc

@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main(int argc, char **argv) {
 

tests/solver/Test_wilsonclover_mr_unprec.cc

@@ -29,7 +29,7 @@ directory
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ 
 
 int main (int argc, char ** argv)
 {