Skip to content

Commit

Permalink
Fold llvmlite patches into m-labs/llvmlite repository.
Browse files Browse the repository at this point in the history
whitequark committed Aug 5, 2015

Verified

This commit was signed with the committer’s verified signature.
makenowjust Hiroya Fujinami
1 parent d040224 commit 4a8e397
Showing 16 changed files with 14 additions and 138 deletions.
4 changes: 2 additions & 2 deletions artiq/coredevice/runtime.py
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion artiq/py2llvm/ast_body.py
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion artiq/py2llvm/base_types.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import llvmlite_or1k.ir as ll
import llvmlite_artiq.ir as ll

from artiq.py2llvm.values import VGeneric

2 changes: 1 addition & 1 deletion artiq/py2llvm/fractions.py
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion artiq/py2llvm/lists.py
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions artiq/py2llvm/module.py
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion artiq/py2llvm/tools.py
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion artiq/py2llvm/values.py
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion artiq/test/py2llvm.py
Original file line number Diff line number Diff line change
@@ -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
5 changes: 0 additions & 5 deletions conda/llvmlite-or1k/bld.bat
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions conda/llvmlite-or1k/build.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions conda/llvmlite-or1k/meta.yaml
Original file line number Diff line number Diff line change
@@ -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/
38 changes: 0 additions & 38 deletions misc/llvmlite-add-all-targets.patch

This file was deleted.

13 changes: 0 additions & 13 deletions misc/llvmlite-build-as-debug-on-windows.patch

This file was deleted.

65 changes: 0 additions & 65 deletions misc/llvmlite-rename.patch

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -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 = [

0 comments on commit 4a8e397

Please sign in to comment.