2
0
mirror of https://github.com/m-labs/artiq.git synced 2024-12-24 10:54:02 +08:00
Commit Graph

1939 Commits

Author SHA1 Message Date
912274c6af test_ctlmgr: fix 2016-02-05 15:08:49 -07:00
70a67a0e38 Merge branch 'applets' into applets_pipeipc 2016-02-05 13:29:20 +01:00
c52081ca0d Merge remote-tracking branch 'm-labs/newtesting' into subprocess-termination
* m-labs/newtesting:
  style
  assume 'import artiq' works before running tests
  test/ctlmgr: use sys.executable, use default localhost binding
2016-02-03 15:00:00 -07:00
ab81dbbd19 Merge remote-tracking branch 'm-labs/master' into subprocess-termination
* m-labs/master:
  remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733
  setup.py: remove stale import
  remove stale dependency on pyelftools
2016-02-02 23:34:37 -07:00
c28b938471 Client: add note about timeout sideeffects 2016-02-02 15:42:47 -07:00
f7df393248 hardware_testbench: full shutdown sequence for controllers 2016-02-02 15:32:40 -07:00
53e5d0a7bb worker: flake8 style cleanup 2016-02-02 15:32:40 -07:00
7636952496 ctlmgr: fix import 2016-02-02 15:32:39 -07:00
c105949155 pc_rpc.Client: support socket timeouts
... and fix two flake8 errors.
2016-02-02 15:32:39 -07:00
55006119c8 subprocesses: unify termination logic 2016-02-02 15:32:36 -07:00
89f68f3470 style 2016-02-02 21:57:25 +01:00
9ca8b48bf9 assume 'import artiq' works before running tests 2016-02-02 21:52:33 +01:00
ca8a075f46 test/ctlmgr: use sys.executable, use default localhost binding 2016-02-02 21:08:51 +01:00
b7de92e96c remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733 2016-02-02 18:41:57 +01:00
cf465dae0c tools/file_import: make sure sys.path is always restored 2016-01-31 20:33:17 +01:00
0d18942869 hardware_testbench: request controller termination 2016-01-30 20:04:32 -07:00
9fb5ef4d86 Merge branch 'increase-runtime-size'
closes #250

* increase-runtime-size:
  flash: grow runtime limit to 512 kB
  RELEASE_NOTES: update
  flash storage: move to flash + 0x70000
2016-01-30 18:58:32 -07:00
10d78a5d0b flash: grow runtime limit to 512 kB 2016-01-30 14:50:15 -07:00
68891493a3 analyzer: move common to artiq.protocols
migen was still pulled in through rtio.__init__.py
2016-01-29 20:26:48 -07:00
17ac64a65e ctlmgr: fix the fix (107e2fe) 2016-01-29 17:52:12 -07:00
d05d720b19 tests: misc fixes, cleanup 2016-01-29 17:32:59 -07:00
107e2fedf4 ctlmgr: reinstate lost changes 2016-01-29 17:20:07 -07:00
1d92c0874e gui/log: use QFontDatabase for fixed font 2016-01-29 23:21:22 +01:00
e92d52314b flash storage: move to flash + 0x70000
This requires recompiling and flashing the runtime and the entire
storage area file system (ip address and idle kernel).

* with ppp the runtime is larger than 0x40000 now
* 0x60000 for the runtime should give enough space for a while,
  even including a fatter scheduler or runtime components
  in other languages
* for both pipistrello and kc705 this leaves the unused space
  starting at a nice round number
