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

master/worker: add ARTIQ version to HDF5 output

This commit is contained in:
Sebastien Bourdeauducq 2015-11-09 12:32:29 +08:00
parent 2df2e141f7
commit 44c0c617f3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artiq/master/worker_impl.py
View File

@ -8,6 +8,7 @@ from artiq.tools import 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 import __version__ as artiq_version
def get_object(): def get_object():
@ -156,6 +157,12 @@ def examine(device_mgr, dataset_mgr, file):
register_experiment(class_name, name, arguments) register_experiment(class_name, name, arguments)
def string_to_hdf5(f, key, value):
dtype = "S{}".format(len(value))
dataset = f.create_dataset(key, (), dtype)
dataset[()] = value.encode()
def main(): def main():
sys.stdout = LogForwarder() sys.stdout = LogForwarder()
sys.stderr = LogForwarder() sys.stderr = LogForwarder()
@ -203,11 +210,9 @@ def main():
f = get_hdf5_output(start_time, rid, exp.__name__) f = get_hdf5_output(start_time, rid, exp.__name__)
try: try:
dataset_mgr.write_hdf5(f) dataset_mgr.write_hdf5(f)
string_to_hdf5(f, "artiq_version", artiq_version)
if "repo_rev" in expid: if "repo_rev" in expid:
rr = expid["repo_rev"] string_to_hdf5(f, "repo_rev", expid["repo_rev"])
dtype = "S{}".format(len(rr))
dataset = f.create_dataset("repo_rev", (), dtype)
dataset[()] = rr.encode()
finally: finally:
f.close() f.close()
put_object({"action": "completed"}) put_object({"action": "completed"})