Standardize reported sizes.

dealias · Nov 12, 2022 · f7d0f9d · f7d0f9d
1 parent 5a7c8e1
commit f7d0f9d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/tests/conv2.cc b/tests/conv2.cc
@@ -228,7 +228,7 @@ int main(int argc, char* argv[])
       T[i]=seconds();
     }
 
-    timings("Implicit",mx*my,T,N,stats);
+    timings("Implicit",(2*mx-1)*(2*my-1),T,N,stats);
     cout << endl;
 
     if(Normalized) {
@@ -269,7 +269,7 @@ int main(int argc, char* argv[])
       T[i]=seconds();
     }
 
-    timings(Pruned ? "Pruned" : "Explicit",mx*my,T,N,stats);
+    timings(Pruned ? "Pruned" : "Explicit",(2*mx-1)*(2*my-1),T,N,stats);
     cout << endl;
 
     unsigned int offset=nx/2-mx+1;
@@ -298,7 +298,7 @@ int main(int argc, char* argv[])
     C.convolve(h,F[0],F[1]);
     T[0]=seconds();
 
-    timings("Direct",mx*my,T,1);
+    timings("Direct",(2*mx-1)*(2*my-1),T,1);
     cout << endl;
 
     if(Output) {

diff --git a/tests/conv3.cc b/tests/conv3.cc
@@ -272,7 +272,7 @@ int main(int argc, char* argv[])
       T[i]=seconds();
     }
 
-    timings("Implicit",mx*my*mz,T,N,stats);
+    timings("Implicit",(2*mx-1)*(2*my-1)*(2*mz-1),T,N,stats);
     cout << endl;
 
     if(Normalized) {
@@ -324,7 +324,7 @@ int main(int argc, char* argv[])
       T[i] += seconds();
     }
 
-    timings("Explicit",mx*my*mz,T,N,stats);
+    timings("Explicit",(2*mx-1)*(2*my-1)*(2*mz-1),T,N,stats);
     cout << endl;
 
     unsigned int xoffset=nx/2-mx+1;
@@ -362,7 +362,7 @@ int main(int argc, char* argv[])
     C.convolve(h,F[0],F[1]);
     T[0]=seconds();
 
-    timings("Direct",mx*my*mz,T,1);
+    timings("Direct",(2*mx-1)*(2*my-1)*(2*mz-1),T,1);
     cout << endl;
 
     if(nxp*nyp*mz < outlimit)

diff --git a/tests/hybridconvh2.cc b/tests/hybridconvh2.cc
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
   }
 
   cout << endl;
-  timings("Hybrid",Lx*Hy,T,K,stats);
+  timings("Hybrid",Lx*Ly,T,K,stats);
   cout << endl;
 
   if(Output) {

diff --git a/tests/hybridconvh3.cc b/tests/hybridconvh3.cc
@@ -97,7 +97,7 @@ int main(int argc, char* argv[])
   }
 
   cout << endl;
-  timings("Hybrid",Lx*Ly*Hz,T,K,stats);
+  timings("Hybrid",Lx*Ly*Lz,T,K,stats);
   cout << endl;
 
   if(Output) {

diff --git a/tests/timing.py b/tests/timing.py
@@ -300,9 +300,6 @@ def main(argv):
 
     if p == "conv3":
         hermitian = True
-        if(runtype != "implicit"):
-            print(p + " has no " + r + " option")
-            dorun = False
 
     if p == "tconv":
         ternary = True
@@ -515,7 +512,7 @@ def main(argv):
         for i in range(a,b+1,1 if I == 0 else I):
             if I != 0:
                 m=i
-            elif not hermitian or runtype == "implicit": #or hybrid:
+            elif not hermitian or runtype == "implicit":# or hybrid:
                 m = int(pow(2,i))
             else:
                 if not ternary: