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

instrument/energy: Fix backend parameter passing

Browse Source 
- Convert parameter keys to identifiers before applying
- Raise an error if passed a param invalid for a backend.
This commit is contained in:
Sergei Trofimov 2017-10-10 09:45:40 +01:00
parent c3438b6814
commit a6cb9eb6a4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wa/instrumentation/energy_measurement.py
View File

@ -30,7 +30,7 @@ from wa import Instrument, Parameter
from wa.framework import pluginloader
from wa.framework.plugin import Plugin
from wa.framework.exception import ConfigError, InstrumentError
from wa.utils.types import list_of_strings, list_of_ints, list_or_string, obj_dict
from wa.utils.types import list_of_strings, list_of_ints, list_or_string, obj_dict, identifier
class EnergyInstrumentBackend(Plugin):
@ -249,10 +249,15 @@ class EnergyMeasurement(Instrument):
self.backend = self.loader.get_plugin(self.instrument)
self.params = obj_dict()
instrument_parameters = {identifier(k): v
for k, v in self.instrument_parameters.iteritems()}
supported_params = self.backend.get_parameters()
for name, param in supported_params.iteritems():
value = self.instrument_parameters.get(name)
value = instrument_parameters.pop(name, None)
param.set_value(self.params, value)
if instrument_parameters:
msg = 'Unexpected parameters for backend "{}": {}'
raise ConfigError(msg.format(self.instrument, instrument_parameters))
self.backend.validate_parameters(self.params)
def initialize(self, context):