M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

worker, hdf5: move datasets to subgroup

This commit is contained in:
Robert Jördens 2016-04-05 13:35:47 +08:00
parent 4f589a7277
commit e1f3968a4a
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RELEASE_NOTES.rst
View File

@ -3,6 +3,12 @@
Release notes Release notes
============= =============
unreleased [1.0rc3]
-------------------
* The HDF5 format has changed. The datasets are located in the subgroup ``datasets``.
1.0rc2 1.0rc2
------ ------

3
artiq/master/worker_db.py
View File

@ -240,4 +240,5 @@ class DatasetManager:
return self.ddb.get(key) return self.ddb.get(key)
def write_hdf5(self, f): def write_hdf5(self, f):
result_dict_to_hdf5(f, self.local) g = f.create_group("datasets")
result_dict_to_hdf5(g, self.local)

7
artiq/master/worker_impl.py
View File

@ -226,14 +226,11 @@ def main():
exp_inst.analyze() exp_inst.analyze()
put_object({"action": "completed"}) put_object({"action": "completed"})
elif action == "write_results": elif action == "write_results":
f = get_hdf5_output(start_time, rid, exp.__name__) with get_hdf5_output(start_time, rid, exp.__name__) as f:
try:
dataset_mgr.write_hdf5(f) dataset_mgr.write_hdf5(f)
string_to_hdf5(f, "artiq_version", artiq_version) string_to_hdf5(f, "version", artiq_version)
if "repo_rev" in expid: if "repo_rev" in expid:
string_to_hdf5(f, "repo_rev", expid["repo_rev"]) string_to_hdf5(f, "repo_rev", expid["repo_rev"])
finally:
f.close()
put_object({"action": "completed"}) put_object({"action": "completed"})
elif action == "examine": elif action == "examine":
examine(ExamineDeviceMgr, ParentDatasetDB, obj["file"]) examine(ExamineDeviceMgr, ParentDatasetDB, obj["file"])