aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/presentation/generator_plots.py
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-10-05 10:44:15 +0200
committerTibor Frank <tifrank@cisco.com>2018-10-31 13:45:15 +0100
commit8243ea78854683f2f80da53d8f197f10316e4801 (patch)
treeb67155f4abdd8e8cdec39427ad81d927378e1ec4 /resources/tools/presentation/generator_plots.py
parent810913a6967d080612a01463d39acdefc1e3e640 (diff)
CSIT-1332: Proposal of new layout of all graphs
Change-Id: Ib5d113fd2071e481bcc5e3d043a43a58947b8da1 Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources/tools/presentation/generator_plots.py')
-rw-r--r--resources/tools/presentation/generator_plots.py527
1 files changed, 415 insertions, 112 deletions
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index a6b255eed2..890de208e3 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -21,10 +21,20 @@ import plotly.offline as ploff
import plotly.graph_objs as plgo
from plotly.exceptions import PlotlyError
+from collections import OrderedDict
+from copy import deepcopy
from utils import mean
+COLORS = ["SkyBlue", "Olive", "Purple", "Coral", "Indigo", "Pink",
+ "Chocolate", "Brown", "Magenta", "Cyan", "Orange", "Black",
+ "Violet", "Blue", "Yellow", "BurlyWood", "CadetBlue", "Crimson",
+ "DarkBlue", "DarkCyan", "DarkGreen", "Green", "GoldenRod",
+ "LightGreen", "LightSeaGreen", "LightSkyBlue", "Maroon",
+ "MediumSeaGreen", "SeaGreen", "LightSlateGrey"]
+
+
def generate_plots(spec, data):
"""Generate all plots specified in the specification file.
@@ -37,8 +47,11 @@ def generate_plots(spec, data):
logging.info("Generating the plots ...")
for index, plot in enumerate(spec.plots):
try:
- logging.info(" Plot nr {0}:".format(index + 1))
+ logging.info(" Plot nr {0}: {1}".format(index + 1,
+ plot.get("title", "")))
+ plot["limits"] = spec.configuration["limits"]
eval(plot["algorithm"])(plot, data)
+ logging.info(" Done.")
except NameError as err:
logging.error("Probably algorithm '{alg}' is not defined: {err}".
format(alg=plot["algorithm"], err=repr(err)))
@@ -55,9 +68,6 @@ def plot_performance_box(plot, input_data):
:type input_data: InputData
"""
- logging.info(" Generating the plot {0} ...".
- format(plot.get("title", "")))
-
# Transform the data
plot_title = plot.get("title", "")
logging.info(" Creating the data set for the {0} '{1}'.".
@@ -69,11 +79,13 @@ def plot_performance_box(plot, input_data):
# Prepare the data for the plot
y_vals = dict()
+ y_tags = dict()
for job in data:
for build in job:
for test in build:
if y_vals.get(test["parent"], None) is None:
y_vals[test["parent"]] = list()
+ y_tags[test["parent"]] = test.get("tags", None)
try:
if test["type"] in ("NDRPDR", ):
if "-pdr" in plot_title.lower():
@@ -89,36 +101,72 @@ def plot_performance_box(plot, input_data):
except (KeyError, TypeError):
y_vals[test["parent"]].append(None)
+ # Sort the tests
+ order = plot.get("sort", None)
+ if order and y_tags:
+ y_sorted = OrderedDict()
+ y_tags_l = {s: [t.lower() for t in ts] for s, ts in y_tags.items()}
+ for tag in order:
+ logging.info(tag)
+ for suite, tags in y_tags_l.items():
+ if "not " in tag:
+ tag = tag.split(" ")[-1]
+ if tag.lower() in tags:
+ continue
+ else:
+ if tag.lower() not in tags:
+ continue
+ try:
+ y_sorted[suite] = y_vals.pop(suite)
+ y_tags_l.pop(suite)
+ logging.info(suite)
+ except KeyError as err:
+ logging.error("Not found: {0}".format(err))
+ finally:
+ break
+ else:
+ y_sorted = y_vals
+
# Add None to the lists with missing data
max_len = 0
- for val in y_vals.values():
+ for val in y_sorted.values():
if len(val) > max_len:
max_len = len(val)
- for key, val in y_vals.items():
+ for key, val in y_sorted.items():
if len(val) < max_len:
val.extend([None for _ in range(max_len - len(val))])
# Add plot traces
traces = list()
- df = pd.DataFrame(y_vals)
+ df = pd.DataFrame(y_sorted)
df.head()
+ y_max = list()
for i, col in enumerate(df.columns):
name = "{0}. {1}".format(i + 1, col.lower().replace('-ndrpdrdisc', '').
replace('-ndrpdr', ''))
+ logging.info(name)
traces.append(plgo.Box(x=[str(i + 1) + '.'] * len(df[col]),
- y=df[col],
+ y=[y / 1000000 if y else None for y in df[col]],
name=name,
**plot["traces"]))
+ val_max = max(df[col])
+ if val_max:
+ y_max.append(int(val_max / 1000000) + 1)
try:
# Create plot
- plpl = plgo.Figure(data=traces, layout=plot["layout"])
+ layout = deepcopy(plot["layout"])
+ if layout.get("title", None):
+ layout["title"] = "<b>Packet Throughput:</b> {0}". \
+ format(layout["title"])
+ if y_max:
+ layout["yaxis"]["range"] = [0, max(y_max)]
+ plpl = plgo.Figure(data=traces, layout=layout)
# Export Plot
logging.info(" Writing file '{0}{1}'.".
format(plot["output-file"], plot["output-file-type"]))
- ploff.plot(plpl,
- show_link=False, auto_open=False,
+ ploff.plot(plpl, show_link=False, auto_open=False,
filename='{0}{1}'.format(plot["output-file"],
plot["output-file-type"]))
except PlotlyError as err:
@@ -126,11 +174,9 @@ def plot_performance_box(plot, input_data):
format(str(err).replace("\n", " ")))
return
- logging.info(" Done.")
-
-def plot_latency_box(plot, input_data):
- """Generate the plot(s) with algorithm: plot_latency_box
+def plot_latency_error_bars(plot, input_data):
+ """Generate the plot(s) with algorithm: plot_latency_error_bars
specified in the specification file.
:param plot: Plot to generate.
@@ -139,9 +185,6 @@ def plot_latency_box(plot, input_data):
:type input_data: InputData
"""
- logging.info(" Generating the plot {0} ...".
- format(plot.get("title", "")))
-
# Transform the data
plot_title = plot.get("title", "")
logging.info(" Creating the data set for the {0} '{1}'.".
@@ -153,6 +196,7 @@ def plot_latency_box(plot, input_data):
# Prepare the data for the plot
y_tmp_vals = dict()
+ y_tags = dict()
for job in data:
for build in job:
for test in build:
@@ -165,6 +209,7 @@ def plot_latency_box(plot, input_data):
list(), # direction2, avg
list() # direction2, max
]
+ y_tags[test["parent"]] = test.get("tags", None)
try:
if test["type"] in ("NDRPDR", ):
if "-pdr" in plot_title.lower():
@@ -190,51 +235,111 @@ def plot_latency_box(plot, input_data):
except (KeyError, TypeError):
pass
- y_vals = dict()
- for key, values in y_tmp_vals.items():
- y_vals[key] = list()
- for val in values:
- if val:
- average = mean(val)
- else:
- average = None
- y_vals[key].append(average)
- y_vals[key].append(average) # Twice for plot.ly
+ # Sort the tests
+ order = plot.get("sort", None)
+ if order and y_tags:
+ y_sorted = OrderedDict()
+ y_tags_l = {s: [t.lower() for t in ts] for s, ts in y_tags.items()}
+ for tag in order:
+ for suite, tags in y_tags_l.items():
+ if tag.lower() in tags:
+ try:
+ y_sorted[suite] = y_tmp_vals.pop(suite)
+ y_tags_l.pop(suite)
+ except KeyError as err:
+ logging.error("Not found: {0}".format(err))
+ finally:
+ break
+ else:
+ y_sorted = y_tmp_vals
- # Add plot traces
- traces = list()
- try:
- df = pd.DataFrame(y_vals)
- df.head()
- except ValueError as err:
- logging.error(" Finished with error: {}".
- format(str(err).replace("\n", " ")))
- return
+ x_vals = list()
+ y_vals = list()
+ y_mins = list()
+ y_maxs = list()
+ for key, val in y_sorted.items():
+ key = "-".join(key.split("-")[1:-1])
+ x_vals.append(key) # dir 1
+ y_vals.append(mean(val[1]) if val[1] else None)
+ y_mins.append(mean(val[0]) if val[0] else None)
+ y_maxs.append(mean(val[2]) if val[2] else None)
+ x_vals.append(key) # dir 2
+ y_vals.append(mean(val[4]) if val[4] else None)
+ y_mins.append(mean(val[3]) if val[3] else None)
+ y_maxs.append(mean(val[5]) if val[5] else None)
- for i, col in enumerate(df.columns):
- name = "{0}. {1}".format(i + 1, col.lower().replace('-ndrpdrdisc', '').
- replace('-ndrpdr', ''))
- traces.append(plgo.Box(x=['TGint1-to-SUT1-to-SUT2-to-TGint2',
- 'TGint1-to-SUT1-to-SUT2-to-TGint2',
- 'TGint1-to-SUT1-to-SUT2-to-TGint2',
- 'TGint1-to-SUT1-to-SUT2-to-TGint2',
- 'TGint1-to-SUT1-to-SUT2-to-TGint2',
- 'TGint1-to-SUT1-to-SUT2-to-TGint2',
- 'TGint2-to-SUT2-to-SUT1-to-TGint1',
- 'TGint2-to-SUT2-to-SUT1-to-TGint1',
- 'TGint2-to-SUT2-to-SUT1-to-TGint1',
- 'TGint2-to-SUT2-to-SUT1-to-TGint1',
- 'TGint2-to-SUT2-to-SUT1-to-TGint1',
- 'TGint2-to-SUT2-to-SUT1-to-TGint1'],
- y=df[col],
- name=name,
- **plot["traces"]))
+ traces = list()
+ annotations = list()
+
+ for idx in range(len(x_vals)):
+ if not bool(int(idx % 2)):
+ direction = "West - East"
+ else:
+ direction = "East - West"
+ hovertext = ("Test: {test}<br>"
+ "Direction: {dir}<br>".format(test=x_vals[idx],
+ dir=direction))
+ if isinstance(y_maxs[idx], float):
+ hovertext += "Max: {max:.2f}uSec<br>".format(max=y_maxs[idx])
+ if isinstance(y_vals[idx], float):
+ hovertext += "Avg: {avg:.2f}uSec<br>".format(avg=y_vals[idx])
+ if isinstance(y_mins[idx], float):
+ hovertext += "Min: {min:.2f}uSec".format(min=y_mins[idx])
+
+ if isinstance(y_maxs[idx], float) and isinstance(y_vals[idx], float):
+ array = [y_maxs[idx] - y_vals[idx], ]
+ else:
+ array = [None, ]
+ if isinstance(y_mins[idx], float) and isinstance(y_vals[idx], float):
+ arrayminus = [y_vals[idx] - y_mins[idx], ]
+ else:
+ arrayminus = [None, ]
+ traces.append(plgo.Scatter(
+ x=[idx, ],
+ y=[y_vals[idx], ],
+ name=x_vals[idx],
+ legendgroup=x_vals[idx],
+ showlegend=bool(int(idx % 2)),
+ mode="markers",
+ error_y=dict(
+ type='data',
+ symmetric=False,
+ array=array,
+ arrayminus=arrayminus,
+ color=COLORS[int(idx / 2)]
+ ),
+ marker=dict(
+ size=10,
+ color=COLORS[int(idx / 2)],
+ ),
+ text=hovertext,
+ hoverinfo="text",
+ ))
+ annotations.append(dict(
+ x=idx,
+ y=0,
+ xref="x",
+ yref="y",
+ xanchor="center",
+ yanchor="top",
+ text="E-W" if bool(int(idx % 2)) else "W-E",
+ font=dict(
+ size=16,
+ ),
+ align="center",
+ showarrow=False
+ ))
try:
# Create plot
logging.info(" Writing file '{0}{1}'.".
format(plot["output-file"], plot["output-file-type"]))
- plpl = plgo.Figure(data=traces, layout=plot["layout"])
+ layout = deepcopy(plot["layout"])
+ if layout.get("title", None):
+ layout["title"] = "<b>Packet Latency:</b> {0}".\
+ format(layout["title"])
+ layout["annotations"] = annotations
+ plpl = plgo.Figure(data=traces, layout=layout)
# Export Plot
ploff.plot(plpl,
@@ -246,11 +351,10 @@ def plot_latency_box(plot, input_data):
format(str(err).replace("\n", " ")))
return
- logging.info(" Done.")
-
def plot_throughput_speedup_analysis(plot, input_data):
- """Generate the plot(s) with algorithm: plot_throughput_speedup_analysis
+ """Generate the plot(s) with algorithm:
+ plot_throughput_speedup_analysis
specified in the specification file.
:param plot: Plot to generate.
@@ -259,9 +363,6 @@ def plot_throughput_speedup_analysis(plot, input_data):
:type input_data: InputData
"""
- logging.info(" Generating the plot {0} ...".
- format(plot.get("title", "")))
-
# Transform the data
plot_title = plot.get("title", "")
logging.info(" Creating the data set for the {0} '{1}'.".
@@ -271,16 +372,18 @@ def plot_throughput_speedup_analysis(plot, input_data):
logging.error("No data.")
return
- throughput = dict()
+ y_vals = dict()
+ y_tags = dict()
for job in data:
for build in job:
for test in build:
- if throughput.get(test["parent"], None) is None:
- throughput[test["parent"]] = {"1": list(),
- "2": list(),
- "4": list()}
+ if y_vals.get(test["parent"], None) is None:
+ y_vals[test["parent"]] = {"1": list(),
+ "2": list(),
+ "4": list()}
+ y_tags[test["parent"]] = test.get("tags", None)
try:
- if test["type"] in ("NDRPDR", ):
+ if test["type"] in ("NDRPDR",):
if "-pdr" in plot_title.lower():
ttype = "PDR"
elif "-ndr" in plot_title.lower():
@@ -288,62 +391,270 @@ def plot_throughput_speedup_analysis(plot, input_data):
else:
continue
if "1C" in test["tags"]:
- throughput[test["parent"]]["1"].\
+ y_vals[test["parent"]]["1"]. \
append(test["throughput"][ttype]["LOWER"])
elif "2C" in test["tags"]:
- throughput[test["parent"]]["2"]. \
+ y_vals[test["parent"]]["2"]. \
append(test["throughput"][ttype]["LOWER"])
elif "4C" in test["tags"]:
- throughput[test["parent"]]["4"]. \
+ y_vals[test["parent"]]["4"]. \
append(test["throughput"][ttype]["LOWER"])
except (KeyError, TypeError):
pass
- if not throughput:
+ if not y_vals:
logging.warning("No data for the plot '{}'".
format(plot.get("title", "")))
return
- for test_name, test_vals in throughput.items():
+ y_1c_max = dict()
+ for test_name, test_vals in y_vals.items():
for key, test_val in test_vals.items():
if test_val:
- throughput[test_name][key] = sum(test_val) / len(test_val)
-
- names = ['1 core', '2 cores', '4 cores']
- x_vals = list()
- y_vals_1 = list()
- y_vals_2 = list()
- y_vals_4 = list()
-
- for test_name, test_vals in throughput.items():
+ y_vals[test_name][key] = sum(test_val) / len(test_val)
+ if key == "1":
+ y_1c_max[test_name] = max(test_val) / 1000000.0
+
+ vals = dict()
+ y_max = list()
+ nic_limit = 0
+ lnk_limit = 0
+ pci_limit = plot["limits"]["pci"]["pci-g3-x8"]
+ for test_name, test_vals in y_vals.items():
if test_vals["1"]:
- x_vals.append("-".join(test_name.split('-')[1:-1]))
- y_vals_1.append(1)
- if test_vals["2"]:
- y_vals_2.append(
- round(float(test_vals["2"]) / float(test_vals["1"]), 2))
- else:
- y_vals_2.append(None)
- if test_vals["4"]:
- y_vals_4.append(
- round(float(test_vals["4"]) / float(test_vals["1"]), 2))
- else:
- y_vals_4.append(None)
-
- y_vals = [y_vals_1, y_vals_2, y_vals_4]
-
- y_vals_zipped = zip(names, y_vals)
+ name = "-".join(test_name.split('-')[1:-1])
+
+ vals[name] = dict()
+ y_val_1 = test_vals["1"] / 1000000.0
+ y_val_2 = test_vals["2"] / 1000000.0 if test_vals["2"] else None
+ y_val_4 = test_vals["4"] / 1000000.0 if test_vals["4"] else None
+
+ vals[name]["val"] = [y_val_1, y_val_2, y_val_4]
+ vals[name]["rel"] = [1.0, None, None]
+ vals[name]["ideal"] = [y_1c_max[test_name],
+ y_1c_max[test_name] * 2,
+ y_1c_max[test_name] * 4]
+ vals[name]["diff"] = \
+ [(y_val_1 - y_1c_max[test_name]) * 100 / y_val_1, None, None]
+
+ val_max = max(max(vals[name]["val"], vals[name]["ideal"]))
+ if val_max:
+ y_max.append(int((val_max / 10) + 1) * 10)
+
+ if y_val_2:
+ vals[name]["rel"][1] = round(y_val_2 / y_val_1, 2)
+ vals[name]["diff"][1] = \
+ (y_val_2 - vals[name]["ideal"][1]) * 100 / y_val_2
+ if y_val_4:
+ vals[name]["rel"][2] = round(y_val_4 / y_val_1, 2)
+ vals[name]["diff"][2] = \
+ (y_val_4 - vals[name]["ideal"][2]) * 100 / y_val_4
+
+ # Limits:
+ if "x520" in test_name:
+ limit = plot["limits"]["nic"]["x520"]
+ elif "x710" in test_name:
+ limit = plot["limits"]["nic"]["x710"]
+ elif "xxv710" in test_name:
+ limit = plot["limits"]["nic"]["xxv710"]
+ elif "xl710" in test_name:
+ limit = plot["limits"]["nic"]["xl710"]
+ else:
+ limit = 0
+ if limit > nic_limit:
+ nic_limit = limit
+
+ mul = 2 if "ge2p" in test_name else 1
+ if "10ge" in test_name:
+ limit = plot["limits"]["link"]["10ge"] * mul
+ elif "25ge" in test_name:
+ limit = plot["limits"]["link"]["25ge"] * mul
+ elif "40ge" in test_name:
+ limit = plot["limits"]["link"]["40ge"] * mul
+ elif "100ge" in test_name:
+ limit = plot["limits"]["link"]["100ge"] * mul
+ else:
+ limit = 0
+ if limit > lnk_limit:
+ lnk_limit = limit
+
+ # Sort the tests
+ order = plot.get("sort", None)
+ if order and y_tags:
+ y_sorted = OrderedDict()
+ y_tags_l = {s: [t.lower() for t in ts] for s, ts in y_tags.items()}
+ for tag in order:
+ for test, tags in y_tags_l.items():
+ if tag.lower() in tags:
+ name = "-".join(test.split('-')[1:-1])
+ try:
+ y_sorted[name] = vals.pop(name)
+ y_tags_l.pop(test)
+ except KeyError as err:
+ logging.error("Not found: {0}".format(err))
+ finally:
+ break
+ else:
+ y_sorted = vals
+
traces = list()
- for val in y_vals_zipped:
- traces.append(plgo.Bar(x=x_vals,
- y=val[1],
- name=val[0]))
+ annotations = list()
+ x_vals = [1, 2, 4]
+
+ # Limits:
+ threshold = 1.1 * max(y_max) # 10%
+
+ nic_limit /= 1000000.0
+ if nic_limit < threshold:
+ traces.append(plgo.Scatter(
+ x=x_vals,
+ y=[nic_limit, ] * len(x_vals),
+ name="NIC: {0:.2f}Mpps".format(nic_limit),
+ showlegend=False,
+ mode="lines",
+ line=dict(
+ dash="dot",
+ color=COLORS[-1],
+ width=1),
+ hoverinfo="none"
+ ))
+ annotations.append(dict(
+ x=1,
+ y=nic_limit,
+ xref="x",
+ yref="y",
+ xanchor="left",
+ yanchor="bottom",
+ text="NIC: {0:.2f}Mpps".format(nic_limit),
+ font=dict(
+ size=14,
+ color=COLORS[-1],
+ ),
+ align="left",
+ showarrow=False
+ ))
+ y_max.append(int((nic_limit / 10) + 1) * 10)
+
+ lnk_limit /= 1000000.0
+ if lnk_limit < threshold:
+ traces.append(plgo.Scatter(
+ x=x_vals,
+ y=[lnk_limit, ] * len(x_vals),
+ name="Link: {0:.2f}Mpps".format(lnk_limit),
+ showlegend=False,
+ mode="lines",
+ line=dict(
+ dash="dot",
+ color=COLORS[-2],
+ width=1),
+ hoverinfo="none"
+ ))
+ annotations.append(dict(
+ x=1,
+ y=lnk_limit,
+ xref="x",
+ yref="y",
+ xanchor="left",
+ yanchor="bottom",
+ text="Link: {0:.2f}Mpps".format(lnk_limit),
+ font=dict(
+ size=14,
+ color=COLORS[-2],
+ ),
+ align="left",
+ showarrow=False
+ ))
+ y_max.append(int((lnk_limit / 10) + 1) * 10)
+
+ pci_limit /= 1000000.0
+ if pci_limit < threshold:
+ traces.append(plgo.Scatter(
+ x=x_vals,
+ y=[pci_limit, ] * len(x_vals),
+ name="PCIe: {0:.2f}Mpps".format(pci_limit),
+ showlegend=False,
+ mode="lines",
+ line=dict(
+ dash="dot",
+ color=COLORS[-3],
+ width=1),
+ hoverinfo="none"
+ ))
+ annotations.append(dict(
+ x=1,
+ y=pci_limit,
+ xref="x",
+ yref="y",
+ xanchor="left",
+ yanchor="bottom",
+ text="PCIe: {0:.2f}Mpps".format(pci_limit),
+ font=dict(
+ size=14,
+ color=COLORS[-3],
+ ),
+ align="left",
+ showarrow=False
+ ))
+ y_max.append(int((pci_limit / 10) + 1) * 10)
+
+ # Perfect and measured:
+ cidx = 0
+ for name, val in y_sorted.iteritems():
+ hovertext = list()
+ for idx in range(len(val["val"])):
+ htext = ""
+ if isinstance(val["val"][idx], float):
+ htext += "value: {0:.2f}Mpps<br>".format(val["val"][idx])
+ if isinstance(val["diff"][idx], float):
+ htext += "diff: {0:.0f}%<br>".format(round(val["diff"][idx]))
+ if isinstance(val["rel"][idx], float):
+ htext += "speedup: {0:.2f}".format(val["rel"][idx])
+ hovertext.append(htext)
+ traces.append(plgo.Scatter(x=x_vals,
+ y=val["val"],
+ name=name,
+ legendgroup=name,
+ mode="lines+markers",
+ line=dict(
+ color=COLORS[cidx],
+ width=2),
+ marker=dict(
+ symbol="circle",
+ size=10
+ ),
+ text=hovertext,
+ hoverinfo="text+name"
+ ))
+ traces.append(plgo.Scatter(x=x_vals,
+ y=val["ideal"],
+ name="{0} perfect".format(name),
+ legendgroup=name,
+ showlegend=False,
+ mode="lines+markers",
+ line=dict(
+ color=COLORS[cidx],
+ width=2,
+ dash="dash"),
+ marker=dict(
+ symbol="circle",
+ size=10
+ ),
+ text=["perfect: {0:.2f}Mpps".format(y)
+ for y in val["ideal"]],
+ hoverinfo="text"
+ ))
+ cidx += 1
try:
# Create plot
logging.info(" Writing file '{0}{1}'.".
format(plot["output-file"], plot["output-file-type"]))
- plpl = plgo.Figure(data=traces, layout=plot["layout"])
+ layout = deepcopy(plot["layout"])
+ if layout.get("title", None):
+ layout["title"] = "<b>Speedup Multi-core:</b> {0}". \
+ format(layout["title"])
+ layout["annotations"].extend(annotations)
+ plpl = plgo.Figure(data=traces, layout=layout)
# Export Plot
ploff.plot(plpl,
@@ -355,8 +666,6 @@ def plot_throughput_speedup_analysis(plot, input_data):
format(str(err).replace("\n", " ")))
return
- logging.info(" Done.")
-
def plot_http_server_performance_box(plot, input_data):
"""Generate the plot(s) with algorithm: plot_http_server_performance_box
@@ -368,9 +677,6 @@ def plot_http_server_performance_box(plot, input_data):
:type input_data: InputData
"""
- logging.info(" Generating the plot {0} ...".
- format(plot.get("title", "")))
-
# Transform the data
logging.info(" Creating the data set for the {0} '{1}'.".
format(plot.get("type", ""), plot.get("title", "")))
@@ -418,13 +724,10 @@ def plot_http_server_performance_box(plot, input_data):
# Export Plot
logging.info(" Writing file '{0}{1}'.".
format(plot["output-file"], plot["output-file-type"]))
- ploff.plot(plpl,
- show_link=False, auto_open=False,
+ ploff.plot(plpl, show_link=False, auto_open=False,
filename='{0}{1}'.format(plot["output-file"],
plot["output-file-type"]))
except PlotlyError as err:
logging.error(" Finished with error: {}".
format(str(err).replace("\n", " ")))
return
-
- logging.info(" Done.")