From 2a4a0e43c1f2820df14dbe44dcef2e97e6214f85 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Fri, 26 Jan 2018 23:08:27 +0000
Subject: [PATCH] Hide internals

---
 benchmarks/Benchmark_ITT.cc              |  6 +++---
 benchmarks/Benchmark_dwf.cc              | 10 +++++-----
 benchmarks/Benchmark_dwf_sweep.cc        |  4 ++--
 benchmarks/Benchmark_memory_asynch.cc    |  4 ++--
 benchmarks/Benchmark_memory_bandwidth.cc | 12 ++++++------
 benchmarks/Benchmark_staggered.cc        |  4 ++--
 benchmarks/Benchmark_wilson.cc           | 20 ++++++++++----------
 7 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/benchmarks/Benchmark_ITT.cc b/benchmarks/Benchmark_ITT.cc
index 1d5a9682..92fb06a7 100644
--- a/benchmarks/Benchmark_ITT.cc
+++ b/benchmarks/Benchmark_ITT.cc
@@ -261,8 +261,8 @@ public:
       double start=usecond();
       for(int i=0;i<Nloop;i++){
 	z=a*x-y;
-        x._odata[0]=z._odata[0]; // force serial dependency to prevent optimise away
-        y._odata[4]=z._odata[4];
+        x[0]=z[0]; // force serial dependency to prevent optimise away
+        y[4]=z[4];
       }
       double stop=usecond();
       double time = (stop-start)/Nloop*1000;
@@ -540,7 +540,7 @@ public:
       std::vector<LatticeColourMatrix> U(4,FGrid);
       for(int ss=0;ss<Umu._grid->oSites();ss++){
 	for(int s=0;s<Ls;s++){
-	  Umu5d._odata[Ls*ss+s] = Umu._odata[ss];
+	  Umu5d[Ls*ss+s] = Umu[ss];
 	}
       }
       ref = zero;
