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: 75c94b40d9c0
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: cd3107ba750d
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Oct 3, 2015

  1. Copy the full SHA
    34b9f7e View commit details
  2. Copy the full SHA
    cd3107b View commit details
Showing with 7 additions and 7 deletions.
  1. +1 −1 artiq/master/scheduler.py
  2. +2 −2 conda/artiq/meta.yaml
  3. +1 −1 doc/manual/installing.rst
  4. +1 −1 examples/master/repository/speed_benchmark.py
  5. +2 −2 setup.py
2 changes: 1 addition & 1 deletion artiq/master/scheduler.py
Original file line number Diff line number Diff line change
@@ -348,7 +348,7 @@ def stop(self):
class Deleter(TaskObject):
def __init__(self, pipelines):
self._pipelines = pipelines
self._queue = asyncio.JoinableQueue()
self._queue = asyncio.Queue()

def delete(self, rid):
logger.debug("delete request for RID %d", rid)
4 changes: 2 additions & 2 deletions conda/artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -28,14 +28,14 @@ build:

requirements:
build:
- python >=3.4.3
- python >=3.4.4
- setuptools
- numpy
- migen
- pyelftools
- binutils-or1k-linux
run:
- python >=3.4.3
- python >=3.4.4
- llvmlite-artiq
- scipy
- numpy
2 changes: 1 addition & 1 deletion doc/manual/installing.rst
Original file line number Diff line number Diff line change
@@ -369,7 +369,7 @@ This command installs all the required packages: ::

$ sudo apt-get install build-essential autotools-dev file git patch perl xutils-dev python3-pip texinfo flex bison libmpc-dev python3-serial python3-dateutil python3-prettytable python3-setuptools python3-numpy python3-scipy python3-sphinx python3-h5py python3-dev python-dev subversion cmake libusb-dev libftdi-dev pkg-config libffi-dev libgit2-dev

Note that ARTIQ requires Python 3.4.3 or above.
Note that ARTIQ requires Python 3.4.4 or above.

To set user permissions on the JTAG and serial ports of the Pipistrello, create a ``/etc/udev/rules.d/30-usb-papilio.rules`` file containing the following: ::

2 changes: 1 addition & 1 deletion examples/master/repository/speed_benchmark.py
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ def build(self):
"CoreSend100Ints",
"CoreSend1MB",
"CorePrimes"]))
self.attr_argument("nruns", NumberValue(10, min=1, max=1000))
self.attr_argument("nruns", NumberValue(10, min=1, max=1000, ndecimals=0))
self.attr_device("core")
self.attr_device("scheduler")

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
import os


if sys.version_info[:3] < (3, 4, 3):
raise Exception("You need at least Python 3.4.3 to run ARTIQ")
if sys.version_info[:3] < (3, 4, 4):
raise Exception("You need Python 3.4.4+")


class PushDocCommand(Command):