M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity
2,476 Commits 13 Branches 35 Tags 26 MiB
Commit Graph

15 Commits

Author SHA1 Message Date
Robert Jördens 765001054d artiq.experiment: merge language and coredevice namespaces 
perl -i -pe 's/^from artiq import \*$/from artiq.experiment import */' your_experiments/*.py

(assuming you skipped the changes form the previous commit)
 2016-01-25 17:24:00 -07:00
whitequark bd5b324fc2 Merge branch 'master' into new-py2llvm 2015-10-13 19:24:45 +03:00
Sebastien Bourdeauducq a754d4b5f5 test: use new dataset API 2015-10-12 19:20:04 +08:00
Sebastien Bourdeauducq a83ffb3dce protocols: move FlatFileDB into pyon 2015-10-12 18:19:28 +08:00
whitequark 3e1348a084 Merge branch 'master' of github.com:m-labs/artiq into new-py2llvm 2015-09-27 18:22:28 +03:00
Robert Jördens 01416bb0be copyright: claim contributions 
These are contributions of >= 30% or >= 20 lines (half-automated).

I hereby resubmit all my previous contributions to the ARTIQ project
under the following terms:

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

Closes #130

Signed-off-by: Robert Jordens <jordens@gmail.com>
 2015-09-06 16:08:57 -06:00
whitequark 2df8b946f9 Factor out the code to pretty-print diagnostics. 2015-08-31 22:52:39 -06:00
whitequark cbd903a9dc compiler.embedding: add tests for quote serialization. 2015-08-28 05:24:57 -05:00
Sebastien Bourdeauducq 84de2fb28b expid: experiment -> class_name 2015-07-15 11:08:12 +02:00
Sebastien Bourdeauducq 32d141f5ac refactor ddb/pdb/rdb 2015-07-13 22:21:32 +02:00
Robert Jördens a3fe538067 test: fix get_from_ddb 2015-07-04 22:36:23 -06:00
Robert Jördens 409c66e966 test: convert lda/tcube/409b to hardware_testbench 2015-07-04 21:44:28 -06:00
Robert Jördens 4cbf280f1a test: return experiment not, rdb 2015-07-04 20:05:11 -06:00
Robert Jördens f7427dda39 test: make benchmarks unittest 2015-06-28 20:56:12 -06:00
Robert Jördens 593dafc118 test: hardware testbench 2015-06-28 20:55:59 -06:00