diff --git a/benchmarks/Benchmark_dwf.cc b/benchmarks/Benchmark_dwf.cc
index 6e10bbce..56d6d9d5 100644
--- a/benchmarks/Benchmark_dwf.cc
+++ b/benchmarks/Benchmark_dwf.cc
@@ -124,7 +124,7 @@ int main (int argc, char ** argv)
   std::vector<LatticeColourMatrix> U(4,FGrid);
   for(int ss=0;ss<Umu._grid->oSites();ss++){
     for(int s=0;s<Ls;s++){
-      Umu5d._odata[Ls*ss+s] = Umu._odata[ss];
+      Umu5d[Ls*ss+s] = Umu[ss];
     }
   }
   for(int mu=0;mu<Nd;mu++){
@@ -412,14 +412,14 @@ int main (int argc, char ** argv)
 
       //    ref =  src - Gamma(Gamma::Algebra::GammaX)* src ; // 1+gamma_x
       tmp = U[mu]*Cshift(src,mu+1,1);
-      for(int i=0;i<ref._odata_size;i++){
-	ref._odata[i]+= tmp._odata[i] + Gamma(Gmu[mu])*tmp._odata[i]; ;
+      for(int i=0;i<ref.size();i++){
+	ref[i]+= tmp[i] + Gamma(Gmu[mu])*tmp[i]; ;
       }
 
       tmp =adj(U[mu])*src;
       tmp =Cshift(tmp,mu+1,-1);
-      for(int i=0;i<ref._odata_size;i++){
-	ref._odata[i]+= tmp._odata[i] - Gamma(Gmu[mu])*tmp._odata[i]; ;
+      for(int i=0;i<ref.size();i++){
+	ref[i]+= tmp[i] - Gamma(Gmu[mu])*tmp[i]; ;
       }
     }
     ref = -0.5*ref;
diff --git a/benchmarks/Benchmark_dwf_sweep.cc b/benchmarks/Benchmark_dwf_sweep.cc
index d574828a..336dfb1e 100644
--- a/benchmarks/Benchmark_dwf_sweep.cc
+++ b/benchmarks/Benchmark_dwf_sweep.cc
@@ -134,7 +134,7 @@ void benchDw(std::vector<int> & latt4, int Ls, int threads,int report )
   // replicate across fifth dimension
   for(int ss=0;ss<Umu._grid->oSites();ss++){
     for(int s=0;s<Ls;s++){
-      Umu5d._odata[Ls*ss+s] = Umu._odata[ss];
+      Umu5d[Ls*ss+s] = Umu[ss];
     }
   }
 
@@ -274,7 +274,7 @@ void benchsDw(std::vector<int> & latt4, int Ls, int threads, int report )
   // replicate across fifth dimension
   for(int ss=0;ss<Umu._grid->oSites();ss++){
     for(int s=0;s<Ls;s++){
-      Umu5d._odata[Ls*ss+s] = Umu._odata[ss];
+      Umu5d[Ls*ss+s] = Umu[ss];
     }
   }
 
diff --git a/benchmarks/Benchmark_memory_asynch.cc b/benchmarks/Benchmark_memory_asynch.cc
index 20a32e3e..6b9c4e61 100644
--- a/benchmarks/Benchmark_memory_asynch.cc
+++ b/benchmarks/Benchmark_memory_asynch.cc
@@ -80,10 +80,10 @@ int main (int argc, char ** argv)
     double start=usecond();
     parallel_for(int t=0;t<threads;t++){
 
-      sum[t] = x[t]._odata[0];
+      sum[t] = x[t][0];
       for(int i=0;i<Nloop;i++){
 	for(auto ss=x[t].begin();ss<x[t].end();ss++){
-	  sum[t] = sum[t]+x[t]._odata[ss];
+	  sum[t] = sum[t]+x[t][ss];
 	}
       }
       stop[t]=usecond();
diff --git a/benchmarks/Benchmark_memory_bandwidth.cc b/benchmarks/Benchmark_memory_bandwidth.cc
index 0654ed41..766fc0b3 100644
--- a/benchmarks/Benchmark_memory_bandwidth.cc
+++ b/benchmarks/Benchmark_memory_bandwidth.cc
@@ -76,8 +76,8 @@ int main (int argc, char ** argv)
       double start=usecond();
       for(int i=0;i<Nloop;i++){
 	axpy(z,a,x,y);
-        x._odata[0]=z._odata[0]; // serial loop dependence to prevent optimise
-        y._odata[4]=z._odata[4];
+        x[0]=z[0]; // serial loop dependence to prevent optimise
+        y[4]=z[4];
       }
       double stop=usecond();
       double time = (stop-start)/Nloop*1000;
@@ -112,8 +112,8 @@ int main (int argc, char ** argv)
       double start=usecond();
       for(int i=0;i<Nloop;i++){
 	z=a*x-y;
-        x._odata[0]=z._odata[0]; // force serial dependency to prevent optimise away
-        y._odata[4]=z._odata[4];
+        x[0]=z[0]; // force serial dependency to prevent optimise away
+        y[4]=z[4];
       }
       double stop=usecond();
       double time = (stop-start)/Nloop*1000;
@@ -149,7 +149,7 @@ int main (int argc, char ** argv)
       double start=usecond();
       for(int i=0;i<Nloop;i++){
 	z=a*x;
-        x._odata[0]=z._odata[0]*2.0;
+        x[0]=z[0]*2.0;
       }
       double stop=usecond();
       double time = (stop-start)/Nloop*1000;
@@ -182,7 +182,7 @@ int main (int argc, char ** argv)
       double start=usecond();
       for(int i=0;i<Nloop;i++){
 	nn=norm2(x);
-	vsplat(x._odata[0]._internal[0],nn);
+	vsplat(x[0]._internal[0],nn);
       }
       double stop=usecond();
       double time = (stop-start)/Nloop*1000;
diff --git a/benchmarks/Benchmark_staggered.cc b/benchmarks/Benchmark_staggered.cc
index f3cfef75..cb6d22c8 100644
--- a/benchmarks/Benchmark_staggered.cc
+++ b/benchmarks/Benchmark_staggered.cc
@@ -95,13 +95,13 @@ int main (int argc, char ** argv)
       //    ref =  src + Gamma(Gamma::GammaX)* src ; // 1-gamma_x
       tmp = U[mu]*Cshift(src,mu,1);
       for(int i=0;i<ref._odata.size();i++){
-	ref._odata[i]+= tmp._odata[i] - Gamma(Gmu[mu])*tmp._odata[i]; ;
+	ref[i]+= tmp[i] - Gamma(Gmu[mu])*tmp[i]; ;
       }
 
       tmp =adj(U[mu])*src;
       tmp =Cshift(tmp,mu,-1);
       for(int i=0;i<ref._odata.size();i++){
-	ref._odata[i]+= tmp._odata[i] + Gamma(Gmu[mu])*tmp._odata[i]; ;
+	ref[i]+= tmp[i] + Gamma(Gmu[mu])*tmp[i]; ;
       }
     }
   }
diff --git a/benchmarks/Benchmark_wilson.cc b/benchmarks/Benchmark_wilson.cc
index 0a1c7f6e..fb90bbb1 100644
--- a/benchmarks/Benchmark_wilson.cc
+++ b/benchmarks/Benchmark_wilson.cc
@@ -108,14 +108,14 @@ int main (int argc, char ** argv)
     for(int mu=0;mu<Nd;mu++){
       //    ref =  src + Gamma(Gamma::Algebra::GammaX)* src ; // 1-gamma_x
       tmp = U[mu]*Cshift(src,mu,1);
-      for(int i=0;i<ref._odata_size;i++){
-	ref._odata[i]+= tmp._odata[i] - Gamma(Gmu[mu])*tmp._odata[i]; ;
+      for(int i=0;i<ref.size();i++){
+	ref[i]+= tmp[i] - Gamma(Gmu[mu])*tmp[i]; ;
       }
 
       tmp =adj(U[mu])*src;
       tmp =Cshift(tmp,mu,-1);
-      for(int i=0;i<ref._odata_size;i++){
-	ref._odata[i]+= tmp._odata[i] + Gamma(Gmu[mu])*tmp._odata[i]; ;
+      for(int i=0;i<ref.size();i++){
+	ref[i]+= tmp[i] + Gamma(Gmu[mu])*tmp[i]; ;
       }
     }
   }
@@ -148,8 +148,8 @@ int main (int argc, char ** argv)
   for(int ss=0;ss<0;ss++ ){
     for(int i=0;i<Ns;i++){
       for(int j=0;j<Nc;j++){
-	ComplexF * ref_p = (ComplexF *)&ref._odata[ss]()(i)(j);
-	ComplexF * res_p = (ComplexF *)&result._odata[ss]()(i)(j);
+	ComplexF * ref_p = (ComplexF *)&ref[ss]()(i)(j);
+	ComplexF * res_p = (ComplexF *)&result[ss]()(i)(j);
 	std::cout<<GridLogMessage << ss<< " "<<i<<" "<<j<<" "<< (*ref_p)<<" " <<(*res_p)<<std::endl;
       }
     }
@@ -161,14 +161,14 @@ int main (int argc, char ** argv)
 
       //    ref =  src - Gamma(Gamma::Algebra::GammaX)* src ; // 1+gamma_x
       tmp = U[mu]*Cshift(src,mu,1);
-      for(int i=0;i<ref._odata_size;i++){
-	ref._odata[i]+= tmp._odata[i] + Gamma(Gmu[mu])*tmp._odata[i]; ;
+      for(int i=0;i<ref.size();i++){
+	ref[i]+= tmp[i] + Gamma(Gmu[mu])*tmp[i]; ;
       }
 
       tmp =adj(U[mu])*src;
       tmp =Cshift(tmp,mu,-1);
-      for(int i=0;i<ref._odata_size;i++){
-	ref._odata[i]+= tmp._odata[i] - Gamma(Gmu[mu])*tmp._odata[i]; ;
+      for(int i=0;i<ref.size();i++){
+	ref[i]+= tmp[i] - Gamma(Gmu[mu])*tmp[i]; ;
       }
     }
   }