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

Merge pull request #193 from per-mathisen-arm/master

Browse Source 
Fix a frequently repeated typo
This commit is contained in:
setrofim 2016-07-11 09:09:13 +01:00 committed by GitHub
commit ff7a0626ce
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wlauto/config_example.py
View File

@ -189,7 +189,7 @@ logging = {
#################################################################################################### ####################################################################################################
#################################### Instruments Configuration ##################################### #################################### Instruments Configuration #####################################
#################################################################################################### ####################################################################################################
# Instrumention Configuration is related to specific insturment's settings. Some of the # # Instrumention Configuration is related to specific instrument's settings. Some of the #
# instrumentations require specific settings in order for them to work. These settings are # # instrumentations require specific settings in order for them to work. These settings are #
# specified here. # # specified here. #
# Note that these settings only take effect if the corresponding instrument is # Note that these settings only take effect if the corresponding instrument is
@ -222,10 +222,10 @@ logging = {
#################################################################################################### ####################################################################################################
######################################### DAQ configuration ######################################## ######################################### DAQ configuration ########################################
# The host address of the machine that runs the daq Server which the insturment communicates with # The host address of the machine that runs the daq Server which the instrument communicates with
#daq_server_host = '10.1.17.56' #daq_server_host = '10.1.17.56'
# The port number for daq Server in which daq insturment communicates with # The port number for daq Server in which daq instrument communicates with
#daq_server_port = 56788 #daq_server_port = 56788
# The values of resistors 1 and 2 (in Ohms) across which the voltages are measured # The values of resistors 1 and 2 (in Ohms) across which the voltages are measured

2
wlauto/core/instrumentation.py
View File

@ -241,7 +241,7 @@ class ManagedCallback(object):
except (KeyboardInterrupt, DeviceNotRespondingError, TimeoutError): # pylint: disable=W0703 except (KeyboardInterrupt, DeviceNotRespondingError, TimeoutError): # pylint: disable=W0703
raise raise
except Exception as e: # pylint: disable=W0703 except Exception as e: # pylint: disable=W0703
logger.error('Error in insturment {}'.format(self.instrument.name)) logger.error('Error in instrument {}'.format(self.instrument.name))
global failures_detected # pylint: disable=W0603 global failures_detected # pylint: disable=W0603
failures_detected = True failures_detected = True
if isinstance(e, WAError): if isinstance(e, WAError):

4
wlauto/instrumentation/__init__.py
View File

@ -18,14 +18,14 @@ from wlauto.core import instrumentation
def instrument_is_installed(instrument): def instrument_is_installed(instrument):
"""Returns ``True`` if the specified instrument is installed, and ``False`` """Returns ``True`` if the specified instrument is installed, and ``False``
other wise. The insturment maybe specified either as a name or a subclass (or other wise. The instrument maybe specified either as a name or a subclass (or
instance of subclass) of :class:`wlauto.core.Instrument`.""" instance of subclass) of :class:`wlauto.core.Instrument`."""
return instrumentation.is_installed(instrument) return instrumentation.is_installed(instrument)
def instrument_is_enabled(instrument): def instrument_is_enabled(instrument):
"""Returns ``True`` if the specified instrument is installed and is currently """Returns ``True`` if the specified instrument is installed and is currently
enabled, and ``False`` other wise. The insturment maybe specified either enabled, and ``False`` other wise. The instrument maybe specified either
as a name or a subclass (or instance of subclass) of as a name or a subclass (or instance of subclass) of
:class:`wlauto.core.Instrument`.""" :class:`wlauto.core.Instrument`."""
return instrumentation.is_enabled(instrument) return instrumentation.is_enabled(instrument)

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

@ -112,10 +112,10 @@ class Daq(Instrument):
Parameter('server_host', kind=str, default='localhost', Parameter('server_host', kind=str, default='localhost',
global_alias='daq_server_host', global_alias='daq_server_host',
description='The host address of the machine that runs the daq Server which the ' description='The host address of the machine that runs the daq Server which the '
'insturment communicates with.'), 'instrument communicates with.'),
Parameter('server_port', kind=int, default=45677, Parameter('server_port', kind=int, default=45677,
global_alias='daq_server_port', global_alias='daq_server_port',
description='The port number for daq Server in which daq insturment communicates ' description='The port number for daq Server in which daq instrument communicates '
'with.'), 'with.'),
Parameter('device_id', kind=str, default='Dev1', Parameter('device_id', kind=str, default='Dev1',
global_alias='daq_device_id', global_alias='daq_device_id',

2
wlauto/instrumentation/energy_model/__init__.py
View File

@ -348,7 +348,7 @@ class EnergyModelInstrument(Instrument):
desicription = """ desicription = """
Generates a power mode for the device based on specified workload. Generates a power mode for the device based on specified workload.
This insturment will execute the workload specified by the agenda (currently, only ``sysbench`` is This instrument will execute the workload specified by the agenda (currently, only ``sysbench`` is
supported) and will use the resulting performance and power measurments to generate a power mode for supported) and will use the resulting performance and power measurments to generate a power mode for
the device. the device.