97accd2540
merge parameters and results into datasets
2015-10-12 17:18:23 +08:00
139072d402
Graceful experiment termination. Closes #76
2015-10-06 13:50:00 +08:00
b3584bc190
language,master,run: support raw access to DDB from experiments. Closes #123
2015-10-04 18:29:39 +08:00
0e3927b01a
master: support DDB rescan
2015-10-04 17:38:07 +08:00
50a5a3baf0
environment: attr_* -> setattr_*
2015-10-04 00:18:21 +08:00
f552d62b69
use Python 3.5 coroutines
2015-10-03 19:28:57 +08:00
b117b9320d
asyncio.async -> asyncio.ensure_future
2015-10-03 14:37:02 +08:00
125503139e
remove workaround for Python bug in asyncio process.wait(). Requires Python 3.5. Closes #58
2015-10-03 14:33:18 +08:00
whitequark
3e1348a084
Merge branch 'master' of github.com:m-labs/artiq into new-py2llvm
2015-09-27 18:22:28 +03:00
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
98bb570aec
log.c: fix off-by-one error.
2015-08-28 03:06:40 -05:00
whitequark
6b8ef8c490
artiq_run: use "artiq_run_" as user code module prefix, not "file_import_".
2015-08-28 02:22:59 -05:00
whitequark
ed236eb7f2
artiq_run: pretty-print diagnostics.
2015-08-28 01:54:51 -05:00
whitequark
d473d58b41
artiq_{compile,run}: adapt to new compiler.
2015-08-28 01:43:46 -05:00
Yann Sionneau
7db0498a9a
artiq_flash: dont prepend the runtime file with mezzanine board directory if using -d
2015-08-27 11:02:06 +02:00
1c96f258b1
gui: show server in window title
2015-08-25 00:37:49 +08:00
84b07607ad
gui: do not attempt moninj on windows
2015-08-24 20:20:33 +08:00
Yann Sionneau
34771ade67
artiq_flash.sh: fix runtime programming and allow usage of -d . -r
2015-08-22 15:28:55 +02:00
Yann Sionneau
5fc5d0b672
artiq_flash: replace wrong wording 'carrier' with 'mezzanine'
2015-08-21 09:38:15 +02:00
Yann Sionneau
646721d3e9
artiq_flash: add missing semicolons
2015-08-20 18:28:00 +02:00
Yann Sionneau
df7489ff61
travis/conda: add automated builds for kc705 nist_qc2 subtarget
2015-08-20 16:31:48 +02:00
600e8335f2
influxdb: tag-based schema, better type support
2015-08-18 14:49:23 +08:00
ed00ca1485
influxdb: do not crash on parameter deletion
2015-08-18 13:35:05 +08:00
2ac8c53bbe
influxdb: use types
2015-08-18 13:34:42 +08:00
2275017651
influxdb: better error reporting
2015-08-18 13:34:15 +08:00
66b5ca99d8
influxdb: better filtering
2015-08-18 09:59:48 +08:00
324cafae3d
rpctool: use pprint
2015-08-17 15:45:08 +08:00
abbf5eb059
gui: minor cleanup
2015-08-17 15:44:54 +08:00
fd3fefec52
add InfluxDB bridge
2015-08-17 15:44:40 +08:00
34a9c8c12d
artiq_run: add dummy pause method ( closes #100 )
2015-08-15 09:16:00 +08:00
998db5121b
pc_rpc: id_parameters -> description
2015-08-11 23:29:52 +08:00
a6ab066c87
ctlmgr: support immediate controller retry
2015-08-11 23:22:36 +08:00
54b11a392a
ctlmgr: graceful controller termination
2015-08-09 20:41:11 +08:00
a21049d779
ctlmgr: exponential backoff
2015-08-09 18:28:56 +08:00
3f68d0ba8f
ctlmgr: ping controllers
2015-08-09 17:30:46 +08:00
400b414885
master,client: support scanning specific repo revisions
2015-08-08 23:23:25 +08:00
whitequark
4efae2b67d
Formatting.
2015-08-08 13:48:25 +03:00
whitequark
ecdebc0b8a
session.c: refactor.
2015-08-08 13:21:43 +03:00
1818e8173b
client: log display support
2015-08-08 18:02:42 +08:00
c80f0fa07a
master: delete head repository checkout on exit
2015-08-08 11:44:19 +08:00
585bb236f8
master: add ddb/pdb args
2015-08-08 11:13:36 +08:00
7ed8fe57fa
Git support
2015-08-07 15:51:56 +08:00
968760d48f
gui: save geometry of main window
2015-08-06 22:27:46 +08:00
cddb5b9ae4
gui: save explorer state
2015-08-05 13:35:28 +08:00
c8db83b11f
gui: add verbosity args for debugging
2015-08-05 11:41:43 +08:00
whitequark
ad7cbc4394
Rename artiq_coreconfig → artiq_coretool; add log subcommand.
2015-08-02 16:40:58 +03:00
whitequark
8d0222c297
Rename artiq_coreconfig → artiq_coretool; add log subcommand.
2015-08-02 16:40:43 +03:00
8ad88438c7
gui: save display state
2015-08-01 19:37:16 +08:00
00cae1c23a
gui: save dock area state
2015-08-01 16:48:44 +08:00
d14a31f443
artiq_run: fix ELF running
2015-07-25 15:52:38 +08:00
696bceb406
gui: feedback on run deletion
2015-07-25 15:08:27 +08:00
ef8b09d9bc
gui: add console
2015-07-25 00:36:16 +08:00
3a06e22b67
master: handle logging while scanning repository
2015-07-23 23:06:15 +08:00
bd2bd68a54
gui,client: do now show arguments
2015-07-22 05:47:14 +08:00
8402f1cdcd
master,gui: basic log support
2015-07-22 05:13:50 +08:00
179ca36d09
gui: basic scan support
2015-07-21 21:24:24 +02:00
1a0dc499dd
gui: exit when main window is closed
2015-07-19 18:27:41 +02:00
dd7920f0c3
gui: basic argument support
2015-07-17 21:28:46 +02:00
6b36d93cc2
master,client: support repository rescan
2015-07-17 18:55:48 +02:00
39c6bc940c
coreconfig: use new database API ( closes #75 )
2015-07-17 10:49:55 +02:00
9649e1837a
gui: basic plotting
2015-07-16 20:52:53 +02:00
84de2fb28b
expid: experiment -> class_name
2015-07-15 11:08:12 +02:00
9ed4dcd7d1
repository: load experiments in worker, list arguments
2015-07-15 10:54:44 +02:00
21e8596d8c
gui: RT results overview
2015-07-14 17:31:18 +02:00
32d141f5ac
refactor ddb/pdb/rdb
2015-07-13 22:21:32 +02:00
0e92cfe053
artiq_run: remove support for stale watchdog API
2015-07-11 22:26:37 +02:00
9d4073ef36
master: remove simple parameter history
2015-07-09 13:54:38 +02:00
Yann Sionneau
d7ef885d9e
controllers: print+exit instead of raising exception for argparse error, better doc for --simulation
...
As long as you use --simulation, the driver will be in simulation mode.
Even if you specify a --device or --channels.
That can allow you to just switch to simulation mode by adding
--simulation in the device database without having to
remove the serial number or device path/name.
2015-07-01 11:54:28 +02:00
Yann Sionneau
652f3359a2
lda_controller: fix typo
2015-07-01 11:41:01 +02:00
Yann Sionneau
ffe1355b1a
lda_controller: improve help message for --device argument
2015-06-29 19:24:55 +02:00
Yann Sionneau
a73776bd72
controllers: enforce the usage of either --simulation or --device
2015-06-29 19:21:32 +02:00
Yann Sionneau
515aa96819
controllers: use --simulation for simulation
2015-06-29 13:04:01 +02:00
07ceed9512
artiq_flash.sh: back down on verbosity
2015-06-26 11:09:26 -06:00
48e0a2ad37
artiq_flash: echo commands for a bit more verbosity
2015-06-25 13:28:05 -06:00
4ba8951ae1
rpc: fix indentation of class docstring
2015-06-23 19:31:52 +00:00
Yann Sionneau
71721a152e
artiq_rpctool: list-methods also prints class docstring
2015-06-23 18:35:32 +02:00
Yann Sionneau
b8bb3d8ca7
manual: explain how to select TCube device from serial number
2015-06-19 17:06:50 +02:00
Yann Sionneau
4cdf1c4b81
manual: serial number explanations + udev rule for LDA
2015-06-19 16:41:44 +02:00
Yann Sionneau
77ca8bbf0f
artiq_coreconfig: better arg parsing
2015-06-18 17:07:20 +02:00
Yann Sionneau
afc70926d7
artiq_coreconfig: use subparsers for arg parsing
2015-06-17 16:40:27 +02:00
Yann Sionneau
95ff21d829
gui: add ARTIQ icon
2015-06-16 17:01:53 +02:00
Yann Sionneau
4c8917afbd
artiq_flash: use BIT files instead of BIN files
2015-06-16 01:39:41 +02:00
86fbe38371
gui: DDS monitor/injection (WIP)
2015-06-12 17:41:04 +08:00
Yann Sionneau
c251601204
pxi6733: refactor, allow multiple channels in one task, cancel any previous task
2015-06-05 20:12:46 +02:00
9f9079589e
gui: send monitor requests to core device
2015-06-05 14:52:41 +08:00
aa242f7c66
scheduler: simplify priority policy
...
Remove overdueness. User must submit calibration experiments with higher priority values for them to take precedence.
2015-05-28 18:24:45 +08:00
4a7c6954c3
artiq_run: implement mockups of new scheduler API
2015-05-28 17:24:47 +08:00
737f6d4485
scheduler: support pipeline flush
2015-05-28 17:20:58 +08:00
Yann Sionneau
4bf7875b87
flash_storage: refactor + unit tests + artiq_coreconfig.py CLI + doc
2015-05-27 18:06:12 +08:00
5fb86af3a4
gui: support experiment cancellation
2015-05-24 23:20:52 +08:00
e611e17eeb
gui: experiment submission
2015-05-24 20:24:07 +08:00
d6ced1c780
scheduler: support priorities
2015-05-24 01:09:22 +08:00
2f910921f5
gui: console -> log
2015-05-24 00:38:30 +08:00
d9c25130e3
gui: add explorer widgets
2015-05-23 01:25:33 +08:00
2570444941
gui: add empty explorer and console docks
2015-05-22 23:30:46 +08:00
ea53ed1af7
gui: switch to Qt
2015-05-22 17:06:31 +08:00
d8917fd94f
Merge branch 'master' of github.com:m-labs/artiq
2015-05-17 16:11:16 +08:00
b74b8d5826
Scheduling TNG
2015-05-17 16:11:00 +08:00
Yann Sionneau
e9b166b199
artiq_flash.sh: some cleanup
2015-05-14 11:12:03 +02:00
4048568d8e
support kernel handover with coherent time
2015-05-02 23:41:49 +08:00
62669f9ff2
soc: factor timer, kernel CPU and mailbox
2015-05-01 18:51:24 +08:00
109dfab76c
frontend: add artiq_mkfs
2015-04-30 20:03:11 +08:00
8a796a6818
artiq_run/ELFRunner: create a core device object (necessary for runtime exception processing)
2015-04-30 10:16:24 +08:00
Zach Smith
5df446ec4b
artiq_flash.sh: fix Pipistrello flash proxy filename
2015-04-30 09:24:13 +08:00
86c012924e
targets: rename AMP->Top, merge peripherals
2015-04-28 00:18:54 +08:00
938e1c2842
Remove UP support.
...
The only advantage of UP is to support the Papilio Pro, but that port is also very limited in other ways and the Pipistrello provides a more reasonable platform that also supports AMP.
On the other hand, RPCs on UP are difficult to implement with the session.c protocol system (without an operating system or coroutines), along with many other minor difficulties and maintainance issues. Planned features such as watchdogs in the core device are also difficult on UP.
2015-04-27 20:43:45 +08:00
Yann Sionneau
69388ccc1a
pxi6733: add driver and controller
2015-04-21 16:09:55 +08:00
Yann Sionneau
e19f8896f0
artiq_rpctool: document numpy availability in RPC call cmd line arguments
2015-04-21 15:57:29 +08:00
301a0e6447
rpctool: import numpy
2015-04-21 15:57:25 +08:00
Yann Sionneau
52fe66ee4d
artiq_flash.sh: improve detection of flash proxy location
...
Flash proxy is now searched in ~/.migen /usr/local/share/migen
/usr/share/migen and in the directory specified by "-d" argument
or in artiq/binaries/<board_name>/ if "-d" is not specified.
2015-04-17 00:57:16 +08:00
c0213c9f69
artiq_flash.sh: add pipistrello
2015-04-14 22:37:08 -06:00
07b8e1292f
artiq_flash: fix stderr redirections
2015-04-11 23:43:33 +08:00
8a2b8fc634
artiq_flash: do not always assume permission problems
2015-04-11 22:54:17 +08:00
Yann Sionneau
8a3be4eca0
artiq_flash: add support for kc705
2015-04-11 22:38:11 +08:00
efd1c24ed7
frontend: add artiq_compile tool to build default experiment
2015-04-07 15:41:32 +08:00
5e046dc5ce
artiq_run: move parse_arguments and get_experiment to tools
2015-04-07 13:04:47 +08:00
9b46bc623a
dbhub: do not use as context manager, turn close exceptions into warnings, do not close devices early in worker
2015-04-05 17:49:41 +08:00
0ec7e9a98c
artiq_run: fix get_argparser()
2015-04-04 21:17:24 -06:00
1a1afd5410
artiq_run: refactor, support use from within experiments
...
You can always (under posix) use #!/usr/bin/env artiq_run as
shebang for experiments and make them executable.
Now, you can also do this (portable):
if __name__ == "__main__":
from artiq.frontend.artiq_run import run
run()
to make an experiment executable. The CLI options are all inherited.
Also:
* removed --elf: can be inferred from filename
* did some refactoring and cleanup
* use logging for all messages, except the result printing (use -v to get
parameter changes and dummy scheduler actions)
2015-04-04 20:51:48 -06:00
Yann Sionneau
e7be00baa8
Add support for automatic build and upload of dev conda artiq packages to binstar by travis-ci
...
- SoC+BIOS are also built and integrated in the conda package
- artiq_flash.sh script is embedded to allow flashing ppro board
2015-03-30 19:51:52 +08:00
bd2f6ea9f9
thorlabs_tcube_controller: use simple_network_args
2015-03-25 16:20:08 +01:00
Yann Sionneau
5ca5a3602e
novatech409b: cleanup
2015-03-25 16:11:11 +01:00
768fa21488
lda_controller: show default product type
2015-03-23 20:02:36 +01:00
bd145bbabc
use %(default) in argparse
2015-03-23 20:02:14 +01:00
Yann Sionneau
91336f974d
lda_controller: replace serial argument with device one
2015-03-23 17:02:39 +01:00
Yann Sionneau
2651050c83
Controller cleanups
2015-03-23 17:02:39 +01:00
1b7f71bda9
controllers: consistent device/simulation specification
2015-03-22 00:48:15 +01:00
8cb77b0336
pdq2: rename url parameter to device and require it
2015-03-21 00:33:50 -06:00
200e20fb39
worker: close devices immediately after run and before analyze
2015-03-20 12:01:34 +01:00
577754c38f
pdq2: fix argparser
2015-03-19 22:26:12 -06:00
222d0a9d37
pdq2_controller: add dump option
2015-03-19 21:38:46 -06:00
5ab3290ed4
pdq2: add refactored client code
2015-03-19 20:34:29 -06:00
2b3641ac0a
db,worker: fix realtime result initialization
2015-03-13 15:12:55 +01:00
5ca4821a29
ctlmgr: use workaround for asyncio.wait_for(process.wait()... Python bug
2015-03-11 16:48:16 +01:00
d5795fd619
master: watchdog support
...
Introduces a watchdog context manager to use in the experiment code that
terminates the process with an error if it times out. The syntax is:
with self.scheduler.watchdog(20*s):
...
Watchdogs timers are implemented by the master process (and the worker
communicates the necessary information about them) so that they can be
enforced even if the worker crashes. They can be nested arbitrarily.
During yields, all watchdog timers for the yielding worker are
suspended [TODO]. Setting up watchdogs is not supported in kernels,
however, a kernel can be called within watchdog contexts (and terminating
the worker will terminate the kernel [TODO]).
It is possible to implement a heartbeat mechanism using a watchdog, e.g.:
for i in range(...):
with self.scheduler.watchdog(...):
....
Crashes/freezes within the iterator or the loop management would not be
detected, but they should be rare enough.
2015-03-11 16:43:14 +01:00
4c280d5fcc
master: use a new worker process for each experiment
2015-03-09 16:22:41 +01:00
ec1d082730
remove timeout from run_params (to be replaced by a better mechanism)
2015-03-09 10:51:32 +01:00
d95a9cac9a
move realtime result registration into dbh, simplify syntax
2015-03-08 17:27:27 +01:00
f2e3dfb848
Experiment base class, replace __artiq_unit__ with docstring
2015-03-08 15:55:30 +01:00
0f007cb1a7
language/db: remove implicit_core
2015-03-08 11:37:53 +01:00
Yann Sionneau
14c759ff89
add Thorlabs T-Cube NDSP
2015-03-04 14:30:49 +00:00
0abd41a04a
pc_rpc: trace support in server
2015-02-27 00:17:11 -07:00
651ed71b79
master: basic automatic experiment list
2015-02-21 20:34:31 -07:00
4267e0deab
master,artiq_run: simplify unit autodetection
2015-02-21 20:26:58 -07:00
387de11e56
artiq_run: fix import
2015-02-21 20:09:46 -07:00
6601bebcfe
master: make RIDs unique across restarts
2015-02-21 18:41:07 -07:00
965dd89b61
master: reorganize result output code
2015-02-21 14:28:18 -07:00
65555a3a09
artiq_run,master: introduce __artiq_unit__ attribute to mark and name experiments
2015-02-20 14:01:34 -07:00
0dd5692c32
master,run: pass run_params to experiment
2015-02-19 20:05:12 -07:00
4d21b78314
master,client,gui: factor timeout into run_params
2015-02-19 20:03:55 -07:00
d01ba8e644
artiq_run: provide dummy scheduler API
2015-02-19 12:09:37 -07:00
c69c4d5ce9
master: expose scheduler API to experiments
2015-02-19 12:09:11 -07:00
9ffc370416
master,run: automatically call analyze function
2015-02-19 09:40:15 -07:00
656099a331
artiq_run: sort result output alphabetically
2015-02-17 16:12:21 -07:00
8c4fb2d534
novatech409b: add sim mode help
2015-02-16 04:39:41 -07:00
17611e9899
lda_controller: add description
2015-02-15 17:32:08 -07:00
Joe Britton
a3494c57cc
add Novatech 409B controller
2015-02-15 17:31:37 -07:00
e196ef9c48
lda_controller: style
2015-02-15 15:00:55 -07:00
17596f4ad8
tools,frontend: print default ports
2015-02-15 14:58:57 -07:00
79a5d8a12a
tools,frontend: common network arguments
2015-02-15 14:55:43 -07:00
6d4b9e5fca
frontend: remove lda_client (use artiq_rpctool instead)
2015-02-12 09:34:17 +08:00
Yann Sionneau
af4be9a2e2
rpctool: change call syntax
2015-02-12 09:31:04 +08:00
Yann Sionneau
b396f5dd43
pc_rpc: support for method listing, frontend: artiq_rpctool, +fixes by SB
2015-02-12 00:38:30 +08:00
c91705c5d1
ctlmgr: support hostnames in DDB
2015-02-09 20:03:34 +08:00
542e047f5a
ctlmgr: clean shutdown
2015-02-08 21:44:49 +08:00
a50c74523f
ctlmgr: split command arguments properly
2015-02-08 12:18:57 +08:00
abb7d9f911
ctlmgr: catch create_subprocess_exec errors and retry
2015-02-08 12:15:22 +08:00
96a01efc48
ctlmgr: wait for processes to terminate before starting new ones
2015-02-08 00:59:08 +08:00
e7d85c5b87
ctlmgr: basic working implementation
2015-02-07 23:52:05 +08:00
aba749093b
ctlmgr: get local bind address, format commands
2015-02-07 01:14:27 +08:00
f9d3bd107e
ctlmgr: retry connection to master, print received ddb
2015-02-06 18:58:54 +08:00
17685d1e98
controller manager skeleton
2015-02-06 12:17:51 +08:00
8df1b03f0f
artiq_run: add verbosity config
2015-02-04 19:09:54 +08:00
0e65f71705
artiq_run: HDF5 output support
2015-02-04 18:46:55 +08:00
2f4a83b97a
gui: access to parameter DB from GUI files
2015-02-04 16:13:56 +08:00
1b122dd887
sync_struct,gui: refactor Subscriber data distribution to support access to parameter DB from GUI file
2015-02-04 15:06:25 +08:00
186aa7fdb7
style
2015-02-04 14:44:39 +08:00
Yann Sionneau
fc92a66e51
asyncio: Use ProactorEventLoop on Windows
2015-02-03 22:29:03 +08:00
2fbe22e15e
master,client: support changing real-time results group
2015-01-30 20:36:54 +08:00
Yann Sionneau
526887140d
Set WARNING as default log level + update documentation
2015-01-30 19:04:04 +08:00
9aa7155502
gui: use experiment registry
2015-01-29 19:59:44 +08:00
e7dac4ab43
master: experiment registry
2015-01-29 19:59:16 +08:00
Yann Sionneau
5ba7218cc1
Factorize argparser for debug level
2015-01-29 10:07:12 +08:00
71c5115c11
gui: handle exit in explorer
2015-01-27 23:51:23 +08:00
db3114f79b
serve GUI and Glade file from master
2015-01-26 23:37:33 +08:00
8904d963d2
gui: add explorer window + rough prototype of control widgets defined with glade
2015-01-26 19:56:15 +08:00
82330b3c2a
gui: save layout
2015-01-23 19:00:09 +08:00
9fb42e4952
doc: use sphinx-argparse
2015-01-23 00:52:13 +08:00
47aa634ab5
replace periodic schedule with timed schedule
2015-01-23 00:23:00 +08:00
569600b607
frontend/pdq2_client: fix entry point
2015-01-22 10:38:47 +08:00
0c2e960c85
frontend: restore artiq_ prefix
2015-01-17 19:41:00 +08:00
3e22fe86b5
reorganize files as per discussion with Robert
2015-01-17 19:38:20 +08:00
6cc3a9d973
frontend/*: move to artiq.frontend, make entry_points
...
* solves the trouble of having to setup PATH and PYTHONPATH in a project
specific way and keep them changing
* works well with virtualenvs
* works under windows where the shebang is meaningless
* works if your python is not named "python3"
* can use "pip3 install --user --editable ."
* creates an egg-link in ~/.local/share/... pointing to $PWD
* generates the scripts and copies them to ~/.local/bin which is likely
already in your $PATH
* analogously under windows
* or call scripts as "python3 -m artiq.frontend.master"
2015-01-17 16:02:43 +08:00
