1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-31 10:11:17 +00:00

Merge pull request #511 from bjackman/energy-measurement-standard-metrics

energy_measurement: Ensure 'standard' energy metrics are produced
This commit is contained in:
setrofim 2017-10-10 15:40:00 +01:00 committed by GitHub
commit 4eda719130

View File

@ -290,7 +290,7 @@ class EnergyMeasurement(Instrument):
# Append the device key to the filename and artifact name, unless
# it's None (as it will be for backends with only 1
# devce/instrument)
if device is not None:
len(self.instruments) > 1:
name = 'energy_instrument_output_{}'.format(device)
else:
name = 'energy_instrument_output'
@ -315,7 +315,7 @@ class EnergyMeasurement(Instrument):
for meas in derived_measurements:
# Append the device key to the metric name, unless it's None (as
# it will be for backends with only 1 devce/instrument)
if device is not None:
if len(self.instruments) > 1:
metric_name = '{}_{}'.format(meas.name, device)
else:
metric_name = meas.name