From 6a2ca49f4466bb1bdb3c58dc0fdd03df08550fb6 Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Mon, 7 Jun 2021 09:15:08 -0500
Subject: [PATCH] llvm 12, with llvmlite/numba hackery
---
ShellB3/shallbethree.sh | 29 ++++++++++++++++++-
ShellB3/src/optional/clang-11.1.0.src.tar.xz | 3 --
ShellB3/src/optional/clang-12.0.0.src.tar.xz | 3 ++
.../optional/compiler-rt-11.1.0.src.tar.xz | 3 --
.../optional/compiler-rt-12.0.0.src.tar.xz | 3 ++
ShellB3/src/optional/libcxx-11.1.0.src.tar.xz | 3 --
ShellB3/src/optional/libcxx-12.0.0.src.tar.xz | 3 ++
.../src/optional/libcxxabi-11.1.0.src.tar.xz | 3 --
.../src/optional/libcxxabi-12.0.0.src.tar.xz | 3 ++
ShellB3/src/optional/lld-11.1.0.src.tar.xz | 3 --
ShellB3/src/optional/lld-12.0.0.src.tar.xz | 3 ++
ShellB3/src/optional/llvm-11.1.0.src.tar.xz | 3 --
ShellB3/src/optional/llvm-12.0.0.src.tar.xz | 3 ++
ShellB3/src/optional/numba-0.53.0.tar.gz | 3 --
ShellB3/src/optional/numba-0.53.1.tar.gz | 3 ++
ShellB3/src/optional/numba-scipy-0.2.0.tar.gz | 3 --
ShellB3/src/optional/numba-scipy-0.3.0.tar.gz | 3 ++
ShellB3/src/optional/openmp-11.1.0.src.tar.xz | 3 --
ShellB3/src/optional/openmp-12.0.0.src.tar.xz | 3 ++
ShellB3/src/optional/polly-11.1.0.src.tar.xz | 3 --
ShellB3/src/optional/polly-12.0.0.src.tar.xz | 3 ++
21 files changed, 58 insertions(+), 31 deletions(-)
delete mode 100644 ShellB3/src/optional/clang-11.1.0.src.tar.xz
create mode 100644 ShellB3/src/optional/clang-12.0.0.src.tar.xz
delete mode 100644 ShellB3/src/optional/compiler-rt-11.1.0.src.tar.xz
create mode 100644 ShellB3/src/optional/compiler-rt-12.0.0.src.tar.xz
delete mode 100644 ShellB3/src/optional/libcxx-11.1.0.src.tar.xz
create mode 100644 ShellB3/src/optional/libcxx-12.0.0.src.tar.xz
delete mode 100644 ShellB3/src/optional/libcxxabi-11.1.0.src.tar.xz
create mode 100644 ShellB3/src/optional/libcxxabi-12.0.0.src.tar.xz
delete mode 100644 ShellB3/src/optional/lld-11.1.0.src.tar.xz
create mode 100644 ShellB3/src/optional/lld-12.0.0.src.tar.xz
delete mode 100644 ShellB3/src/optional/llvm-11.1.0.src.tar.xz
create mode 100644 ShellB3/src/optional/llvm-12.0.0.src.tar.xz
delete mode 100644 ShellB3/src/optional/numba-0.53.0.tar.gz
create mode 100644 ShellB3/src/optional/numba-0.53.1.tar.gz
delete mode 100644 ShellB3/src/optional/numba-scipy-0.2.0.tar.gz
create mode 100644 ShellB3/src/optional/numba-scipy-0.3.0.tar.gz
delete mode 100644 ShellB3/src/optional/openmp-11.1.0.src.tar.xz
create mode 100644 ShellB3/src/optional/openmp-12.0.0.src.tar.xz
delete mode 100644 ShellB3/src/optional/polly-11.1.0.src.tar.xz
create mode 100644 ShellB3/src/optional/polly-12.0.0.src.tar.xz
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index dd64c2fb..86a4f33c 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -1195,12 +1195,14 @@ export FLANGLLVMREF=cafe946
export LLVMVER=10.0.1
#11
export LLVMVER=11.1.0
+#11
+export LLVMVER=12.0.0
export LLVMSIMPLEVER=$( python -c "import sys; print('.'.join(sys.argv[1].split('.')[:2]))" ${LLVMVER} )
export LLVMLITEVER=0.36.0
#export LLVMLITEREF=499a6ab
-export NUMBAVER=0.53.0
+export NUMBAVER=0.53.1
#export NUMBAREF=b44b5e6
export POCLVER=1.7
export REQUESTSVER=2.25.1
@@ -9793,6 +9795,18 @@ mk_llvmlite() {
API_EXPORT(LLVMPassManagerBuilderRef)
+--- ffi/targets.cpp 2020-12-15 10:24:19.000000000 -0600
++++ ffi/targets.cpp 2021-06-07 11:47:30.000000000 -0500
+@@ -232,7 +232,9 @@
+ rm = Reloc::DynamicNoPIC;
+
+ TargetOptions opt;
++#if 0
+ opt.PrintMachineCode = PrintMC;
++#endif
+
+ bool jit = JIT;
+
PATCH
make_script llvmlite <<SCRIPT
@@ -11794,6 +11808,19 @@ SCRIPT
else
simple_py_install src/optional/numba-${NUMBAVER}.tar.gz || oops "numba build failed"
fi
+ make_patch numba <<PATCH
+--- setup.py 2021-04-22 10:05:45.000000000 -0500
++++ setup.py 2021-06-07 11:58:14.000000000 -0500
+@@ -2,7 +2,7 @@
+ import versioneer
+
+
+-_install_requires = ['scipy>=0.16,<=1.6.2', 'numba>=0.45']
++_install_requires = ['scipy>=0.16,<=1.6.3', 'numba>=0.45']
+
+
+ metadata = dict(
+PATCH
simple_py_install src/optional/numba-scipy-*.tar.gz || oops "numba-scipy build failed"
}
diff --git a/ShellB3/src/optional/clang-11.1.0.src.tar.xz b/ShellB3/src/optional/clang-11.1.0.src.tar.xz
deleted file mode 100644
index 283271f7..00000000
--- a/ShellB3/src/optional/clang-11.1.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b
-size 14850272
diff --git a/ShellB3/src/optional/clang-12.0.0.src.tar.xz b/ShellB3/src/optional/clang-12.0.0.src.tar.xz
new file mode 100644
index 00000000..2a050a97
--- /dev/null
+++ b/ShellB3/src/optional/clang-12.0.0.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e26e452e91d4542da3ebbf404f024d3e1cbf103f4cd110c26bf0a19621cca9ed
+size 15321640
diff --git a/ShellB3/src/optional/compiler-rt-11.1.0.src.tar.xz b/ShellB3/src/optional/compiler-rt-11.1.0.src.tar.xz
deleted file mode 100644
index 22bdba7f..00000000
--- a/ShellB3/src/optional/compiler-rt-11.1.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274
-size 2135988
diff --git a/ShellB3/src/optional/compiler-rt-12.0.0.src.tar.xz b/ShellB3/src/optional/compiler-rt-12.0.0.src.tar.xz
new file mode 100644
index 00000000..d89a1e9f
--- /dev/null
+++ b/ShellB3/src/optional/compiler-rt-12.0.0.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85a8cd0a62413eaa0457d8d02f8edac38c4dc0c96c00b09dc550260c23268434
+size 2201104
diff --git a/ShellB3/src/optional/libcxx-11.1.0.src.tar.xz b/ShellB3/src/optional/libcxx-11.1.0.src.tar.xz
deleted file mode 100644
index 97f49652..00000000
--- a/ShellB3/src/optional/libcxx-11.1.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb233d250ed7eaa05c73eaf81ef0f9ee3fac9d8fc0c3d38a7a7383f82ed6f8e5
-size 1871804
diff --git a/ShellB3/src/optional/libcxx-12.0.0.src.tar.xz b/ShellB3/src/optional/libcxx-12.0.0.src.tar.xz
new file mode 100644
index 00000000..0516098a
--- /dev/null
+++ b/ShellB3/src/optional/libcxx-12.0.0.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7dcb75ca4f6aae2c677d128460c48a57398c8b6791b77b74bea7cf9e04e7c3f1
+size 1880864
diff --git a/ShellB3/src/optional/libcxxabi-11.1.0.src.tar.xz b/ShellB3/src/optional/libcxxabi-11.1.0.src.tar.xz
deleted file mode 100644
index c9963b06..00000000
--- a/ShellB3/src/optional/libcxxabi-11.1.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:143193ed80f8fa4d85211d6704a90789fb36aa65b69fd0c382a9f05ec370ecab
-size 553032
diff --git a/ShellB3/src/optional/libcxxabi-12.0.0.src.tar.xz b/ShellB3/src/optional/libcxxabi-12.0.0.src.tar.xz
new file mode 100644
index 00000000..f65254c1
--- /dev/null
+++ b/ShellB3/src/optional/libcxxabi-12.0.0.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ab8e8cd148a7d5103067e05c36e36ef36e27634fc8e73b5712853c9affe75b1
+size 552940
diff --git a/ShellB3/src/optional/lld-11.1.0.src.tar.xz b/ShellB3/src/optional/lld-11.1.0.src.tar.xz
deleted file mode 100644
index 894fe046..00000000
--- a/ShellB3/src/optional/lld-11.1.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce
-size 1237068
diff --git a/ShellB3/src/optional/lld-12.0.0.src.tar.xz b/ShellB3/src/optional/lld-12.0.0.src.tar.xz
new file mode 100644
index 00000000..544e2916
--- /dev/null
+++ b/ShellB3/src/optional/lld-12.0.0.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cb7d497f3ce33ce8a2c50ad26ec93a8c45f57268d4d96953cd0f25566f753fd
+size 1351536
diff --git a/ShellB3/src/optional/llvm-11.1.0.src.tar.xz b/ShellB3/src/optional/llvm-11.1.0.src.tar.xz
deleted file mode 100644
index ffabbf86..00000000
--- a/ShellB3/src/optional/llvm-11.1.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5
-size 38915280
diff --git a/ShellB3/src/optional/llvm-12.0.0.src.tar.xz b/ShellB3/src/optional/llvm-12.0.0.src.tar.xz
new file mode 100644
index 00000000..9b56fbb7
--- /dev/null
+++ b/ShellB3/src/optional/llvm-12.0.0.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49dc47c8697a1a0abd4ee51629a696d7bfe803662f2a7252a3b16fc75f3a8b50
+size 42876732
diff --git a/ShellB3/src/optional/numba-0.53.0.tar.gz b/ShellB3/src/optional/numba-0.53.0.tar.gz
deleted file mode 100644
index 25dd0085..00000000
--- a/ShellB3/src/optional/numba-0.53.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55c11d7edbba2ba715f2b56f5294cad55cfd87bff98e2627c3047c2d5cc52d16
-size 2212284
diff --git a/ShellB3/src/optional/numba-0.53.1.tar.gz b/ShellB3/src/optional/numba-0.53.1.tar.gz
new file mode 100644
index 00000000..7b1c4aa9
--- /dev/null
+++ b/ShellB3/src/optional/numba-0.53.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cd4e5216acdc66c4e9dab2dfd22ddb5bef151185c070d4a3cd8e78638aff5b0
+size 2213956
diff --git a/ShellB3/src/optional/numba-scipy-0.2.0.tar.gz b/ShellB3/src/optional/numba-scipy-0.2.0.tar.gz
deleted file mode 100644
index d5fbe8a9..00000000
--- a/ShellB3/src/optional/numba-scipy-0.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b22c5e2e273b4dc82b27a810238ad95688abd1adb01fb32568f5c319db6a87e
-size 40062
diff --git a/ShellB3/src/optional/numba-scipy-0.3.0.tar.gz b/ShellB3/src/optional/numba-scipy-0.3.0.tar.gz
new file mode 100644
index 00000000..a69a837d
--- /dev/null
+++ b/ShellB3/src/optional/numba-scipy-0.3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a897a85a21b52ddb4507d70c13577cc55682d015c60c91188c2384747bd29264
+size 22242
diff --git a/ShellB3/src/optional/openmp-11.1.0.src.tar.xz b/ShellB3/src/optional/openmp-11.1.0.src.tar.xz
deleted file mode 100644
index 6970e402..00000000
--- a/ShellB3/src/optional/openmp-11.1.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e
-size 971628
diff --git a/ShellB3/src/optional/openmp-12.0.0.src.tar.xz b/ShellB3/src/optional/openmp-12.0.0.src.tar.xz
new file mode 100644
index 00000000..69000dbb
--- /dev/null
+++ b/ShellB3/src/optional/openmp-12.0.0.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb1b7022a247332114985ed155a8fb632c28ce7c35a476e2c0caf865150f167d
+size 1081412
diff --git a/ShellB3/src/optional/polly-11.1.0.src.tar.xz b/ShellB3/src/optional/polly-11.1.0.src.tar.xz
deleted file mode 100644
index b482556a..00000000
--- a/ShellB3/src/optional/polly-11.1.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:580fd3b0b9e1247c3e40afa3067ac5bea70e9815750c5bd448fb7428e310390c
-size 9030252
diff --git a/ShellB3/src/optional/polly-12.0.0.src.tar.xz b/ShellB3/src/optional/polly-12.0.0.src.tar.xz
new file mode 100644
index 00000000..227e764b
--- /dev/null
+++ b/ShellB3/src/optional/polly-12.0.0.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d9afc76b262f89d0fc6cb4f155ad25be5bf0554d14f96208ec81a51a44fb4c7
+size 9034596
--
GitLab