public
/
ottertune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When aggregating knobs/metrics order the columns by name to ensure matrices have consistent columnnames in case they're combined in subsequent tasks.

This commit is contained in:
dvanaken 2020-04-14 02:15:54 -04:00 committed by Dana Van Aken
parent ff0efd7482
commit aeaae7d9f4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/website/website/utils.py
View File

@ -148,8 +148,8 @@ class DataUtil(object):
def aggregate_data(results, ignore=None): def aggregate_data(results, ignore=None):
if ignore is None: if ignore is None:
ignore = ['range_test'] ignore = ['range_test']
knob_labels = list(JSONUtil.loads(results[0].knob_data.data).keys()) knob_labels = sorted(JSONUtil.loads(results[0].knob_data.data).keys())
metric_labels = list(JSONUtil.loads(results[0].metric_data.data).keys()) metric_labels = sorted(JSONUtil.loads(results[0].metric_data.data).keys())
X_matrix = [] X_matrix = []
y_matrix = [] y_matrix = []
rowlabels = [] rowlabels = []
@ -163,12 +163,14 @@ class DataUtil(object):
("Incorrect number of knobs " ("Incorrect number of knobs "
"(expected={}, actual={})").format(len(knob_labels), "(expected={}, actual={})").format(len(knob_labels),
len(param_data))) len(param_data)))
metric_data = JSONUtil.loads(result.metric_data.data) metric_data = JSONUtil.loads(result.metric_data.data)
if len(metric_data) != len(metric_labels): if len(metric_data) != len(metric_labels):
raise Exception( raise Exception(
("Incorrect number of metrics " ("Incorrect number of metrics "
"(expected={}, actual={})").format(len(metric_labels), "(expected={}, actual={})").format(len(metric_labels),
len(metric_data))) len(metric_data)))
X_matrix.append([param_data[l] for l in knob_labels]) X_matrix.append([param_data[l] for l in knob_labels])
y_matrix.append([metric_data[l] for l in metric_labels]) y_matrix.append([metric_data[l] for l in metric_labels])
rowlabels.append(result.pk) rowlabels.append(result.pk)