Fold llvmlite patches into m-labs/llvmlite repository.

m-labs · Aug 5, 2015 · 4a8e397 · 4a8e397
1 parent d040224
commit 4a8e397
Showing 16 changed files with 14 additions and 138 deletions.
diff --git a/artiq/coredevice/runtime.py b/artiq/coredevice/runtime.py
@@ -1,7 +1,7 @@
 import os
 
-import llvmlite_or1k.ir as ll
-import llvmlite_or1k.binding as llvm
+import llvmlite_artiq.ir as ll
+import llvmlite_artiq.binding as llvm
 
 from artiq.py2llvm import base_types, fractions, lists
 from artiq.language import units

diff --git a/artiq/py2llvm/ast_body.py b/artiq/py2llvm/ast_body.py
@@ -1,6 +1,6 @@
 import ast
 
-import llvmlite_or1k.ir as ll
+import llvmlite_artiq.ir as ll
 
 from artiq.py2llvm import values, base_types, fractions, lists, iterators
 from artiq.py2llvm.tools import is_terminated

diff --git a/artiq/py2llvm/base_types.py b/artiq/py2llvm/base_types.py
@@ -1,4 +1,4 @@
-import llvmlite_or1k.ir as ll
+import llvmlite_artiq.ir as ll
 
 from artiq.py2llvm.values import VGeneric
 

diff --git a/artiq/py2llvm/fractions.py b/artiq/py2llvm/fractions.py
@@ -1,7 +1,7 @@
 import inspect
 import ast
 
-import llvmlite_or1k.ir as ll
+import llvmlite_artiq.ir as ll
 
 from artiq.py2llvm.values import VGeneric, operators
 from artiq.py2llvm.base_types import VBool, VInt, VFloat

diff --git a/artiq/py2llvm/lists.py b/artiq/py2llvm/lists.py
@@ -1,4 +1,4 @@
-import llvmlite_or1k.ir as ll
+import llvmlite_artiq.ir as ll
 
 from artiq.py2llvm.values import VGeneric
 from artiq.py2llvm.base_types import VInt, VNone

diff --git a/artiq/py2llvm/module.py b/artiq/py2llvm/module.py
@@ -1,5 +1,5 @@
-import llvmlite_or1k.ir as ll
-import llvmlite_or1k.binding as llvm
+import llvmlite_artiq.ir as ll
+import llvmlite_artiq.binding as llvm
 
 from artiq.py2llvm import infer_types, ast_body, base_types, fractions, tools
 

diff --git a/artiq/py2llvm/tools.py b/artiq/py2llvm/tools.py
@@ -1,4 +1,4 @@
-import llvmlite_or1k.ir as ll
+import llvmlite_artiq.ir as ll
 
 def is_terminated(basic_block):
 	return (basic_block.instructions

diff --git a/artiq/py2llvm/values.py b/artiq/py2llvm/values.py
@@ -1,7 +1,7 @@
 from types import SimpleNamespace
 from copy import copy
 
-import llvmlite_or1k.ir as ll
+import llvmlite_artiq.ir as ll
 
 
 class VGeneric:

diff --git a/artiq/test/py2llvm.py b/artiq/test/py2llvm.py
@@ -5,7 +5,7 @@
 from ctypes import CFUNCTYPE, c_int, c_int32, c_int64, c_double
 import struct
 
-import llvmlite_or1k.binding as llvm
+import llvmlite_artiq.binding as llvm
 
 from artiq.language.core import int64
 from artiq.py2llvm.infer_types import infer_function_types

diff --git a/conda/llvmlite-or1k/bld.bat b/conda/llvmlite-or1k/bld.bat
@@ -4,10 +4,5 @@ set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%
 @rem Ensure there are no build leftovers (CMake can complain)
 if exist ffi\build rmdir /S /Q ffi\build
 
-@rem Apply patches
-patch -p1 <  %RECIPE_DIR%/../../misc/llvmlite-add-all-targets.patch
-patch -p1 <  %RECIPE_DIR%/../../misc/llvmlite-rename.patch
-patch -p1 <  %RECIPE_DIR%/../../misc/llvmlite-build-as-debug-on-windows.patch
-
 %PYTHON% -S setup.py install
 if errorlevel 1 exit 1
diff --git a/conda/llvmlite-or1k/build.sh b/conda/llvmlite-or1k/build.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
 
-patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-add-all-targets.patch
-patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-rename.patch
-patch -p1 < ${RECIPE_DIR}/../../misc/llvmlite-build-as-debug-on-windows.patch
 PATH=/usr/local/llvm-or1k/bin:$PATH $PYTHON setup.py install
diff --git a/conda/llvmlite-or1k/meta.yaml b/conda/llvmlite-or1k/meta.yaml
@@ -19,8 +19,8 @@ build:
 
 test:
     imports:
-        - llvmlite_or1k
-        - llvmlite_or1k.llvmpy
+        - llvmlite_artiq
+        - llvmlite_artiq.llvmpy
 
 about:
     home: https://pypi.python.org/pypi/llvmlite/

diff --git a/misc/llvmlite-add-all-targets.patch b/misc/llvmlite-add-all-targets.patch
diff --git a/misc/llvmlite-build-as-debug-on-windows.patch b/misc/llvmlite-build-as-debug-on-windows.patch
diff --git a/misc/llvmlite-rename.patch b/misc/llvmlite-rename.patch
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def run(self):
 requirements = [
     "sphinx", "sphinx-argparse", "pyserial", "numpy", "scipy",
     "python-dateutil", "prettytable", "h5py", "pydaqmx", "pyelftools",
-    "quamash", "pyqtgraph"
+    "quamash", "pyqtgraph", "llvmlite_artiq"
 ]
 
 scripts = [