srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

worker_impl: style

This commit is contained in:
Robert Jördens 2016-04-05 15:38:49 +08:00
parent 7dab0433be
commit eea7cdcf89
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artiq/master/worker_impl.py
View File

@ -8,7 +8,8 @@ from collections import OrderedDict
import artiq import artiq
from artiq.protocols import pipe_ipc, pyon from artiq.protocols import pipe_ipc, pyon
from artiq.tools import multiline_log_config, file_import from artiq.tools import multiline_log_config, file_import
from artiq.master.worker_db import DeviceManager, DatasetManager, get_hdf5_output from artiq.master.worker_db import (DeviceManager, DatasetManager,
get_hdf5_output)
from artiq.language.environment import is_experiment from artiq.language.environment import is_experiment
from artiq.language.core import set_watchdog_factory, TerminationRequested from artiq.language.core import set_watchdog_factory, TerminationRequested
from artiq.coredevice.core import CompileError, host_only, _render_diagnostic from artiq.coredevice.core import CompileError, host_only, _render_diagnostic
@ -17,6 +18,7 @@ from artiq import __version__ as artiq_version
ipc = None ipc = None
def get_object(): def get_object():
line = ipc.readline().decode() line = ipc.readline().decode()
return pyon.decode(line) return pyon.decode(line)
@ -167,7 +169,8 @@ def setup_diagnostics(experiment_file, repository_path):
# putting inherently local objects (the diagnostic engine) into # putting inherently local objects (the diagnostic engine) into
# global slots, and there isn't any point in making it prettier by # global slots, and there isn't any point in making it prettier by
# wrapping it in layers of indirection. # wrapping it in layers of indirection.
artiq.coredevice.core._DiagnosticEngine.render_diagnostic = render_diagnostic artiq.coredevice.core._DiagnosticEngine.render_diagnostic = \
render_diagnostic
def main(): def main():