Merge branch 'development' into decoder-engine

Author: baltzell

libexec/scaling

@@ -6,7 +6,7 @@ def cli():
     cli.add_argument('-y','--yaml',   metavar='YAML',help='path to YAML file',required=True)
     cli.add_argument('-c','--clara',  metavar='DIR',help='CLARA_HOME path (default=$CLARA_HOME)',default=os.getenv('CLARA_HOME',None))
     cli.add_argument('-t','--threads',metavar='#',help='threads (default=4,8)',default='4,8')
-    cli.add_argument('-e','--events', metavar='#',help='events per threads (default=2550)',default=555,type=int)
+    cli.add_argument('-e','--events', metavar='#',help='events per threads (default=2555)',default=2555,type=int)
     cli.add_argument('-N','--numa',   metavar='#',help='NUMA socket (default=None, choices=[0,1])',default=None,type=int,choices=[0,1])
     cli.add_argument('datafile', help='input EVIO/HIPO data file')
     cfg = cli.parse_args()
@@ -123,6 +123,22 @@ def save(benchmarks):
         for row in table(benchmarks):
             f.write(' '.join([str(x) for x in row])+'\n') 
 
+def plot():
+    import os,shutil,subprocess
+    if shutil.which('gnuplot'):
+        g = os.path.dirname(os.path.abspath(__file__))+'/scaling.gpl'
+        r = subprocess.run(['gnuplot',g], capture_output=True, text=True)
+        if r.returncode == 0:
+            with open('scaling.svg','w') as f:
+                f.write(r.stdout)
+                print('Info:  created scaling.svg from scaling.txt and scaling.gpl!')
+        else:
+            print(r.stdout)
+            print(r.stderr)
+            print('Error:  gnuplot failed!')
+    else:
+        print('Warning:  gnuplot is not in $PATH.')
+
 if __name__ == '__main__':
     cfg = cli()
     import os
@@ -133,4 +149,5 @@ if __name__ == '__main__':
             benchmarks.append([threads, benchmark(cfg, threads, log)])
     show(benchmarks)
     save(benchmarks)
+    plot()
 

libexec/scaling.gpl

@@ -67,6 +67,7 @@ set key nobox inside top left
 f(x) = m*x
 m = 2
 
+set fit quiet
 set fit nolog
 fit [0:24] f(x) datafile using 1:(1/$2*1e3) via m
 rate = sprintf('%.1f Hz/CPU',m)
@@ -84,7 +85,6 @@ plot datafile \
         '' using 1:($5)             pt 9  with points title 'Reader' ,\
         '' using 1:((column($#-1))) pt 11 with points title 'Writer' ,\
 
-#set logscale y
 set size 0.6,1.0
 set origin 0.4,0.0
 set key outside right vertical