Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
{lang}[foss/2021b] numba v0.54.1 w/ Python 3.9.6 (on top of LLVM 12.0.1)
- Loading branch information
Showing
3 changed files
with
404 additions
and
0 deletions.
There are no files selected for viewing
95 changes: 95 additions & 0 deletions
95
easybuild/easyconfigs/n/numba/llvmlite-0.37.0_fix-LLVM-12.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
see https://github.com/numba/llvmlite/issues/688 | ||
|
||
changes from https://github.com/numba/llvmlite/pull/802 backported to llvmlite 0.37.0 | ||
|
||
From 1d928ebcd59b23b5050234a2bf71f9be7f5f6bd1 Mon Sep 17 00:00:00 2001 | ||
From: Richard Barnes <rbarnes@umn.edu> | ||
Date: Wed, 1 Dec 2021 10:29:08 -0700 | ||
Subject: [PATCH] Enable LLVM-12 and LLVM-13 | ||
|
||
--- | ||
ffi/build.py | 5 ++--- | ||
ffi/targets.cpp | 2 ++ | ||
llvmlite/tests/test_binding.py | 19 ++++++++++++++++--- | ||
3 files changed, 20 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/ffi/build.py b/ffi/build.py | ||
index 6408bf5f..95e33c64 100755 | ||
--- a/ffi/build.py | ||
+++ b/ffi/build.py | ||
@@ -162,9 +162,8 @@ def main_posix(kind, library_ext): | ||
print(msg) | ||
print(warning + '\n') | ||
else: | ||
- | ||
- if not out.startswith('11'): | ||
- msg = ("Building llvmlite requires LLVM 11.x.x, got " | ||
+ if not (out.startswith('11') or out.startswith('12') or out.startswith('13')): | ||
+ msg = ("Building llvmlite requires LLVM 11-13.x.x, got " | ||
"{!r}. Be sure to set LLVM_CONFIG to the right executable " | ||
"path.\nRead the documentation at " | ||
"http://llvmlite.pydata.org/ for more information about " | ||
|
||
--- llvmlite-0.37.0/ffi/targets.cpp.orig 2021-12-15 16:43:02.794869270 +0100 | ||
+++ llvmlite-0.37.0/ffi/targets.cpp 2021-12-15 16:43:26.665056528 +0100 | ||
@@ -232,7 +232,9 @@ | ||
rm = Reloc::DynamicNoPIC; | ||
|
||
TargetOptions opt; | ||
+#if LLVM_VERSION_MAJOR < 12 | ||
opt.PrintMachineCode = PrintMC; | ||
+#endif | ||
|
||
bool jit = JIT; | ||
|
||
diff --git a/llvmlite/tests/test_binding.py b/llvmlite/tests/test_binding.py | ||
index 80495787..fee2372a 100644 | ||
--- a/llvmlite/tests/test_binding.py | ||
+++ b/llvmlite/tests/test_binding.py | ||
@@ -18,6 +18,16 @@ | ||
from llvmlite.tests import TestCase | ||
|
||
|
||
+def clean_string_whitespace(x: str) -> str: | ||
+ # Remove trailing whitespace from the end of each line | ||
+ x = re.sub(r"\s+$", "", x, flags=re.MULTILINE) | ||
+ # Remove intermediate blank lines | ||
+ x = re.sub(r"\n\s*\n", r"\n", x, flags=re.MULTILINE) | ||
+ # Remove extraneous whitespace from the beginning and end of the string | ||
+ x = x.strip() | ||
+ return x | ||
+ | ||
+ | ||
# arvm7l needs extra ABI symbols to link successfully | ||
if platform.machine() == 'armv7l': | ||
llvm.load_library_permanently('libgcc_s.so.1') | ||
@@ -158,7 +168,7 @@ def no_de_locale(): | ||
target triple = "unknown-unknown-unknown" | ||
target datalayout = "" | ||
|
||
-define i32 @"foo"() | ||
+define i32 @"foo"() | ||
{ | ||
"<>!*''#": | ||
ret i32 12345 | ||
@@ -424,7 +434,10 @@ def test_nonalphanum_block_name(self): | ||
bd = ir.IRBuilder(fn.append_basic_block(name="<>!*''#")) | ||
bd.ret(ir.Constant(ir.IntType(32), 12345)) | ||
asm = str(mod) | ||
- self.assertEqual(asm, asm_nonalphanum_blocklabel) | ||
+ self.assertEqual( | ||
+ clean_string_whitespace(asm), | ||
+ clean_string_whitespace(asm_nonalphanum_blocklabel) | ||
+ ) | ||
|
||
def test_global_context(self): | ||
gcontext1 = llvm.context.get_global_context() | ||
@@ -509,7 +522,7 @@ def test_set_option(self): | ||
def test_version(self): | ||
major, minor, patch = llvm.llvm_version_info | ||
# one of these can be valid | ||
- valid = [(11,)] | ||
+ valid = [(11,), (12,), (13,)] | ||
self.assertIn((major,), valid) | ||
self.assertIn(patch, range(10)) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild | ||
|
||
easyblock = 'PythonBundle' | ||
|
||
name = 'numba' | ||
version = '0.54.1' | ||
|
||
homepage = 'https://numba.pydata.org/' | ||
description = """Numba is an Open Source NumPy-aware optimizing compiler for | ||
Python sponsored by Continuum Analytics, Inc. It uses the remarkable LLVM | ||
compiler infrastructure to compile Python syntax to machine code.""" | ||
|
||
toolchain = {'name': 'foss', 'version': '2021b'} | ||
toolchainopts = {'pic': True} | ||
|
||
dependencies = [ | ||
('Python', '3.9.6'), | ||
('SciPy-bundle', '2021.10'), | ||
('LLVM', '12.0.1'), | ||
] | ||
|
||
use_pip = True | ||
sanity_pip_check = True | ||
|
||
local_llvmlite_preinstallopts = "export LLVM_CONFIG=${EBROOTLLVM}/bin/llvm-config && " | ||
local_llvmlite_preinstallopts += "export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1 && " | ||
|
||
exts_list = [ | ||
('llvmlite', '0.37.0', { | ||
'patches': ['llvmlite-0.37.0_fix-LLVM-12.patch'], | ||
'preinstallopts': "export LLVM_CONFIG=${EBROOTLLVM}/bin/llvm-config && export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1 && ", | ||
'checksums': [ | ||
'6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15', # llvmlite-0.37.0.tar.gz | ||
'bcdc530cfd087e8a9f68a73a80fe73f12c7b2adfdb51ded70cd2f4c404846298', # llvmlite-0.37.0_fix-LLVM-12.patch | ||
], | ||
}), | ||
(name, version, { | ||
'patches': ['numba-0.54.1_fix-numpy-1.21.patch'], | ||
'checksums': [ | ||
'f9dfc803c864edcc2381219b800abf366793400aea55e26d4d5b7d953e14f43f', # numba-0.54.1.tar.gz | ||
'f038e7adf0cd60f6bdde219b326aad4224fef46515799578ebbbdffa73224199', # numba-0.54.1_fix-numpy-1.21.patch | ||
], | ||
}), | ||
] | ||
|
||
fix_python_shebang_for = ['bin/*'] | ||
|
||
sanity_check_paths = { | ||
'files': ['bin/numba', 'bin/pycc'], | ||
'dirs': ['lib/python%(pyshortver)s/site-packages'], | ||
} | ||
|
||
sanity_check_commands = [ | ||
"python -m llvmlite.tests", | ||
"numba --help", | ||
] | ||
|
||
moduleclass = 'lang' |
Oops, something went wrong.