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: 78fb3e1b7baa
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: f52d3648067b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 30, 2015

  1. Commit missing parts of 78fb3e1.

    whitequark committed Dec 30, 2015
    Copy the full SHA
    424ca53 View commit details

  2. Mollify PEP 0479.

    whitequark committed Dec 30, 2015
    Copy the full SHA
    f52d364 View commit details
Showing with 10 additions and 1 deletion.
  1. +4 −1 artiq/compiler/ir.py
  2. +6 −0 lit-test/test/local_access/parallel.py
5 changes: 4 additions & 1 deletion artiq/compiler/ir.py
View file
Original file line number Diff line number Diff line change
@@ -236,7 +236,10 @@ def opcode(self):
def incoming(self):
operand_iter = iter(self.operands)
while True:
yield next(operand_iter), next(operand_iter)
try:
yield next(operand_iter), next(operand_iter)
except StopIteration:
return

def incoming_blocks(self):
return (block for (block, value) in self.incoming())
6 changes: 6 additions & 0 deletions lit-test/test/local_access/parallel.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# RUN: %python -m artiq.compiler.testbench.signature %s >%t

with parallel:
delay(1.0)
t0 = now_mu()
print(t0)