mirror of
https://github.com/m-labs/artiq.git
synced 2024-12-25 11:18:27 +08:00
environment,worker: remove enable_processors
This commit is contained in:
parent
dc44aad411
commit
12a8c76df9
@ -149,14 +149,13 @@ class HasEnvironment:
|
||||
"""Provides methods to manage the environment of an experiment (devices,
|
||||
parameters, results, arguments)."""
|
||||
def __init__(self, device_mgr=None, dataset_mgr=None, *, parent=None,
|
||||
default_arg_none=False, enable_processors=False, **kwargs):
|
||||
default_arg_none=False, **kwargs):
|
||||
self.requested_args = OrderedDict()
|
||||
|
||||
self.__device_mgr = device_mgr
|
||||
self.__dataset_mgr = dataset_mgr
|
||||
self.__parent = parent
|
||||
self.__default_arg_none = default_arg_none
|
||||
self.__enable_processors = enable_processors
|
||||
|
||||
self.__kwargs = kwargs
|
||||
self.__in_build = True
|
||||
@ -215,10 +214,7 @@ class HasEnvironment:
|
||||
return None
|
||||
else:
|
||||
raise
|
||||
if self.__enable_processors:
|
||||
return processor.process(argval)
|
||||
else:
|
||||
return argval
|
||||
return processor.process(argval)
|
||||
|
||||
def setattr_argument(self, key, processor=None, group=None):
|
||||
"""Sets an argument as attribute. The names of the argument and of the
|
||||
|
@ -139,8 +139,7 @@ def examine(device_mgr, dataset_mgr, file):
|
||||
if name[-1] == ".":
|
||||
name = name[:-1]
|
||||
exp_inst = exp_class(device_mgr, dataset_mgr,
|
||||
default_arg_none=True,
|
||||
enable_processors=True)
|
||||
default_arg_none=True)
|
||||
arginfo = OrderedDict(
|
||||
(k, (proc.describe(), group))
|
||||
for k, (proc, group) in exp_inst.requested_args.items())
|
||||
@ -215,8 +214,7 @@ def main():
|
||||
os.makedirs(dirname, exist_ok=True)
|
||||
os.chdir(dirname)
|
||||
exp_inst = exp(
|
||||
device_mgr, dataset_mgr, enable_processors=True,
|
||||
**expid["arguments"])
|
||||
device_mgr, dataset_mgr, **expid["arguments"])
|
||||
put_object({"action": "completed"})
|
||||
elif action == "prepare":
|
||||
exp_inst.prepare()
|
||||
|
Loading…
Reference in New Issue
Block a user