forked from M-Labs/artiq
1
0
Fork 0

llvmlite: rename our package to be llvmlite_or1k to avoid collision with llvmlite package needed for numba

This commit is contained in:
Yann Sionneau 2015-07-14 01:01:19 +02:00
parent 56fc7a484c
commit 90ba9f7bbf
12 changed files with 92 additions and 14 deletions

View File

@ -1,7 +1,7 @@
import os
import llvmlite.ir as ll
import llvmlite.binding as llvm
import llvmlite_or1k.ir as ll
import llvmlite_or1k.binding as llvm
from artiq.py2llvm import base_types, fractions, lists
from artiq.language import units

View File

@ -1,6 +1,6 @@
import ast
import llvmlite.ir as ll
import llvmlite_or1k.ir as ll
from artiq.py2llvm import values, base_types, fractions, lists, iterators
from artiq.py2llvm.tools import is_terminated

View File

@ -1,4 +1,4 @@
import llvmlite.ir as ll
import llvmlite_or1k.ir as ll
from artiq.py2llvm.values import VGeneric

View File

@ -1,7 +1,7 @@
import inspect
import ast
import llvmlite.ir as ll
import llvmlite_or1k.ir as ll
from artiq.py2llvm.values import VGeneric, operators
from artiq.py2llvm.base_types import VBool, VInt, VFloat

View File

@ -1,4 +1,4 @@
import llvmlite.ir as ll
import llvmlite_or1k.ir as ll
from artiq.py2llvm.values import VGeneric
from artiq.py2llvm.base_types import VInt, VNone

View File

@ -1,5 +1,5 @@
import llvmlite.ir as ll
import llvmlite.binding as llvm
import llvmlite_or1k.ir as ll
import llvmlite_or1k.binding as llvm
from artiq.py2llvm import infer_types, ast_body, base_types, fractions, tools

View File

@ -1,4 +1,4 @@
import llvmlite.ir as ll
import llvmlite_or1k.ir as ll
def is_terminated(basic_block):
return (basic_block.instructions

View File

@ -1,7 +1,7 @@
from types import SimpleNamespace
from copy import copy
import llvmlite.ir as ll
import llvmlite_or1k.ir as ll
class VGeneric:

View File

@ -5,7 +5,7 @@ from fractions import Fraction
from ctypes import CFUNCTYPE, c_int, c_int32, c_int64, c_double
import struct
import llvmlite.binding as llvm
import llvmlite_or1k.binding as llvm
from artiq.language.core import int64
from artiq.py2llvm.infer_types import infer_function_types

View File

@ -12,6 +12,7 @@ build:
requirements:
build:
- system [linux and not armv6]
- cmake [linux]
run:
- system [linux and not armv6]

View File

@ -9,7 +9,6 @@ source:
requirements:
build:
- python
- llvmdev-or1k
- setuptools
run:
- python
@ -19,8 +18,8 @@ build:
test:
imports:
- llvmlite
- llvmlite.llvmpy
- llvmlite_or1k
- llvmlite_or1k.llvmpy
about:
home: https://pypi.python.org/pypi/llvmlite/

View File

@ -36,3 +36,81 @@ index bfaa5b2..7d0df11 100644
def initialize_native_target():
"""
Initialize the native (host) target. Necessary before doing any
diff --git a/ffi/build.py b/ffi/build.py
index 3889ba5..58f93ec 100755
--- a/ffi/build.py
+++ b/ffi/build.py
@@ -58,7 +58,7 @@ def find_win32_generator():
def main_win32():
generator = find_win32_generator()
- config = 'Release'
+ config = 'Debug'
if not os.path.exists(build_dir):
os.mkdir(build_dir)
try_cmake(here_dir, build_dir, generator)
diff --git a/setup.py b/setup.py
index 6d28265..f4edd29 100644
--- a/setup.py
+++ b/setup.py
@@ -15,10 +15,10 @@ from llvmlite.utils import get_library_files
import versioneer
versioneer.VCS = 'git'
-versioneer.versionfile_source = 'llvmlite/_version.py'
-versioneer.versionfile_build = 'llvmlite/_version.py'
+versioneer.versionfile_source = 'llvmlite_or1k/_version.py'
+versioneer.versionfile_build = 'llvmlite_or1k/_version.py'
versioneer.tag_prefix = 'v' # tags are like v1.2.0
-versioneer.parentdir_prefix = 'llvmlite-' # dirname like 'myproject-1.2.0'
+versioneer.parentdir_prefix = 'llvmlite_or1k-' # dirname like 'myproject-1.2.0'
here_dir = os.path.dirname(__file__)
@@ -54,7 +54,7 @@ class LlvmliteBuildExt(build_ext):
# HACK: this makes sure the library file (which is large) is only
# included in binary builds, not source builds.
self.distribution.package_data = {
- "llvmlite.binding": get_library_files(),
+ "llvmlite_or1k.binding": get_library_files(),
}
@@ -63,7 +63,7 @@ class LlvmliteInstall(install):
# This seems to only be necessary on OSX.
def run(self):
self.distribution.package_data = {
- "llvmlite.binding": get_library_files(),
+ "llvmlite_or1k.binding": get_library_files(),
}
install.run(self)
@@ -74,14 +74,14 @@ cmdclass.update({'build': LlvmliteBuild,
})
-packages = ['llvmlite',
- 'llvmlite.binding',
- 'llvmlite.ir',
- 'llvmlite.llvmpy',
- 'llvmlite.tests',
+packages = ['llvmlite_or1k',
+ 'llvmlite_or1k.binding',
+ 'llvmlite_or1k.ir',
+ 'llvmlite_or1k.llvmpy',
+ 'llvmlite_or1k.tests',
]
-setup(name='llvmlite',
+setup(name='llvmlite_or1k',
description="lightweight wrapper around basic LLVM functionality",
version=versioneer.get_version(),
classifiers=[
@@ -96,6 +96,7 @@ setup(name='llvmlite',
"Topic :: Software Development :: Code Generators",
"Topic :: Software Development :: Compilers",
],
+ package_dir={"llvmlite_or1k" : "llvmlite"},
# Include the separately-compiled shared library
author="Continuum Analytics, Inc.",
author_email="numba-users@continuum.io",