Changes in benchmark/plot.py [76f5e9f:e9c5db2]

File:

• benchmark/plot.py (modified) (7 diffs)

benchmark/plot.py

@@ -22 +22 @@
 
 class Field:
-        def __init__(self, unit, _min, _log, _name=None):
+        def __init__(self, unit, _min, _log):
                 self.unit = unit
                 self.min  = _min
                 self.log  = _log
-                self.name = _name
 
 field_names = {
@@ -33 +32 @@
         "Ops per procs"         : Field('Ops'   , 0, False),
         "Ops per threads"       : Field('Ops'   , 0, False),
-        "ns per ops/procs"      : Field(''    , 0, False, _name = "Latency (ns $/$ (Processor $\\times$ Operation))" ),
-        "Number of threads"     : Field(''      , 1, False),
+        "ns per ops/procs"      : Field('ns'    , 0, False),
+        "Number of threads"     : Field('thrd'  , 1, False),
         "Total Operations(ops)" : Field('Ops'   , 0, False),
         "Ops/sec/procs"         : Field('Ops'   , 0, False),
         "Total blocks"          : Field('Blocks', 0, False),
-        "Ops per second"        : Field(''   , 0, False),
+        "Ops per second"        : Field('Ops'   , 0, False),
         "Cycle size (# thrds)"  : Field('thrd'  , 1, False),
         "Duration (ms)"         : Field('ms'    , 0, False),
-        "Target QPS"            : Field(''      , 0, False),
-        "Actual QPS"            : Field(''      , 0, False),
-        "Average Read Latency"  : Field('us'    , 0, True),
+        "Target QPS"            : Field('QPS'   , 0, False),
+        "Actual QPS"            : Field('QPS'   , 0, False),
         "Median Read Latency"   : Field('us'    , 0, True),
         "Tail Read Latency"     : Field('us'    , 0, True),
-        "Average Update Latency": Field('us'    , 0, True),
         "Median Update Latency" : Field('us'    , 0, True),
         "Tail Update Latency"   : Field('us'    , 0, True),
-        "Update Ratio"          : Field('\%'    , 0, False),
 }
 
-def plot(in_data, x, y, options):
+def plot(in_data, x, y, out):
         fig, ax = plt.subplots()
         colors = itertools.cycle(['#0095e3','#006cb4','#69df00','#0aa000','#fb0300','#e30002','#fd8f00','#ff7f00','#8f00d6','#4b009a','#ffff00','#b13f00'])
@@ -96 +92 @@
         print("Making Plots")
 
-        for name, data in sorted(series.items()):
+        for name, data in series.items():
                 _col = next(colors)
                 plt.scatter(data['x'], data['y'], color=_col, label=name, marker='x')
@@ -110 +106 @@
         print("Finishing Plots")
 
-        plt.ylabel(field_names[y].name if field_names[y].name else y)
+        plt.ylabel(y)
         # plt.xticks(range(1, math.ceil(mx) + 1))
-        plt.xlabel(field_names[x].name if field_names[x].name else x)
+        plt.xlabel(x)
         plt.grid(b = True)
         ax.xaxis.set_major_formatter( EngFormatter(unit=field_names[x].unit) )
-        if options.logx:
-                ax.set_xscale('log')
-        elif field_names[x].log:
+        if field_names[x].log:
                 ax.set_xscale('log')
         else:
@@ -123 +117 @@
 
         ax.yaxis.set_major_formatter( EngFormatter(unit=field_names[y].unit) )
-        if options.logy:
-                ax.set_yscale('log')
-        elif field_names[y].log:
+        if field_names[y].log:
                 ax.set_yscale('log')
         else:
-                plt.ylim(field_names[y].min, options.MaxY if options.MaxY else my*1.2)
+                plt.ylim(field_names[y].min, my*1.2)
 
         plt.legend(loc='upper left')
 
         print("Results Ready")
-        if options.out:
-                plt.savefig(options.out, bbox_inches='tight')
+        if out:
+                plt.savefig(out)
         else:
                 plt.show()
@@ -147 +139 @@
         parser.add_argument('-y', nargs='?', type=str, default="", help="Which field to use as the Y axis")
         parser.add_argument('-x', nargs='?', type=str, default="", help="Which field to use as the X axis")
-        parser.add_argument('--logx', action='store_true', help="if set, makes the x-axis logscale")
-        parser.add_argument('--logy', action='store_true', help="if set, makes the y-axis logscale")
-        parser.add_argument('--MaxY', nargs='?', type=int, help="maximum value of the y-axis")
 
         options =  parser.parse_args()
@@ -193 +182 @@
 
 
-        plot(data, wantx, wanty, options)
+        plot(data, wantx, wanty, options.out)