From 2d314c4e6f287830485779178690b89c61223b26 Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Wed, 17 Mar 2021 15:46:36 +0000
Subject: [PATCH] numba as part of lidar trim; use regular make for openblas on
linux for now
---
ShellB3/shallbethree.sh | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index a0fb7836..ac0c02a7 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -4005,8 +4005,8 @@ __make_openblas(){
echo "building OpenBLAS..." 1>&2
(cd build/OpenBLAS-${OPENBLASVER} \
- && FFLAGS="$FFLAGS -L${SYSROOT}/usr/lib/system" make NO_STATIC=1 "$@" \
- && MAKEFLAGS="" make PREFIX="${BASE}" NO_STATIC=1 "$@" install ) || oops "OpenBLAS build failed"
+ && FFLAGS="$FFLAGS -L${SYSROOT}/usr/lib/system" NO_STATIC=1 make NO_STATIC=1 "$@" \
+ && MAKEFLAGS="" NO_STATIC=1 make PREFIX="${BASE}" NO_STATIC=1 "$@" install ) || oops "OpenBLAS build failed"
}
mk_openblas() {
@@ -4092,7 +4092,14 @@ SCRIPT
fi
fi
- if isDarwin && isARM ; then #can't use cmake yet. doesn't have good results
+ MAKEONLYOPENBLAS=NO
+ if isDarwin && isARM ; then
+ MAKEONLYOPENBLAS=YES #doesn't work. dynamic is broken
+ elif isLinux ; then
+ MAKEONLYOPENBLAS=YES #cmake currently makes code 100x slower
+ fi
+
+ if isTrue "${MAKEONLYOPENBLAS}" ; then #can't use cmake
COMPL=""
if isDarwin && check_clang_min_version 12 12 Apple ; then
@@ -5954,6 +5961,9 @@ mk_binutils() {
mv *linux-gnu/lib/* lib/
rm -rf *linux-gnu
+ if [ -e sysbin/ranlib ] ; then
+ ln -s ../sysbin/ranlib bin
+ fi
_check_build_env LD
@@ -9579,8 +9589,8 @@ mk_softopencl() {
&& echo pocl >>trim
}
-mk_hpc() {
- # HPC trim. Requires GCC 5.1+, includes llvm, numba, MPI (64bit only), pyopencl and parakeet
+mk_numbadeps() {
+ # numba trim. Requires GCC 5.1+, includes llvm, numba
resume_tracker && return 0
check_gcc_min_version 5.1 || oops "GCC is too old to build hpc features. consider installing a newer one, or running mk_gcc7. NOTE: you should do this before pretty much anything."
@@ -9593,7 +9603,18 @@ mk_hpc() {
&& mk_numa \
&& mk_hwloc \
&& mk_openmpi \
- && mk_numba \
+ && mk_numba
+}
+
+mk_hpc() {
+ # HPC trim. Requires GCC 5.1+, includes llvm, numba, MPI (64bit only), pyopencl and parakeet
+ resume_tracker && return 0
+
+ check_gcc_min_version 5.1 || oops "GCC is too old to build hpc features. consider installing a newer one, or running mk_gcc7. NOTE: you should do this before pretty much anything."
+
+ cleanup
+
+ mk_numbadeps \
&& mk_dsltools \
&& mk_meta \
&& mk_mpi4py \
@@ -11943,7 +11964,8 @@ _mk_lidar() {
&& mk_nccmp \
&& mk_ssec_all \
&& mk_pytest \
- && mk_pyramid
+ && mk_pyramid \
+ && mk_numbadeps
}
mk_lidar() {
--
GitLab