Skip to content

Commit 90ba9f7

Browse files
fallenfallen
committedJul 13, 2015
llvmlite: rename our package to be llvmlite_or1k to avoid collision with llvmlite package needed for numba
·
8.00.1
1 parent 56fc7a4 commit 90ba9f7

File tree

12 files changed

+92
-14
lines changed

12 files changed

+92
-14
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.ir as ll
4-
import llvmlite.binding as llvm
3+
import llvmlite_or1k.ir as ll
4+
import llvmlite_or1k.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.ir as ll
3+
import llvmlite_or1k.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.ir as ll
1+
import llvmlite_or1k.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.ir as ll
4+
import llvmlite_or1k.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.ir as ll
1+
import llvmlite_or1k.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.ir as ll
2-
import llvmlite.binding as llvm
1+
import llvmlite_or1k.ir as ll
2+
import llvmlite_or1k.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.ir as ll
1+
import llvmlite_or1k.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.ir as ll
4+
import llvmlite_or1k.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.binding as llvm
8+
import llvmlite_or1k.binding as llvm
99

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

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ build:
1212
requirements:
1313
build:
1414
- system [linux and not armv6]
15+
- cmake [linux]
1516
run:
1617
- system [linux and not armv6]
1718

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ source:
99
requirements:
1010
build:
1111
- python
12-
- llvmdev-or1k
1312
- setuptools
1413
run:
1514
- python
@@ -19,8 +18,8 @@ build:
1918

2019
test:
2120
imports:
22-
- llvmlite
23-
- llvmlite.llvmpy
21+
- llvmlite_or1k
22+
- llvmlite_or1k.llvmpy
2423

2524
about:
2625
home: https://pypi.python.org/pypi/llvmlite/

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

+78
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,81 @@ index bfaa5b2..7d0df11 100644
3636
def initialize_native_target():
3737
"""
3838
Initialize the native (host) target. Necessary before doing any
39+
diff --git a/ffi/build.py b/ffi/build.py
40+
index 3889ba5..58f93ec 100755
41+
--- a/ffi/build.py
42+
+++ b/ffi/build.py
43+
@@ -58,7 +58,7 @@ def find_win32_generator():
44+
45+
def main_win32():
46+
generator = find_win32_generator()
47+
- config = 'Release'
48+
+ config = 'Debug'
Has a conversation. Original line has a conversation.
49+
if not os.path.exists(build_dir):
50+
os.mkdir(build_dir)
51+
try_cmake(here_dir, build_dir, generator)
52+
diff --git a/setup.py b/setup.py
53+
index 6d28265..f4edd29 100644
54+
--- a/setup.py
55+
+++ b/setup.py
56+
@@ -15,10 +15,10 @@ from llvmlite.utils import get_library_files
57+
import versioneer
58+
59+
versioneer.VCS = 'git'
60+
-versioneer.versionfile_source = 'llvmlite/_version.py'
61+
-versioneer.versionfile_build = 'llvmlite/_version.py'
62+
+versioneer.versionfile_source = 'llvmlite_or1k/_version.py'
63+
+versioneer.versionfile_build = 'llvmlite_or1k/_version.py'
64+
versioneer.tag_prefix = 'v' # tags are like v1.2.0
65+
-versioneer.parentdir_prefix = 'llvmlite-' # dirname like 'myproject-1.2.0'
66+
+versioneer.parentdir_prefix = 'llvmlite_or1k-' # dirname like 'myproject-1.2.0'
67+
68+
69+
here_dir = os.path.dirname(__file__)
70+
@@ -54,7 +54,7 @@ class LlvmliteBuildExt(build_ext):
71+
# HACK: this makes sure the library file (which is large) is only
72+
# included in binary builds, not source builds.
73+
self.distribution.package_data = {
74+
- "llvmlite.binding": get_library_files(),
75+
+ "llvmlite_or1k.binding": get_library_files(),
76+
}
77+
78+
79+
@@ -63,7 +63,7 @@ class LlvmliteInstall(install):
80+
# This seems to only be necessary on OSX.
81+
def run(self):
82+
self.distribution.package_data = {
83+
- "llvmlite.binding": get_library_files(),
84+
+ "llvmlite_or1k.binding": get_library_files(),
85+
}
86+
install.run(self)
87+
88+
@@ -74,14 +74,14 @@ cmdclass.update({'build': LlvmliteBuild,
89+
})
90+
91+
92+
-packages = ['llvmlite',
93+
- 'llvmlite.binding',
94+
- 'llvmlite.ir',
95+
- 'llvmlite.llvmpy',
96+
- 'llvmlite.tests',
97+
+packages = ['llvmlite_or1k',
98+
+ 'llvmlite_or1k.binding',
99+
+ 'llvmlite_or1k.ir',
100+
+ 'llvmlite_or1k.llvmpy',
101+
+ 'llvmlite_or1k.tests',
102+
]
103+
104+
-setup(name='llvmlite',
105+
+setup(name='llvmlite_or1k',
Has a conversation. Original line has a conversation.
106+
description="lightweight wrapper around basic LLVM functionality",
107+
version=versioneer.get_version(),
108+
classifiers=[
109+
@@ -96,6 +96,7 @@ setup(name='llvmlite',
110+
"Topic :: Software Development :: Code Generators",
111+
"Topic :: Software Development :: Compilers",
112+
],
113+
+ package_dir={"llvmlite_or1k" : "llvmlite"},
114+
# Include the separately-compiled shared library
115+
author="Continuum Analytics, Inc.",
116+
author_email="numba-users@continuum.io",

0 commit comments

Comments
 (0)
Please sign in to comment.