sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-02 11:22:41 +01:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
parent c3438b6814 cd54cb7baf
commit 4eda719130
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wa/instrumentation/energy_measurement.py
View File

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