Skip to content

Commit 4a8e397

Browse files
author
whitequark
committedAug 5, 2015
Fold llvmlite patches into m-labs/llvmlite repository.
·
8.00.1
1 parent d040224 commit 4a8e397

16 files changed

+14
-138
lines changed
 

Diff for: ‎artiq/coredevice/runtime.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22

3-
import llvmlite_or1k.ir as ll
4-
import llvmlite_or1k.binding as llvm
3+
import llvmlite_artiq.ir as ll
4+
import llvmlite_artiq.binding as llvm
55

66
from artiq.py2llvm import base_types, fractions, lists
77
from artiq.language import units

Diff for: ‎artiq/py2llvm/ast_body.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import ast
22

3-
import llvmlite_or1k.ir as ll
3+
import llvmlite_artiq.ir as ll
44

55
from artiq.py2llvm import values, base_types, fractions, lists, iterators
66
from artiq.py2llvm.tools import is_terminated

Diff for: ‎artiq/py2llvm/base_types.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import llvmlite_or1k.ir as ll
1+
import llvmlite_artiq.ir as ll
22

33
from artiq.py2llvm.values import VGeneric
44

Diff for: ‎artiq/py2llvm/fractions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import inspect
22
import ast
33

4-
import llvmlite_or1k.ir as ll
4+
import llvmlite_artiq.ir as ll
55

66
from artiq.py2llvm.values import VGeneric, operators
77
from artiq.py2llvm.base_types import VBool, VInt, VFloat

Diff for: ‎artiq/py2llvm/lists.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import llvmlite_or1k.ir as ll
1+
import llvmlite_artiq.ir as ll
22

33
from artiq.py2llvm.values import VGeneric
44
from artiq.py2llvm.base_types import VInt, VNone

Diff for: ‎artiq/py2llvm/module.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import llvmlite_or1k.ir as ll
2-
import llvmlite_or1k.binding as llvm
1+
import llvmlite_artiq.ir as ll
2+
import llvmlite_artiq.binding as llvm
33

44
from artiq.py2llvm import infer_types, ast_body, base_types, fractions, tools
55

Diff for: ‎artiq/py2llvm/tools.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import llvmlite_or1k.ir as ll
1+
import llvmlite_artiq.ir as ll
22

33
def is_terminated(basic_block):
44
return (basic_block.instructions

Diff for: ‎artiq/py2llvm/values.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from types import SimpleNamespace
22
from copy import copy
33

4-
import llvmlite_or1k.ir as ll
4+
import llvmlite_artiq.ir as ll
55

66

77
class VGeneric:

Diff for: ‎artiq/test/py2llvm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from ctypes import CFUNCTYPE, c_int, c_int32, c_int64, c_double
66
import struct
77

8-
import llvmlite_or1k.binding as llvm
8+
import llvmlite_artiq.binding as llvm
99

1010
from artiq.language.core import int64
1111
from artiq.py2llvm.infer_types import infer_function_types

Diff for: ‎conda/llvmlite-or1k/bld.bat

-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,5 @@ set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%
44
@rem Ensure there are no build leftovers (CMake can complain)
55
if exist ffi\build rmdir /S /Q ffi\build
66

7-
@rem Apply patches
8-
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-add-all-targets.patch
9-
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-rename.patch
10-
patch -p1 < %RECIPE_DIR%/../../misc/llvmlite-build-as-debug-on-windows.patch
11-
127
%PYTHON% -S setup.py install
138
if errorlevel 1 exit 1

Diff for: ‎conda/llvmlite-or1k/build.sh

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
#!/bin/bash
22

3-
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-add-all-targets.patch
4-
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-rename.patch
5-
patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-build-as-debug-on-windows.patch
63
PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install

Diff for: ‎conda/llvmlite-or1k/meta.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ build:
1919

2020
test:
2121
imports:
22-
- llvmlite_or1k
23-
- llvmlite_or1k.llvmpy
22+
- llvmlite_artiq
23+
- llvmlite_artiq.llvmpy
2424

2525
about:
2626
home: https://pypi.python.org/pypi/llvmlite/

Diff for: ‎misc/llvmlite-add-all-targets.patch

-38
This file was deleted.

Diff for: ‎misc/llvmlite-build-as-debug-on-windows.patch

-13
This file was deleted.

Diff for: ‎misc/llvmlite-rename.patch

-65
This file was deleted.

Diff for: ‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def run(self):
2020
requirements = [
2121
"sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
2222
"python-dateutil", "prettytable", "h5py", "pydaqmx", "pyelftools",
23-
"quamash", "pyqtgraph"
23+
"quamash", "pyqtgraph", "llvmlite_artiq"
2424
]
2525

2626
scripts = [

0 commit comments

Comments
 (0)
Please sign in to comment.