mirror of
https://github.com/ARM-software/workload-automation.git
synced 2025-03-21 01:59:13 +00:00
framework: move instruments -> instrument
Use the singular to be consistent with other modules in wa.framework.
This commit is contained in:
parent
b7aa7d68b5
commit
12a33c8aeb
@ -8,8 +8,8 @@ from wa.framework.exception import (OutputProcessorError, ResourceError,
|
||||
from wa.framework.exception import (WAError, NotFoundError, ValidationError,
|
||||
WorkloadError)
|
||||
from wa.framework.exception import WorkerThreadError, PluginLoaderError
|
||||
from wa.framework.instruments import (Instrument, very_slow, slow, normal, fast,
|
||||
very_fast)
|
||||
from wa.framework.instrument import (Instrument, very_slow, slow, normal, fast,
|
||||
very_fast)
|
||||
from wa.framework.output import RunOutput, discover_wa_outputs
|
||||
from wa.framework.plugin import Plugin, Parameter
|
||||
from wa.framework.output_processor import OutputProcessor
|
||||
|
@ -20,7 +20,7 @@ from copy import copy
|
||||
from datetime import datetime
|
||||
|
||||
import wa.framework.signal as signal
|
||||
from wa.framework import instruments
|
||||
from wa.framework import instrument
|
||||
from wa.framework.configuration.core import Status
|
||||
from wa.framework.exception import HostError, WorkloadError
|
||||
from wa.framework.job import Job
|
||||
@ -302,9 +302,9 @@ class Executor(object):
|
||||
output.write_state()
|
||||
|
||||
self.logger.info('Installing instruments')
|
||||
for instrument in config_manager.get_instruments(self.target_manager.target):
|
||||
instruments.install(instrument, context)
|
||||
instruments.validate()
|
||||
for instrument_name in config_manager.get_instruments(self.target_manager.target):
|
||||
instrument.install(instrument_name, context)
|
||||
instrument.validate()
|
||||
|
||||
self.logger.info('Installing output processors')
|
||||
pm = ProcessorManager()
|
||||
|
@ -2,7 +2,7 @@ import logging
|
||||
from copy import copy
|
||||
from datetime import datetime
|
||||
|
||||
from wa.framework import pluginloader, signal, instruments
|
||||
from wa.framework import pluginloader, signal, instrument
|
||||
from wa.framework.configuration.core import Status
|
||||
|
||||
# Because of use of Enum (dynamic attrs)
|
||||
@ -72,7 +72,7 @@ class Job(object):
|
||||
def configure_augmentations(self, context, pm):
|
||||
instruments_to_enable = set()
|
||||
output_processors_to_enable = set()
|
||||
enabled_instruments = set(i.name for i in instruments.get_enabled())
|
||||
enabled_instruments = set(i.name for i in instrument.get_enabled())
|
||||
enabled_output_processors = set(p.name for p in pm.get_enabled())
|
||||
|
||||
for augmentation in self.spec.augmentations.values():
|
||||
@ -83,11 +83,11 @@ class Job(object):
|
||||
output_processors_to_enable.add(augmentation)
|
||||
|
||||
# Disable unrequired instruments
|
||||
for instrument in enabled_instruments.difference(instruments_to_enable):
|
||||
instruments.disable(instrument)
|
||||
for instrument_name in enabled_instruments.difference(instruments_to_enable):
|
||||
instrument.disable(instrument_name)
|
||||
# Enable additional instruments
|
||||
for instrument in instruments_to_enable.difference(enabled_instruments):
|
||||
instruments.enable(instrument)
|
||||
for instrument_name in instruments_to_enable.difference(enabled_instruments):
|
||||
instrument.enable(instrument_name)
|
||||
|
||||
# Disable unrequired output_processors
|
||||
for processor in enabled_output_processors.difference(output_processors_to_enable):
|
||||
|
@ -2,7 +2,7 @@ import logging
|
||||
|
||||
from wa.framework import pluginloader
|
||||
from wa.framework.exception import ConfigError
|
||||
from wa.framework.instruments import is_installed
|
||||
from wa.framework.instrument import is_installed
|
||||
from wa.framework.plugin import Plugin
|
||||
from wa.utils.log import log_error, indent, dedent
|
||||
from wa.utils.misc import isiterable
|
||||
|
@ -18,7 +18,7 @@ import os
|
||||
|
||||
from wa import Instrument, Parameter
|
||||
from wa.framework.exception import InstrumentError
|
||||
from wa.framework.instruments import slow
|
||||
from wa.framework.instrument import slow
|
||||
from wa.utils.misc import ensure_file_directory_exists as _f
|
||||
|
||||
class DmesgInstrument(Instrument):
|
||||
|
@ -16,7 +16,7 @@
|
||||
from devlib import HwmonInstrument as _Instrument
|
||||
|
||||
from wa import Instrument
|
||||
from wa.framework.instruments import fast
|
||||
from wa.framework.instrument import fast
|
||||
|
||||
MOMENTARY_QUANTITIES = ['temperature', 'power', 'voltage', 'current', 'fps']
|
||||
CUMULATIVE_QUANTITIES = ['energy', 'tx', 'tx/rx', 'frames']
|
||||
|
@ -39,7 +39,7 @@ from devlib.utils.android import ApkInfo
|
||||
|
||||
from wa import Instrument, Parameter, very_fast
|
||||
from wa.framework.exception import ConfigError
|
||||
from wa.framework.instruments import slow
|
||||
from wa.framework.instrument import slow
|
||||
from wa.utils.misc import as_relative, diff_tokens, write_table
|
||||
from wa.utils.misc import ensure_file_directory_exists as _f
|
||||
from wa.utils.misc import ensure_directory_exists as _d
|
||||
|
@ -22,7 +22,7 @@ from devlib import FtraceCollector
|
||||
|
||||
from wa import Instrument, Parameter
|
||||
from wa.framework import signal
|
||||
from wa.framework.instruments import very_slow
|
||||
from wa.framework.instrument import very_slow
|
||||
from wa.framework.exception import InstrumentError
|
||||
from wa.utils.types import list_of_strings
|
||||
from wa.utils.misc import which
|
||||
|
Loading…
x
Reference in New Issue
Block a user