Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-891: Add data sources for 1801 report
[csit.git]
/
resources
/
tools
/
presentation
/
generator_tables.py
diff --git
a/resources/tools/presentation/generator_tables.py
b/resources/tools/presentation/generator_tables.py
index
21a7f05
..
6458926
100644
(file)
--- a/
resources/tools/presentation/generator_tables.py
+++ b/
resources/tools/presentation/generator_tables.py
@@
-194,6
+194,9
@@
def table_performance_improvements(table, input_data):
line_lst = list()
for item in data:
if isinstance(item["data"], str):
line_lst = list()
for item in data:
if isinstance(item["data"], str):
+ # Remove -?drdisc from the end
+ if item["data"].endswith("drdisc"):
+ item["data"] = item["data"][:-8]
line_lst.append(item["data"])
elif isinstance(item["data"], float):
line_lst.append("{:.1f}".format(item["data"]))
line_lst.append(item["data"])
elif isinstance(item["data"], float):
line_lst.append("{:.1f}".format(item["data"]))
@@
-266,7
+269,7
@@
def table_performance_improvements(table, input_data):
else:
tbl_item.append({"data": None})
except (IndexError, ValueError, TypeError):
else:
tbl_item.append({"data": None})
except (IndexError, ValueError, TypeError):
- logging.error("No data for {0}".format(tbl_item[
1
]["data"]))
+ logging.error("No data for {0}".format(tbl_item[
0
]["data"]))
tbl_item.append({"data": None})
continue
else:
tbl_item.append({"data": None})
continue
else:
@@
-296,19
+299,19
@@
def table_performance_improvements(table, input_data):
else:
rel_change = item[-1]["data"]
if "ndr_top" in file_name \
else:
rel_change = item[-1]["data"]
if "ndr_top" in file_name \
- and "ndr" in item[
1
]["data"] \
+ and "ndr" in item[
0
]["data"] \
and rel_change >= 10.0:
_write_line_to_file(file_handler, item)
elif "pdr_top" in file_name \
and rel_change >= 10.0:
_write_line_to_file(file_handler, item)
elif "pdr_top" in file_name \
- and "pdr" in item[
1
]["data"] \
+ and "pdr" in item[
0
]["data"] \
and rel_change >= 10.0:
_write_line_to_file(file_handler, item)
elif "ndr_low" in file_name \
and rel_change >= 10.0:
_write_line_to_file(file_handler, item)
elif "ndr_low" in file_name \
- and "ndr" in item[
1
]["data"] \
+ and "ndr" in item[
0
]["data"] \
and rel_change < 10.0:
_write_line_to_file(file_handler, item)
elif "pdr_low" in file_name \
and rel_change < 10.0:
_write_line_to_file(file_handler, item)
elif "pdr_low" in file_name \
- and "pdr" in item[
1
]["data"] \
+ and "pdr" in item[
0
]["data"] \
and rel_change < 10.0:
_write_line_to_file(file_handler, item)
and rel_change < 10.0:
_write_line_to_file(file_handler, item)
@@
-345,6
+348,9
@@
def table_performance_comparison(table, input_data):
:type input_data: InputData
"""
:type input_data: InputData
"""
+ logging.info(" Generating the table {0} ...".
+ format(table.get("title", "")))
+
# Transform the data
data = input_data.filter_data(table)
# Transform the data
data = input_data.filter_data(table)
@@
-377,15
+383,19
@@
def table_performance_comparison(table, input_data):
try:
tbl_dict[tst_name]["ref-data"].\
append(tst_data["throughput"]["value"])
try:
tbl_dict[tst_name]["ref-data"].\
append(tst_data["throughput"]["value"])
- except TypeError as err:
- logging.warning(err)
- logging.warning(tst_data)
+ except TypeError:
+ pass # No data in output.xml for this test
for job, builds in table["compare"]["data"].items():
for build in builds:
for tst_name, tst_data in data[job][str(build)].iteritems():
for job, builds in table["compare"]["data"].items():
for build in builds:
for tst_name, tst_data in data[job][str(build)].iteritems():
- tbl_dict[tst_name]["cmp-data"].\
- append(tst_data["throughput"]["value"])
+ try:
+ tbl_dict[tst_name]["cmp-data"].\
+ append(tst_data["throughput"]["value"])
+ except KeyError:
+ pass
+ except TypeError:
+ tbl_dict.pop(tst_name, None)
tbl_lst = list()
for tst_name in tbl_dict.keys():
tbl_lst = list()
for tst_name in tbl_dict.keys():
@@
-428,6
+438,7
@@
def table_performance_comparison(table, input_data):
table["output-file-ext"])
]
for file_name in tbl_names:
table["output-file-ext"])
]
for file_name in tbl_names:
+ logging.info(" Writing file: '{}'".format(file_name))
with open(file_name, "w") as file_handler:
file_handler.write(header_str)
for test in tbl_lst:
with open(file_name, "w") as file_handler:
file_handler.write(header_str)
for test in tbl_lst:
@@
-448,6
+459,7
@@
def table_performance_comparison(table, input_data):
for i, txt_name in enumerate(tbl_names_txt):
txt_table = None
for i, txt_name in enumerate(tbl_names_txt):
txt_table = None
+ logging.info(" Writing file: '{}'".format(txt_name))
with open(tbl_names[i], 'rb') as csv_file:
csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
for row in csv_content:
with open(tbl_names[i], 'rb') as csv_file:
csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
for row in csv_content:
@@
-468,6
+480,7
@@
def table_performance_comparison(table, input_data):
output_file = "{0}-ndr-1t1c-top{1}".format(table["output-file"],
table["output-file-ext"])
output_file = "{0}-ndr-1t1c-top{1}".format(table["output-file"],
table["output-file-ext"])
+ logging.info(" Writing file: '{}'".format(output_file))
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[1:]):
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[1:]):
@@
-477,6
+490,7
@@
def table_performance_comparison(table, input_data):
output_file = "{0}-ndr-1t1c-bottom{1}".format(table["output-file"],
table["output-file-ext"])
output_file = "{0}-ndr-1t1c-bottom{1}".format(table["output-file"],
table["output-file-ext"])
+ logging.info(" Writing file: '{}'".format(output_file))
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[-1:0:-1]):
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[-1:0:-1]):
@@
-493,6
+507,7
@@
def table_performance_comparison(table, input_data):
output_file = "{0}-pdr-1t1c-top{1}".format(table["output-file"],
table["output-file-ext"])
output_file = "{0}-pdr-1t1c-top{1}".format(table["output-file"],
table["output-file-ext"])
+ logging.info(" Writing file: '{}'".format(output_file))
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[1:]):
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[1:]):
@@
-502,6
+517,7
@@
def table_performance_comparison(table, input_data):
output_file = "{0}-pdr-1t1c-bottom{1}".format(table["output-file"],
table["output-file-ext"])
output_file = "{0}-pdr-1t1c-bottom{1}".format(table["output-file"],
table["output-file-ext"])
+ logging.info(" Writing file: '{}'".format(output_file))
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[-1:0:-1]):
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[-1:0:-1]):