Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f836465585be
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 511d51977ebd
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Jul 15, 2015

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    af20efa View commit details
  2. 2

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    chris-huxtable Chris Huxtable
    Copy the full SHA
    511d519 View commit details
2 changes: 2 additions & 0 deletions conda/llvmlite-or1k/bld.bat
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@ 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
2 changes: 2 additions & 0 deletions conda/llvmlite-or1k/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/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
3 changes: 2 additions & 1 deletion conda/llvmlite-or1k/meta.yaml
Original file line number Diff line number Diff line change
@@ -9,12 +9,13 @@ source:
requirements:
build:
- python
- llvmdev-or1k
- setuptools
run:
- python

build:
number: 0
number: 1

test:
imports:
78 changes: 0 additions & 78 deletions misc/llvmlite-add-all-targets.patch
Original file line number Diff line number Diff line change
@@ -36,81 +36,3 @@ 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",
13 changes: 13 additions & 0 deletions misc/llvmlite-build-as-debug-on-windows.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
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)
65 changes: 65 additions & 0 deletions misc/llvmlite-rename.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
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",