* the relevant flashes nowadays are 0x1000000 large
2016-01-28 18:08:30 -07:00
4a29f0702f test.ctlmgr: drop a redundant lambda 2016-01-28 16:59:59 -07:00
bb1db7d7fd test.ctlmgr: add basic test tooling 2016-01-28 16:54:14 -07:00
ab5e8fd8da hardware_testbench: fix timeout handling 2016-01-28 15:41:38 -07:00
982fbb0670 hardware_testbench: use plain subprocess to start controllers 2016-01-28 15:31:01 -07:00
1b7020dff3 hardware_testbench: run Crontrollers loop in thread, not the test 2016-01-27 18:45:08 -07:00
99f788965e Merge branch 'master' into testbench-controllers
* master:
  gui/experiments: float/bring into focus already open docks when opening experiments
  gui: reduce size of console dock
  protocols/logging,pc_rpc: do not print errors on Windows when clients disconnect
  gui: reduce size of schedule dock
  worker: Windows VMs are slow, increase send_timeout
  protocol/sync_struct: Windows also raises ConnectionAbortedError on disconnection
  gui: reduce size of log dock
  gui: reduce size of experiment dock
  protocols/logging/LogParser: handle Windows CRLF
  pyon: handle \r
  test/pipe_ipc: re-enable
  protocols/asyncio_server: minor cleanup
  protocols/pipe_ipc: Windows support
  Revert "Revert "test/pipe_ipc: temporarily skip test""
  Revert "try debugging weird unittest failure"
  try debugging weird unittest failure
  conda: restrict binutils-or1k-linux dependency to linux.
  transforms.iodelay_estimator: make diagnostics much more clear.
  Fix typo.
