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: ee5eb57645d3^
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: 0808db6b4042
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 2, 2016

  1. Revert "conda: simplify llvmlite-artiq version requirement"

    This reverts commit 4d54695.
    whitequark committed Apr 2, 2016
    Copy the full SHA
    0eae25c View commit details
  2. Revert "test: XFAIL lit/devirtualization/*."

    This reverts commit 63121e4.
    whitequark committed Apr 2, 2016
    Copy the full SHA
    3e6e8c6 View commit details
  3. RELEASE_NOTES: 1.0rc2

    sbourdeauducq committed Apr 2, 2016
    Copy the full SHA
    ee5eb57 View commit details
  4. Copy the full SHA
    0808db6 View commit details
Showing with 3 additions and 5 deletions.
  1. +2 −2 RELEASE_NOTES.rst
  2. +0 −1 artiq/test/lit/devirtualization/function.py
  3. +0 −1 artiq/test/lit/devirtualization/method.py
  4. +1 −1 conda/artiq/meta.yaml
4 changes: 2 additions & 2 deletions RELEASE_NOTES.rst
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
Release notes
=============

unreleased
----------
1.0rc2
------

* The CPU speed in the pipistrello gateware has been reduced from 83 1/3 MHz to
75 MHz. This will reduce the achievable sustained pulse rate and latency
1 change: 0 additions & 1 deletion artiq/test/lit/devirtualization/function.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# RUN: env ARTIQ_DUMP_IR=%t %python -m artiq.compiler.testbench.embedding +compile %s
# RUN: OutputCheck %s --file-to-check=%t.txt
# XFAIL: *

from artiq.language.core import *
from artiq.language.types import *
1 change: 0 additions & 1 deletion artiq/test/lit/devirtualization/method.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# RUN: env ARTIQ_DUMP_IR=%t %python -m artiq.compiler.testbench.embedding +compile %s 2>%t
# RUN: OutputCheck %s --file-to-check=%t.txt
# XFAIL: *

from artiq.language.core import *
from artiq.language.types import *
2 changes: 1 addition & 1 deletion conda/artiq/meta.yaml
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ requirements:
- binutils-or1k-linux
run:
- python >=3.5.1
- llvmlite-artiq 0.5.1
- llvmlite-artiq 0.5.1 py35_17
- scipy
- numpy
- prettytable