Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c28b938471d8
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c52081ca0d74
Choose a head ref
  • 8 commits
  • 34 files changed
  • 2 contributors

Commits on Feb 2, 2016

  1. remove stale dependency on pyelftools

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    55b3124 View commit details

  2. setup.py: remove stale import

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    c639860 View commit details

  3. remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    b7de92e View commit details

  4. test/ctlmgr: use sys.executable, use default localhost binding

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    ca8a075 View commit details

  5. assume 'import artiq' works before running tests

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    9ca8b48 View commit details

  6. style

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    89f68f3 View commit details

Commits on Feb 3, 2016

  1. 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
    @jordens
    jordens committed Feb 3, 2016
    Copy the full SHA
    ab81dbb View commit details

  2. Merge remote-tracking branch 'm-labs/newtesting' into subprocess-term… 

    …ination

* m-labs/newtesting:
  style
  assume 'import artiq' works before running tests
  test/ctlmgr: use sys.executable, use default localhost binding
    @jordens
    jordens committed Feb 3, 2016
    Copy the full SHA
    c52081c View commit details
Showing with 32 additions and 525 deletions.
  1. +1 −1 artiq/compiler/testbench/jit.py
  2. 0 artiq/devices/pxi6733/__init__.py
  3. +0 −141 artiq/devices/pxi6733/driver.py
  4. +0 −180 artiq/devices/pxi6733/mediator.py
  5. +0 −48 artiq/frontend/pxi6733_controller.py
  6. 0 artiq/test/compiler/{domination.py → test_domination.py}
  7. 0 artiq/test/coredevice/{analyzer.py → test_analyzer.py}
  8. 0 artiq/test/coredevice/{cache.py → test_cache.py}
  9. 0 artiq/test/coredevice/{embedding.py → test_embedding.py}
  10. 0 artiq/test/coredevice/{portability.py → test_portability.py}
  11. 0 artiq/test/coredevice/{rtio.py → test_rtio.py}
  12. +0 −35 artiq/test/harness.py
  13. +21 −21 artiq/test/lit/lit.cfg
  14. +0 −41 artiq/test/pxi6733.py
  15. 0 artiq/test/{coefficients.py → test_coefficients.py}
  16. +4 −2 artiq/test/{ctlmgr.py → test_ctlmgr.py}
  17. 0 artiq/test/{h5types.py → test_h5types.py}
  18. 0 artiq/test/{language.py → test_language.py}
  19. 0 artiq/test/{lda.py → test_lda.py}
  20. 0 artiq/test/{novatech409b.py → test_novatech409b.py}
  21. 0 artiq/test/{pc_rpc.py → test_pc_rpc.py}
  22. 0 artiq/test/{pdq2.py → test_pdq2.py}
  23. 0 artiq/test/{pipe_ipc.py → test_pipe_ipc.py}
  24. 0 artiq/test/{scheduler.py → test_scheduler.py}
  25. 0 artiq/test/{serialization.py → test_serialization.py}
  26. 0 artiq/test/{sync_struct.py → test_sync_struct.py}
  27. 0 artiq/test/{thorlabs_tcube.py → test_thorlabs_tcube.py}
  28. 0 artiq/test/{wavesynth.py → test_wavesynth.py}
  29. 0 artiq/test/{worker.py → test_worker.py}
  30. +0 −4 conda/artiq/meta.yaml
  31. +0 −2 doc/manual/default_network_ports.rst
  32. +5 −0 doc/manual/faq.rst
  33. +0 −46 doc/manual/ndsp_reference.rst
  34. +1 −4 setup.py
2 changes: 1 addition & 1 deletion artiq/compiler/testbench/jit.py
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
from ..targets import NativeTarget

def main():
libartiq_support = os.getenv('LIBARTIQ_SUPPORT')
libartiq_support = os.getenv("LIBARTIQ_SUPPORT")
if libartiq_support is not None:
llvm.load_library_permanently(libartiq_support)

Empty file removed artiq/devices/pxi6733/__init__.py
View file
Empty file.
141 changes: 0 additions & 141 deletions artiq/devices/pxi6733/driver.py
View file

This file was deleted.

180 changes: 0 additions & 180 deletions artiq/devices/pxi6733/mediator.py
View file

This file was deleted.

48 changes: 0 additions & 48 deletions artiq/frontend/pxi6733_controller.py
View file

This file was deleted.

0 artiq/test/compiler/domination.py → artiq/test/compiler/test_domination.py
View file
File renamed without changes.
0 artiq/test/coredevice/analyzer.py → artiq/test/coredevice/test_analyzer.py
View file
File renamed without changes.
0 artiq/test/coredevice/cache.py → artiq/test/coredevice/test_cache.py
View file
File renamed without changes.
0 artiq/test/coredevice/embedding.py → artiq/test/coredevice/test_embedding.py
View file
File renamed without changes.
0 artiq/test/coredevice/portability.py → artiq/test/coredevice/test_portability.py
View file
File renamed without changes.
0 artiq/test/coredevice/rtio.py → artiq/test/coredevice/test_rtio.py
View file
File renamed without changes.
Loading