2016-01-27 14:26:35 -07:00
f78eecb81b hardware_testbench: run controllers 2016-01-27 14:24:32 -07:00
022a1ffd09 gui/experiments: float/bring into focus already open docks when opening experiments 2016-01-27 21:58:27 +01:00
ebb959cd50 gui: reduce size of console dock 2016-01-27 21:25:42 +01:00
27c12a5bf4 protocols/logging,pc_rpc: do not print errors on Windows when clients disconnect 2016-01-27 21:23:27 +01:00
7aaeb636e4 gui: reduce size of schedule dock 2016-01-27 21:18:47 +01:00
5076c85ed6 worker: Windows VMs are slow, increase send_timeout 2016-01-27 21:15:22 +01:00
a4fb8f3e53 protocol/sync_struct: Windows also raises ConnectionAbortedError on disconnection 2016-01-27 21:12:22 +01:00
cfa4f791e8 gui: reduce size of log dock 2016-01-27 20:51:34 +01:00
dca44ef501 gui: reduce size of experiment dock 2016-01-27 20:46:25 +01:00
170b438b98 protocols/logging/LogParser: handle Windows CRLF 2016-01-27 20:45:04 +01:00
590354dbc8 pyon: handle \r 2016-01-27 20:43:42 +01:00
b753306f12 Merge branch 'worker_pipeipc' 2016-01-27 19:37:06 +01:00
3d9fc7a51f test/pipe_ipc: re-enable 2016-01-27 19:20:04 +01:00
79c0488ff1 protocols/asyncio_server: minor cleanup 2016-01-27 19:19:47 +01:00
dce2aac475 protocols/pipe_ipc: Windows support 2016-01-27 19:18:03 +01:00
83fd160614 Revert "Revert "test/pipe_ipc: temporarily skip test""
This reverts commit 7a9864b260.
2016-01-27 10:26:53 +01:00
whitequark
0acc86b3b3 transforms.iodelay_estimator: make diagnostics much more clear. 2016-01-27 02:10:15 +00:00
whitequark
7f9a180946 Fix typo. 2016-01-26 23:23:35 +00:00
ccac8525d2 lda: test tweaks 2016-01-26 15:24:29 -07:00
cda4a0765d artiq_ctlmgr: refactor into artiq.devices.ctlmgr 2016-01-26 15:24:29 -07:00
be5162d60f worker: restore short exception info in first line of log 2016-01-26 22:07:54 +01:00
3cf67afeb1 generalize multiline logging to remote logs and controllers 2016-01-26 21:59:37 +01:00
1fed38a8dc worker: use MultilineFormatter 2016-01-26 21:30:28 +01:00
ded1e31567 protocols/logging: add MultilineFormatter 2016-01-26 21:30:09 +01:00
19c5e89b4d protocols/logging: support parsing multiline log messages 2016-01-26 21:06:44 +01:00
5aa4de8e89 refactor logging and implement in worker 2016-01-26 20:31:42 +01:00
a583a923d8 worker: use pipe_ipc (no log) 2016-01-26 14:59:36 +01:00
6383253e03 protocols/pipe_ipc: autoclose pipe fds on process exit in AsyncioParentComm 2016-01-26 14:55:52 +01:00
7a9864b260 Revert "test/pipe_ipc: temporarily skip test"
This reverts commit 3a73673e71.
2016-01-26 09:42:59 +01:00
3a73673e71 test/pipe_ipc: temporarily skip test 2016-01-25 19:21:03 -07:00
d1119d7747 artiq_dir: move out of tools to unlink dependencies 2016-01-25 18:15:50 -07:00
cbb60337ae refactor Analyzer constants to unlink dependencies 2016-01-25 18:03:48 -07:00
f4c7f02127 CoreException: store at 'py_exn.artiq_core_exception'
... and fix a few imports
2016-01-25 17:24:00 -07:00
e0f2d94191 coredevice: remove some print()s 2016-01-25 17:24:00 -07:00
2beaf23e6c language...ARTIQException -> coredevice...CoreException
gets rid of a cross import
is only used there
2016-01-25 17:24:00 -07:00
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
fbe4d96572 artiq: move namespace artiq.* -> artiq.language.*
perl -i -pe 's/^from artiq import \*$/from artiq.language import */' your_experiments/*.py
2016-01-25 17:24:00 -07:00
dcea6780c6 protocols/pipe_ipc: implement AsyncioChildComm for Unix (affected by python/asyncio#314) 2016-01-26 00:48:12 +01:00
8befc6a8fc protocols: add pipe_ipc (incomplete) 2016-01-25 22:49:32 +01:00
0079aa4037 runtime/main: style, wording, 1s ppp holdoff 2016-01-25 13:38:58 -07:00
2832d200f2 Merge remote-tracking branch 'm-labs/master' into ppp2
* m-labs/master:
  test/worker: update
  gui/log: display level and date information in tooltips
  master: add filename in worker log entries. Closes #226
  master: finer control of worker exception reporting. Closes #233
  conda: add artiq-kc705-nist_clock
  gateware: add QC1 docstring
  gateware: add clock target from David
  gateware: clean up and integrate QC2 modifications from Daniel
  add information about CLOCK hardware
2016-01-25 12:17:04 -07:00
a4dffaac26 test/worker: update 2016-01-24 15:32:37 +01:00
56cbf261b0 gui/log: display level and date information in tooltips 2016-01-23 22:17:08 -05:00
ae19f1c75d master: add filename in worker log entries. Closes #226 2016-01-23 21:43:24 -05:00
cc6b808bf8 master: finer control of worker exception reporting. Closes #233 2016-01-23 21:23:02 -05:00
8cbb60b370 Merge branch 'master' into ppp2
* master:
  add release notes/process
  targets/kc705: fix e664fe3
  targets/kc705: fix DDS_RTIO_CLK_RATIO for AD9914. Closes #238
  transforms.inferencer: give a suggestion on "raise Exception".
  pdq2/mediator: raise instances, not classes
  pdq2: wire up more of the pipeline
  doc: use actual version
  Fix formatting.
  doc: add artiq_flash
  versioneer: remote tag_prefix = v
2016-01-20 19:29:00 -07:00
18f0ee814d gateware: add QC1 docstring 2016-01-20 21:27:22 -05:00
db8ba8d6c1 gateware: add clock target from David 2016-01-20 21:23:49 -05:00
b3ba97e431 gateware: clean up and integrate QC2 modifications from Daniel 2016-01-20 21:17:19 -05:00
fa1afb7dd8 add information about CLOCK hardware 2016-01-20 21:06:02 -05:00
cb5fd08713 targets/kc705: fix e664fe3 2016-01-20 09:38:44 -05:00
e664fe38b0 targets/kc705: fix DDS_RTIO_CLK_RATIO for AD9914. Closes #238 2016-01-20 09:18:50 -05:00
whitequark
3573a8750a transforms.inferencer: give a suggestion on "raise Exception". 2016-01-20 03:20:25 +00:00
641ef57458 pdq2/mediator: raise instances, not classes 2016-01-19 20:16:27 -07:00
f0860beffd pdq2: wire up more of the pipeline 2016-01-19 20:09:10 -07:00
whitequark
1d7858c7bc Fix formatting. 2016-01-19 18:52:43 +00:00
cf17be92e3 doc: add artiq_flash 2016-01-18 21:41:42 -07:00
8674875007 versioneer: remote tag_prefix = v
does not seem to be stripped correctly
2016-01-18 21:28:09 -07:00
2bc2cd0064 ppp: remove unneeded objects 2016-01-18 21:26:36 -07:00
7e3610c545 Merge branch 'pipistrello-analyzer' into ppp
* pipistrello-analyzer:
  pipistrello: add rtio.Analyzer()
2016-01-18 21:05:02 -07:00
1adeeabbed ppp: wait for connection 2016-01-18 21:04:51 -07:00
dc709a77b8 PPP support (TCP broken) 2016-01-18 20:09:10 -07:00
57ce78c54d pipistrello: add rtio.Analyzer() 2016-01-18 19:17:44 -07:00
063e88d75a artiq/_version.py: update 2016-01-18 19:12:42 -07:00
whitequark
e2910fba99 runtime: define NDEBUG to disable debug mode of __artiq_personality.
There shouldn't be any bugs left and all the printing it does slows
exception handling considerably.
2016-01-19 01:52:57 +00:00
whitequark
5c6b1517d0 Rigorously treat builtin core device exceptions. 2016-01-19 01:45:25 +00:00
53b06a0b9b RTIOUnderflow: show slack 2016-01-18 17:28:37 -07:00
16a1ab4418 test/harness: exec in globals 2016-01-18 16:55:10 -07:00
a1201252e2 artiq/test/{not,harness}.py: usual CLI handling 2016-01-18 16:00:46 -07:00
d7e4783cae lit-test: move to artiq/test 2016-01-18 15:28:24 -07:00
whitequark
5f0e2bf9f9 analyses.domination: all blocks dominate themselves. 2016-01-18 21:33:14 +00:00
c0bcff4035 test/*/: add missing __init__.py 2016-01-18 14:22:40 -07:00
f9a6ba1884 gui/applets: add shortcuts 2016-01-16 13:12:16 -07:00
ed6a53db00 gui/log: add scroll to bottom button 2016-01-16 13:06:45 -07:00
16f6d00e35 gui: fix shortcut contexts. Closes #225 2016-01-16 12:53:53 -07:00
f9323c3286 master/worker_db/get_last_rid: ignore improperly named files 2016-01-16 10:56:01 -07:00
a808d26fc2 style 2016-01-16 10:48:09 -07:00
whitequark
785b2736a0 Document core device cache (#219). 2016-01-16 16:38:55 +00:00
whitequark
cc22837627 transforms.inferencer: infer a monomorphic type for slice ":" 2016-01-16 03:09:03 +00:00
whitequark
be560dbc63 Commit missing parts of 13e65c2a. 2016-01-16 03:00:17 +00:00
whitequark
13e65c2a0a scheduler: make sure worker exceptions are not unexpectedly hidden. 2016-01-16 02:20:32 +00:00
whitequark
6bf48e60ba worker: make parent errors readable in log. 2016-01-16 02:06:40 +00:00
whitequark
67d2e7a828 worker: display compile warnings and errors nicely (#227). 2016-01-16 01:28:26 +00:00
whitequark
95470a59e5 gui.log: work around a Qt layout bug. 2016-01-16 01:26:05 +00:00
whitequark
85222783ee transforms.llvm_ir_generator: fix memoize(). 2016-01-16 00:38:57 +00:00
whitequark
e6185e16d8 Commit missing parts of 127b117. 2016-01-16 00:06:18 +00:00
whitequark
bed62349d2 transforms.llvm_ir_generator: i64 doesn't need sret (fixes #228). 2016-01-15 23:58:11 +00:00
331ac37505 applets/plot_hist: better help message 2016-01-15 12:50:09 -07:00
9acf8b7c1a gui/applets: templates 2016-01-15 10:15:06 -07:00
whitequark
e0d5b77e27 Commit missing parts of 127b117. 2016-01-15 17:11:26 +00:00
cc3a45d4e4 gui/applets: fix applet removal 2016-01-15 10:11:13 -07:00
whitequark
127b117113 Add @host_only function decorator (#172). 2016-01-15 16:42:08 +00:00
15039e1d74 runtime/dds: DDS_ONEHOT_SEL -> CONFIG_DDS_ONEHOT_SEL 2016-01-15 09:32:17 -07:00
5bf257818d protocols/pc_rpc: use timeout only for connecting. Closes #161 2016-01-14 17:50:36 -07:00
a9cf89215b coredevice/dds: use explicit 64-bit ints for ftw computations 2016-01-14 15:25:01 -07:00
whitequark
1b9713115c runtime: link libm and libbase-nofloat where appropriate. 2016-01-14 21:02:23 +00:00
whitequark
00b688cab0 gui: wrap very long words too (fixes #187). 2016-01-14 18:57:32 +00:00
3d56ea5c71 applets/plot_xy_hist: use normal Qt widget as top-level to workaround pyqtgraph.GraphicsWindow misbehaviour with embedding 2016-01-13 07:22:19 -07:00
8ad151b4d8 applets/plot_xy_hist: do not crash when datasets are missing 2016-01-13 07:05:30 -07:00
7661b37c19 applets/simple: filter mods 2016-01-13 07:04:55 -07:00
81a86b2b04 applets/plot_xy_hist: do not clear arrow/histogram when unrelated data is modified 2016-01-13 06:53:23 -07:00
e37e0bdc1c applets/plot_xy_hist: use applets.simple and datasets 2016-01-13 05:52:33 -07:00
whitequark
63f7899f93 Commit missing parts of 7f914a0. 2016-01-10 20:25:58 +00:00
whitequark
225f7d7302 Commit missing parts of 9366a29. 2016-01-10 20:01:26 +00:00
whitequark
1be9e7576d transforms.llvm_ir_generator: use byval for FFI calls where appropriate. 2016-01-10 18:31:35 +00:00
whitequark
d1319b83e5 runtime: properly format addresses in InternalError message. 2016-01-10 18:07:08 +00:00
whitequark
b669e83554 Inject parameters into coredevice exception message when mapping. 2016-01-10 18:06:28 +00:00
whitequark
ee1ef551bc Fix symbolizer invocation with no addresses. 2016-01-10 18:04:10 +00:00
whitequark
d436093317 transforms.llvm_ir_generator: use sret attribute on FFI calls too. 2016-01-10 17:42:40 +00:00
whitequark
7f914a057c transforms.llvm_ir_generator: use sret attribute. 2016-01-10 17:31:59 +00:00
whitequark
edb7423a4f transforms.llvm_ir_generator: use getelementptr inbounds. 2016-01-10 16:36:04 +00:00
whitequark
a2a00e8b35 Set LLVM inlining threshold explicitly.
llvmlite's pass manager builder does not use a default when it
is not specified explicitly, unlike the C++ one.
2016-01-10 16:15:23 +00:00
whitequark
f92ce291ef transforms.llvm_ir_generator: call devirtualized functions directly. 2016-01-10 15:54:46 +00:00
whitequark
bbd0ca7827 Commit missing parts of 9366a29. 2016-01-10 15:45:56 +00:00
whitequark
c46fccdf4b transforms.llvm_ir_generator: annotate invariant loads as such. 2016-01-10 15:45:34 +00:00
whitequark
b298170973 transforms.artiq_ir_generator: annotate embedded functions as internal. 2016-01-10 15:45:20 +00:00
whitequark
4198601abb coredevice.exceptions: add CacheError. 2016-01-10 14:43:30 +00:00
whitequark
211af77e77 validators.escape: cache_get result lives forever. 2016-01-10 14:43:21 +00:00
whitequark
f8e50f2b0c Remove redundant ksupport API. 2016-01-10 14:27:46 +00:00
38cdeb0a32 applets/simple: support mod buffering 2016-01-10 22:12:00 +08:00