return table
-def _tpc_generate_html_table(header, data, output_file_name, legend=u"",
+def _tpc_generate_html_table(header, data, out_file_name, legend=u"",
footnote=u""):
"""Generate html table from input data with simple sorting possibility.
Inner lists are rows in the table. All inner lists must be of the same
length. The length of these lists must be the same as the length of the
header.
- :param output_file_name: The name (relative or full path) where the
+ :param out_file_name: The name (relative or full path) where the
generated html table is written.
:param legend: The legend to display below the table.
:param footnote: The footnote to display below the table (and legend).
:type header: list
:type data: list of lists
- :type output_file_name: str
+ :type out_file_name: str
:type legend: str
:type footnote: str
"""
go.layout.Updatemenu(
type=u"dropdown",
direction=u"down",
- x=0.03,
+ x=0.0,
xanchor=u"left",
y=1.045,
yanchor=u"top",
active=len(menu_items) - 1,
buttons=list(buttons)
)
- ],
- annotations=[
- go.layout.Annotation(
- text=u"<b>Sort by:</b>",
- x=0,
- xref=u"paper",
- y=1.035,
- yref=u"paper",
- align=u"left",
- showarrow=False
- )
]
)
- ploff.plot(fig, show_link=False, auto_open=False, filename=output_file_name)
-
- # Add legend and footnote:
- if not (legend or footnote):
- return
+ ploff.plot(
+ fig,
+ show_link=False,
+ auto_open=False,
+ filename=f"{out_file_name}_in.html"
+ )
- with open(output_file_name, u"rt") as html_file:
- html_text = html_file.read()
- if html_text:
- try:
- idx = html_text.rindex(u"</div>")
- except ValueError:
- return
- footnote = (legend + footnote).replace(u'\n', u'<br>')
- html_text = (
- html_text[:idx] +
- f"<div>{footnote}</div>" +
- html_text[idx:]
+ file_name = out_file_name.split(u"/")[-1]
+ if u"vpp" in out_file_name:
+ path = u"_tmp/src/vpp_performance_tests/comparisons/"
+ else:
+ path = u"_tmp/src/dpdk_performance_tests/comparisons/"
+ with open(f"{path}{file_name}.rst", u"wt") as rst_file:
+ rst_file.write(
+ u"\n"
+ u".. |br| raw:: html\n\n <br />\n\n\n"
+ u".. |prein| raw:: html\n\n <pre>\n\n\n"
+ u".. |preout| raw:: html\n\n </pre>\n\n"
)
- with open(output_file_name, u"wt") as html_file:
- html_file.write(html_text)
+ rst_file.write(
+ u".. raw:: html\n\n"
+ f' <iframe frameborder="0" scrolling="no" '
+ f'width="1600" height="1000" '
+ f'src="../..{out_file_name.replace(u"_build", u"")}_in.html">'
+ f'</iframe>\n\n'
+ )
+ if legend:
+ rst_file.write(legend[1:].replace(u"\n", u" |br| "))
+ if footnote:
+ rst_file.write(footnote.replace(u"\n", u" |br| ")[1:])
def table_perf_comparison(table, input_data):
f"{item[u'title']} Avg({table[u'include-tests']}): "
f"Mean value of {table[u'include-tests']} [Mpps] computed from "
f"a series of runs of the listed tests executed against "
- f"rls{item[u'title']}.\n"
+ f"{item[u'title']}.\n"
f"{item[u'title']} Stdev({table[u'include-tests']}): "
f"Standard deviation value of {table[u'include-tests']} [Mpps] "
f"computed from a series of runs of the listed tests executed "
- f"against rls{item[u'title']}.\n"
+ f"against {item[u'title']}.\n"
)
header.extend(
[
f"Avg({table[u'include-tests']}): "
f"Mean value of {table[u'include-tests']} [Mpps] computed from a "
f"series of runs of the listed tests executed against "
- f"rls{table[u'reference'][u'title']}.\n"
+ f"{table[u'reference'][u'title']}.\n"
f"{table[u'reference'][u'title']} "
f"Stdev({table[u'include-tests']}): "
f"Standard deviation value of {table[u'include-tests']} [Mpps] "
f"computed from a series of runs of the listed tests executed "
- f"against rls{table[u'reference'][u'title']}.\n"
+ f"against {table[u'reference'][u'title']}.\n"
f"{table[u'compare'][u'title']} "
f"Avg({table[u'include-tests']}): "
f"Mean value of {table[u'include-tests']} [Mpps] computed from a "
f"series of runs of the listed tests executed against "
- f"rls{table[u'compare'][u'title']}.\n"
+ f"{table[u'compare'][u'title']}.\n"
f"{table[u'compare'][u'title']} "
f"Stdev({table[u'include-tests']}): "
f"Standard deviation value of {table[u'include-tests']} [Mpps] "
f"computed from a series of runs of the listed tests executed "
- f"against rls{table[u'compare'][u'title']}.\n"
+ f"against {table[u'compare'][u'title']}.\n"
f"Diff({table[u'reference'][u'title']},"
f"{table[u'compare'][u'title']}): "
f"Percentage change calculated for mean values.\n"
_tpc_generate_html_table(
header,
tbl_lst,
- f"{table[u'output-file']}.html",
+ table[u'output-file'],
legend=legend,
footnote=footnote
)
f"{item[u'title']} Avg({table[u'include-tests']}): "
f"Mean value of {table[u'include-tests']} [Mpps] computed from "
f"a series of runs of the listed tests executed against "
- f"rls{item[u'title']}.\n"
+ f"{item[u'title']}.\n"
f"{item[u'title']} Stdev({table[u'include-tests']}): "
f"Standard deviation value of {table[u'include-tests']} [Mpps] "
f"computed from a series of runs of the listed tests executed "
- f"against rls{item[u'title']}.\n"
+ f"against {item[u'title']}.\n"
)
header.extend(
[
f"Avg({table[u'include-tests']}): "
f"Mean value of {table[u'include-tests']} [Mpps] computed from a "
f"series of runs of the listed tests executed against "
- f"rls{table[u'reference'][u'title']}.\n"
+ f"{table[u'reference'][u'title']}.\n"
f"{table[u'reference'][u'title']} "
f"Stdev({table[u'include-tests']}): "
f"Standard deviation value of {table[u'include-tests']} [Mpps] "
f"computed from a series of runs of the listed tests executed "
- f"against rls{table[u'reference'][u'title']}.\n"
+ f"against {table[u'reference'][u'title']}.\n"
f"{table[u'compare'][u'title']} "
f"Avg({table[u'include-tests']}): "
f"Mean value of {table[u'include-tests']} [Mpps] computed from a "
f"series of runs of the listed tests executed against "
- f"rls{table[u'compare'][u'title']}.\n"
+ f"{table[u'compare'][u'title']}.\n"
f"{table[u'compare'][u'title']} "
f"Stdev({table[u'include-tests']}): "
f"Standard deviation value of {table[u'include-tests']} [Mpps] "
f"computed from a series of runs of the listed tests executed "
- f"against rls{table[u'compare'][u'title']}.\n"
+ f"against {table[u'compare'][u'title']}.\n"
f"Diff({table[u'reference'][u'title']},"
f"{table[u'compare'][u'title']}): "
f"Percentage change calculated for mean values.\n"
_tpc_generate_html_table(
header,
tbl_lst,
- f"{table[u'output-file']}.html",
+ table[u'output-file'],
legend=legend,
footnote=footnote
)
f"{table[u'output-file']}.txt",
delimiter=u";")
- with open(table[u'output-file'], u'a') as txt_file:
+ with open(f"{table[u'output-file']}.txt", u'a') as txt_file:
txt_file.write(legend)
# Generate html table:
_tpc_generate_html_table(
header,
tbl_lst,
- f"{table[u'output-file']}.html",
+ table[u'output-file'],
legend=legend
)
_tpc_generate_html_table(
header,
tbl_lst,
- f"{table[u'output-file']}.html",
+ table[u'output-file'],
legend=legend
)
Code Review / csit.git / blobdiff