sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-21 18:18:41 +00:00
Code Issues Releases Wiki Activity

daq: daq_power.csv now matches the order of labels (if specified).

Browse Source
This commit is contained in:
Sergei Trofimov 2015-08-13 16:10:58 +01:00
parent 6137d5650f
commit aa2ae03ce6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wlauto/instrumentation/daq/__init__.py
View File

@ -168,6 +168,7 @@ class Daq(Instrument):
with open(path) as fh: with open(path) as fh:
reader = csv.reader(fh) reader = csv.reader(fh)
metrics = reader.next() metrics = reader.next()
self._metrics |= set(metrics)
data = [map(float, d) for d in zip(*list(reader))] data = [map(float, d) for d in zip(*list(reader))]
n = len(data[0]) n = len(data[0])
means = [s / n for s in map(sum, data)] means = [s / n for s in map(sum, data)]
@ -186,6 +187,7 @@ class Daq(Instrument):
if not daq: if not daq:
raise ImportError(import_error_mesg) raise ImportError(import_error_mesg)
self._results = None self._results = None
self._metrics = set()
if self.labels: if self.labels:
if not (len(self.labels) == len(self.resistor_values)): # pylint: disable=superfluous-parens if not (len(self.labels) == len(self.resistor_values)): # pylint: disable=superfluous-parens
raise ConfigError('Number of DAQ port labels does not match the number of resistor values.') raise ConfigError('Number of DAQ port labels does not match the number of resistor values.')
@ -209,7 +211,7 @@ class Daq(Instrument):
def before_overall_results_processing(self, context): def before_overall_results_processing(self, context):
if self._results: if self._results:
headers = ['id', 'workload', 'iteration'] headers = ['id', 'workload', 'iteration']
metrics = sorted(self._results.iteritems().next()[1].keys()) metrics = ['{}_{}'.format(p, m) for p in self.labels for m in sorted(self._metrics)]
headers += metrics headers += metrics
rows = [headers] rows = [headers]
for key, value in self._results.iteritems(): for key, value in self._results.iteritems():