Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Report: Add data, fix small bugs
[csit.git]
/
resources
/
tools
/
presentation
/
generator_plots.py
diff --git
a/resources/tools/presentation/generator_plots.py
b/resources/tools/presentation/generator_plots.py
index
e79e4de
..
b828b3c
100644
(file)
--- a/
resources/tools/presentation/generator_plots.py
+++ b/
resources/tools/presentation/generator_plots.py
@@
-370,6
+370,14
@@
def plot_perf_box_name(plot, input_data):
return
# Prepare the data for the plot
return
# Prepare the data for the plot
+ plot_title = plot.get(u"title", u"").lower()
+
+ if u"-gbps" in plot_title:
+ value = u"gbps"
+ multiplier = 1e6
+ else:
+ value = u"throughput"
+ multiplier = 1.0
y_vals = OrderedDict()
test_type = u""
for job in data:
y_vals = OrderedDict()
test_type = u""
for job in data:
@@
-380,21
+388,16
@@
def plot_perf_box_name(plot, input_data):
try:
if test[u"type"] in (u"NDRPDR", ):
test_type = u"NDRPDR"
try:
if test[u"type"] in (u"NDRPDR", ):
test_type = u"NDRPDR"
- plot_title = plot.get(u"title", u"").lower()
if u"-pdr" in plot_title:
ttype = u"PDR"
elif u"-ndr" in plot_title:
ttype = u"NDR"
else:
if u"-pdr" in plot_title:
ttype = u"PDR"
elif u"-ndr" in plot_title:
ttype = u"NDR"
else:
- continue
-
- if u"-gbps" in plot_title:
- value = u"gbps"
- multiplier = 1e6
- else:
- value = u"throughput"
- multiplier = 1.0
+ raise RuntimeError(
+ u"Wrong title. No information about test type. "
+ u"Add '-ndr' or '-pdr' to the test title."
+ )
y_vals[test[u"parent"]].append(
test[value][ttype][u"LOWER"] * multiplier
y_vals[test[u"parent"]].append(
test[value][ttype][u"LOWER"] * multiplier
@@
-523,6
+526,15
@@
def plot_tsa_name(plot, input_data):
plot_title = plot_title.lower()
plot_title = plot_title.lower()
+ if u"-gbps" in plot_title:
+ value = u"gbps"
+ h_unit = u"Gbps"
+ multiplier = 1e6
+ else:
+ value = u"throughput"
+ h_unit = u"Mpps"
+ multiplier = 1.0
+
y_vals = OrderedDict()
for job in data:
for build in job:
y_vals = OrderedDict()
for job in data:
for build in job:
@@
-544,13
+556,6
@@
def plot_tsa_name(plot, input_data):
else:
continue
else:
continue
- if u"-gbps" in plot_title:
- value = u"gbps"
- multiplier = 1e6
- else:
- value = u"throughput"
- multiplier = 1.0
-
if u"1C" in test[u"tags"]:
y_vals[test[u"parent"]][u"1"]. \
append(test[value][ttype][u"LOWER"] * multiplier)
if u"1C" in test[u"tags"]:
y_vals[test[u"parent"]][u"1"]. \
append(test[value][ttype][u"LOWER"] * multiplier)
@@
-716,7
+721,7
@@
def plot_tsa_name(plot, input_data):
mode=u"lines",
line=dict(
dash=u"dot",
mode=u"lines",
line=dict(
dash=u"dot",
- color=COLORS[-
2
],
+ color=COLORS[-
1
],
width=1),
hoverinfo=u"none"
))
width=1),
hoverinfo=u"none"
))
@@
-730,7
+735,7
@@
def plot_tsa_name(plot, input_data):
text=f"Link: {lnk_limit:.2f}Mpps",
font=dict(
size=14,
text=f"Link: {lnk_limit:.2f}Mpps",
font=dict(
size=14,
- color=COLORS[-
2
],
+ color=COLORS[-
1
],
),
align=u"left",
showarrow=False
),
align=u"left",
showarrow=False
@@
-748,7
+753,7
@@
def plot_tsa_name(plot, input_data):
mode=u"lines",
line=dict(
dash=u"dot",
mode=u"lines",
line=dict(
dash=u"dot",
- color=COLORS[-
3
],
+ color=COLORS[-
1
],
width=1),
hoverinfo=u"none"
))
width=1),
hoverinfo=u"none"
))
@@
-762,7
+767,7
@@
def plot_tsa_name(plot, input_data):
text=f"PCIe: {pci_limit:.2f}Mpps",
font=dict(
size=14,
text=f"PCIe: {pci_limit:.2f}Mpps",
font=dict(
size=14,
- color=COLORS[-
3
],
+ color=COLORS[-
1
],
),
align=u"left",
showarrow=False
),
align=u"left",
showarrow=False
@@
-779,7
+784,7
@@
def plot_tsa_name(plot, input_data):
if isinstance(val[u"val"][idx], float):
htext += (
f"No. of Runs: {val[u'count'][idx]}<br>"
if isinstance(val[u"val"][idx], float):
htext += (
f"No. of Runs: {val[u'count'][idx]}<br>"
- f"Mean: {val[u'val'][idx]:.2f}
Mpps
<br>"
+ f"Mean: {val[u'val'][idx]:.2f}
{h_unit}
<br>"
)
if isinstance(val[u"diff"][idx], float):
htext += f"Diff: {round(val[u'diff'][idx]):.0f}%<br>"
)
if isinstance(val[u"diff"][idx], float):
htext += f"Diff: {round(val[u'diff'][idx]):.0f}%<br>"