Move static toast build to package options

hpc4cmb · Jul 16, 2021 · 08e017d · 08e017d
1 parent 205bee3
commit 08e017d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/configs/cori-gcc-gpu.pkgs b/configs/cori-gcc-gpu.pkgs
@@ -109,4 +109,4 @@ pysm
 #pympit
 #
 # Install TOAST.
-#toast
+toast:static=yes
diff --git a/configs/cori-gcc.pkgs b/configs/cori-gcc.pkgs
@@ -110,4 +110,4 @@ pysm
 pympit
 #
 # Install TOAST.
-toast
+toast:static=yes
diff --git a/pkgs/toast.sh b/pkgs/toast.sh
@@ -23,22 +23,25 @@ fftw=""
 ssparse=""
 blas=""
 lapack=""
+static=""
 
-staticflag=""
 mklflag=""
 if [ "x@MKL@" != "x" ]; then
     blas="@MKL@/lib/intel64/libmkl_rt.so"
     lapack="@MKL@/lib/intel64/libmkl_rt.so"
 else
     mklflag="-DMKL_DISABLED:BOOL=ON"
-    staticflag="-DTOAST_STATIC_DEPS:BOOL=ON"
 fi
 
 for opt in $pkgopts; do
     chkfftw=$(echo $opt | sed -e "s/fftw=\(.*\)/\1/")
     if [ "x$chkfftw" != "x$opt" ]; then
         fftw="${chkfftw}"
     fi
+    chkstatic=$(echo $opt | sed -e "s/static=\(.*\)/\1/")
+    if [ "x$chkstatic" != "x$opt" ]; then
+        static="${chkstatic}"
+    fi
     chksparse=$(echo $opt | sed -e "s/suitesparse=\(.*\)/\1/")
     if [ "x$chksparse" != "x$opt" ]; then
         ssparse="${chksparse}"
@@ -53,6 +56,11 @@ for opt in $pkgopts; do
     fi
 done
 
+staticflag=""
+if [ "x$static" != "x" ]; then
+    staticflag="-DTOAST_STATIC_DEPS:BOOL=ON"
+fi
+
 fftw_root=""
 if [ "x$fftw" != "x" ]; then
     fftw_root="-DFFTW_ROOT=$fftw"