Commit Graph

720 Commits

Author SHA1 Message Date
fb91955260 tests: make hardware-in-the loop flags positive logic
Explicitly having to disable unittests that require hardware
(ARTIQ_NO_HARDWARE) is cumbersome.
There is not even a sensible default for the
device or serial number of the devices requiring additional
variables (ARTIQ_LDA_DEVICE etc).

This patch reverts the logic by skipping unittests that
can not automatically determine whether the required hardware
is present and where it is.
2015-04-03 11:51:03 +08:00
Florent Kermarrec
2995f0a705 remove use of _r prefix on CSRs 2015-04-02 18:30:44 +08:00
5bd8d414cf gateware/amp: add kernel CPU and mailbox modules 2015-04-02 16:49:36 +08: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
3108ffeef6 coredevice/comm_serial: use lazy formatting in logging 2015-03-27 18:54:19 +01:00
f4cb97b709 comm_serial: fix baud rate change logging 2015-03-25 17:57:53 -06: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
03139808bd [WIP] wavesynth/interpolate: wavesynth programming tools
* interpolate(t, v) will generate the channel data subset of a wavesynth
program

* still broken
2015-03-23 20:38:33 -06:00
6a0bc19279 pdq2/driver: document a few units 2015-03-23 20:31:37 -06: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
b597483913 thorlabs_tcube: spelling, fix ping 2015-03-23 17:24:12 +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
0b174085c8 pdq2/mediator: rewrite, adapt to new PDQ RPC format, support anonymous segments, support uploading to controllers 2015-03-22 22:30:59 +01:00
c18efa11b3 wavesynth: fix frame/segment terminology 2015-03-22 10:56:34 +01:00
1b7f71bda9 controllers: consistent device/simulation specification 2015-03-22 00:48:15 +01:00
7e61f66493 pdq2/mediator: get pdq devices from pdb 2015-03-22 00:24:42 +01:00
8cb77b0336 pdq2: rename url parameter to device and require it 2015-03-21 00:33:50 -06:00
05781699b8 pdq2: driver and unittest
* parses wavesynth style programs
* verified with cosimulated gateware
2015-03-21 00:29:00 -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
fae7246f30 pdq2: merge from main pdq2 repo 2015-03-19 14:34:37 -06:00
2257cfa952 wavesynth/compute_samples/: demonstrate dds clear 2015-03-15 18:13:47 +01:00
40bd101de0 wavesynth/compute_samples/SplinePhase: fix reduction 2015-03-15 18:13:09 +01:00
1d0fde7f13 wavesynth: program decoding 2015-03-15 18:05:03 +01:00
327448977c wavesynth/compute_samples: use set_coefficients 2015-03-15 16:48:24 +01:00
0d8260af6e wavesynth: basic sample computation 2015-03-15 16:30:07 +01:00
2b3641ac0a db,worker: fix realtime result initialization 2015-03-13 15:12:55 +01:00
7a1d60ee15 coredevice,runtime,language: add parameters to runtime exceptions, include information with RTIO errors 2015-03-13 14:55:18 +01:00
84732a469d coredevice/gpio: fix indentation 2015-03-13 14:31:50 +01:00
3122623c6f rtio: make 63-bit timestamp counter the default [soc] 2015-03-12 13:13:35 +01:00
f158711f7e test/worker: test watchdog in build() 2015-03-11 19:07:04 +01:00
43a05c783d worker: split write_results action 2015-03-11 19:06:46 +01:00
4ba54ac929 test: do not close/recreate the asyncio event loop (WA for asyncio bugs when multiple tests are run) 2015-03-11 19:05:01 +01:00
e037b930d8 test: add worker unittest 2015-03-11 18:26:04 +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
f2134fa4b2 master,worker: split prepare/run/analyze 2015-03-09 23:34:09 +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
407477bc5a test: add ARTIQ_NO_PERIPHERALS environment variable to disable tests requiring non-core devices 2015-03-08 11:40:50 +01:00
0f007cb1a7 language/db: remove implicit_core 2015-03-08 11:37:53 +01:00
ac697e3248 test/thorlabs_tcube: fix default serial port 2015-03-08 11:37:24 +01:00
28bce9ee40 artiqlib -> artiq.gateware 2015-03-08 11:00:24 +01:00
9fad01d967 test/thorlabs_tcube: fix test discovery and style 2015-03-04 23:53:49 +00:00
Yann Sionneau
c2831db253 thorlabs_tcube: add realistic values for status bits and dc status in driver sim 2015-03-04 23:45:22 +00:00
Yann Sionneau
5091098eb0 thorlabs_tcube: driver PEP8 fix 2015-03-04 23:45:21 +00:00
Yann Sionneau
bc19d6f7a8 thorlabs_tcube: add unit tests 2015-03-04 23:45:21 +00:00
Yann Sionneau
5b8691f7f5 thorlabs_tcube: fix driver spelling issues 2015-03-04 23:45:21 +00:00
Yann Sionneau
14c759ff89 add Thorlabs T-Cube NDSP 2015-03-04 14:30:49 +00:00
f307897bec units: fix strip_unit 2015-02-27 10:43:03 -07:00
0abd41a04a pc_rpc: trace support in server 2015-02-27 00:17:11 -07:00
3e46a36a4d lda: do not print attenuation value in simulation 2015-02-27 00:16:56 -07:00
ee9d616733 language/units: add strip_unit function 2015-02-26 23:31:07 -07:00
f855834810 gui/tools/DictSyncer: remove dead code 2015-02-26 22:10:53 -07:00
Yann Sionneau
b672a99174 lda: add support for ping 2015-02-26 09:30:30 -07:00
d51493fb5d language/core: fix interpreter implementations of time/cycle conversions 2015-02-25 21:15:46 -07:00
Yann Sionneau
1b5944257e units: add support for V (Volt) 2015-02-24 14:15:38 -07:00
Yann Sionneau
9485372277 units: add support for abs() on Quantity 2015-02-24 14:15:23 -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
ceb02b42cb master: use full year in result folder name 2015-02-21 18:34:31 -07:00
965dd89b61 master: reorganize result output code 2015-02-21 14:28:18 -07:00
1aec6a0462 master: name results 'year-month-day/hour-minute/runid-experiment' 2015-02-21 13:42:26 -07:00
cc172699ea master: use RID + unit class name for HDF5 filenames 2015-02-20 14:11:55 -07:00
65555a3a09 artiq_run,master: introduce __artiq_unit__ attribute to mark and name experiments 2015-02-20 14:01:34 -07:00
Yann Sionneau
5cfdac9c7c Lda: replace assert with direct exception raising 2015-02-20 10:21:15 -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
5bb6a3d8a6 style 2015-02-18 11:34:00 -07:00
de4a15c315 lda: add unit tests 2015-02-18 11:33:25 -07:00
05824fd3be lda: style 2015-02-18 11:31:44 -07:00
Yann Sionneau
dc132bd248 lda: fixes 2015-02-18 11:23:24 -07:00
Yann Sionneau
3c50610f3d pyon: bytes support 2015-02-18 11:19:03 -07:00
e10390d142 coredevice: add get_rtio_time 2015-02-18 09:56:30 -07:00
ec84726858 py2llvm: support conversion of fractions to float 2015-02-18 09:56:07 -07:00
d484b3a548 tools: add missing import 2015-02-18 08:52:31 -07:00
3543dc30c7 Revert "tools/file_import: use python 3.4 importlib API"
This reverts commit 614a96a3d7.

