occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'release-1' of github.com:m-labs/artiq into release-1

This commit is contained in:
Sebastien Bourdeauducq 2016-04-02 22:32:27 +08:00
parent ee5eb57645 3e6e8c6b51
commit 0808db6b40
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/test/lit/devirtualization/function.py
View File

@ -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
artiq/test/lit/devirtualization/method.py
View File

@ -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
conda/artiq/meta.yaml
View File

@ -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