Conflicts:
	artiq/tools.py
2015-02-18 08:51:44 -07:00
170a626c76 tools/file_import: support import of modules importing from their directory 2015-02-17 16:13:00 -07:00
656099a331 artiq_run: sort result output alphabetically 2015-02-17 16:12:21 -07:00
614a96a3d7 tools/file_import: use python 3.4 importlib API 2015-02-17 13:07:09 -07:00
4558fb3e33 clarify controller terminology 2015-02-16 08:57:15 -07:00
61dc177bce units: support direct float conversion 2015-02-16 07:48:05 -07:00
021d0d312e novatech409b: do not specify type info in docstrings 2015-02-16 04:43:30 -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
39dfbb4162 ddb: support for best effort RPC client 2015-02-12 00:54:54 +08:00
1b3603d8bf pc_rpc/BestEffortClient: add docstrings 2015-02-12 00:50:48 +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
6d11da3887 pc_rpc/BestEffortClient: add logging 2015-02-12 00:21:39 +08:00
a7405dea1c protocols/pc_rpc: add best effort client 2015-02-12 00:14:20 +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
0d0a05a487 sync_struct/Subscriber: add before_receive_cb, export reader/writer 2015-02-07 01:13:15 +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
2f06574381 ddb: controller support 2015-02-05 22:53:31 +08:00
4167e669d2 gui/explib: add to artiq top-level import 2015-02-05 19:50:03 +08:00
8df1b03f0f artiq_run: add verbosity config 2015-02-04 19:09:54 +08:00
0ba07e67b8 artiq/tools/verbosity_args: add help 2015-02-04 19:09:37 +08:00
0e65f71705 artiq_run: HDF5 output support 2015-02-04 18:46:55 +08:00
af79392918 master: basic dumping of results to HDF5 2015-02-04 18:37:57 +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
c259c4f46f gui/rt_results: display group name in window title 2015-01-31 16:57:50 +08:00
2fbe22e15e master,client: support changing real-time results group 2015-01-30 20:36:54 +08:00
0ebe56f595 gui/rt_results: support raw view 2015-01-30 19:07:33 +08:00
Yann Sionneau
526887140d Set WARNING as default log level + update documentation 2015-01-30 19:04:04 +08:00
37feaf1cea comm_serial: use serial.serial_for_url 2015-01-30 11:47:20 +08:00
45c0e2874f master/db: exclude Notifier attributes from kernel attr init 2015-01-29 23:48:39 +08:00
c0c0137d9a transforms/inline: support skipping of attr init 2015-01-29 23:48:03 +08:00
7d6b93d8eb master/db: fix realtime data lookup 2015-01-29 21:45:24 +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
26b1282b2b gui/tools/DictSyncer: keep original data 2015-01-29 19:58:25 +08:00
cba0011431 language/db: default to no realtime results 2015-01-29 19:58:00 +08:00
939236a1b5 tools: fix logging config 2015-01-29 18:47:07 +08:00
Yann Sionneau
5ba7218cc1 Factorize argparser for debug level 2015-01-29 10:07:12 +08:00
906099c978 gui/rt_results: do not attempt to plot before receiving data 2015-01-28 16:28:13 +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
f983fdc985 file_db: support default data if file not present 2015-01-23 18:59:56 +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
Yann Sionneau
c8f2f4b245 Add missing __init__.py 2015-01-22 10:37:58 +08:00
0983862c03 pyon/store_file: add newline 2015-01-21 13:52:35 +08:00
56ea62b936 doc: fixes and add sync_struct docstrings 2015-01-19 19:20:14 +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
77dab11746 gui/XYWindow: better bounds 2015-01-15 11:22:44 +08:00
5df8ffe08e master: cleaner shutdown 2015-01-15 11:07:55 +08:00
95ee6a4951 gui: beginning of realtime plotting 2015-01-14 22:22:33 +08:00
33283feacb sync_struct: pass mod to notify callback 2015-01-14 22:21:59 +08:00
070788a680 separate master modules 2015-01-14 12:16:49 +08:00
c0bdc92b18 master: broadcast realtime results 2015-01-14 11:37:08 +08:00
ebdd92c7c4 management/sync_struct: always publish with root notifier 2015-01-14 11:36:28 +08:00
4160d24abc management/sync_struct: export process_mod function 2015-01-14 11:36:04 +08:00
8ed6aeb64a collect realtime results in master 2015-01-13 19:12:19 +08:00
77a7e592cb management/sync_struct/Notifier: use publish function instead of object 2015-01-13 18:40:59 +08:00
2029613c58 management/scheduler: cleanup pending tasks 2015-01-13 18:01:01 +08:00
f12e721974 sync_struct: support nested structures 2015-01-13 17:31:58 +08:00
893c18679f management/worker: improve error reporting 2015-01-13 17:27:36 +08:00
891c0d12f2 refactor device/parameter management, immediate parameter updates, start introducing results 2015-01-12 18:51:23 +08:00
c938e3f4f0 language/context: remove spurious argument 2015-01-10 15:43:13 +08:00
06914bbaa3 Make arguments attributes, integrate with AutoContext
This makes them accessible to future "data analysis" methods.
2015-01-10 15:41:35 +08:00
Yann Sionneau
2ad063c377 Lda: sanity checks on attenuation value
- Plus use of dB unit
2015-01-10 00:27:21 +08:00
Yann Sionneau
d21211a473 lda: docstring style 2015-01-10 00:27:15 +08:00
be9f7550b5 master/gui/client: run arguments support 2015-01-07 21:37:07 +08:00
b63b46786e management/file_import: invalidate linecache if needed 2015-01-07 18:14:52 +08:00
c11708972d parameter database writeback 2015-01-07 17:50:05 +08:00
dhslichter
ff37cdc26c Update driver.py 2015-01-05 17:40:37 -07:00
dhslichter
c971a6f1c6 Update driver.py
Fix 32dB limit bug
2015-01-05 15:52:47 -07:00
4c4da77cc8 gui: 'remove' buttons functionality 2015-01-05 19:52:58 +08:00
f9d4056ee9 scheduler: fix cancellations 2015-01-05 19:41:40 +08:00
7354117af2 pc_rpc: namespace cleanup 2015-01-05 16:10:16 +08:00
f9dd5682ee pc_rpc: asyncio client 2015-01-05 16:07:12 +08:00
650baa9fc1 gui: factorize dict synchronization 2015-01-02 22:09:02 +08:00
f352e7f752 master/client: remove function parameter 2015-01-02 17:00:22 +08:00
3befafc4e0 master/gui: track last parameter changes 2015-01-02 15:28:45 +08:00
15b27a1d14 gui: parameter list update 2015-01-02 14:47:09 +08:00
7ada30e07a dpdb: fix saves 2015-01-02 14:45:55 +08:00
d2a5dfa1ec pc_rpc: multiple target support 2014-12-31 20:13:10 +08:00
9cd89a0c50 master: handle dpdb in master process 2014-12-31 17:41:22 +08:00
0aa450ad5d pyon/store_file: do not erase file when encoding fails 2014-12-31 17:20:12 +08:00
cda394e0ce gui: add basic parameters window 2014-12-31 11:11:38 +08:00
3566cd1ce0 gui: notebook and enable switch 2014-12-30 23:12:24 +08:00
2a60c7475e gui: shorten name 2014-12-30 19:19:26 +08:00
1ada80cd6d gui: add icon and app title 2014-12-30 18:40:19 +08:00
9de3a08676 gui: split scheduler window 2014-12-30 18:18:23 +08:00
6b283d78d3 master/client: periodic schedule monitoring 2014-12-29 18:44:50 +08:00
02f3781e65 management/scheduler: fix busywait bug 2014-12-29 13:32:11 +08:00
1fdad21f08 master/client: queue pubsub 2014-12-28 18:56:26 +08:00