Changeset 27162

Timestamp:

07/22/22 15:21:54 (3 years ago)

Author:

jdquinn

Message:

CHG: Support for latest version of MPLAPACK; set BLAS_ROOT if user has external copy of LAPACK that installs libblas

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/mplapack/install-1-linux.sh (modified) (1 diff)
• externalpackages/mplapack/install-2-linux.sh (copied) (copied from issm/trunk-jpl/externalpackages/mplapack/install-1-linux.sh ) (2 diffs)
• jenkins/ross-debian_linux-full-mplapack (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -317 +317 @@
                 path_append "${LAPACK_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
+
+        if ls ${LAPACK_ROOT}/lib/libblas.* 1> /dev/null 2>&1; then
+                export BLAS_ROOT="${LAPACK_ROOT}"
+        fi
 fi
 

issm/trunk-jpl/externalpackages/mplapack/install-1-linux.sh

@@ -56 +56 @@
         --enable-fast-install=yes \
         --disable-dependency-tracking \
+        --enable-optimization=yes \
         --enable-fortranwrapper=yes \
         --enable-gmp=yes \

issm/trunk-jpl/externalpackages/mplapack/install-2-linux.sh

@@ -16 +16 @@
 ## Constants
 #
-VER="1.0.1"
+VER="2.0"
 
 PREFIX="${ISSM_DIR}/externalpackages/mplapack/install" # Set to location where external package should be installed
@@ -56 +56 @@
         --enable-fast-install=yes \
         --disable-dependency-tracking \
+        --enable-optimization=yes \
         --enable-fortranwrapper=yes \
         --enable-gmp=yes \

issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack

@@ -47 +47 @@
         cmake           install.sh
         petsc           install-3.12-linux.sh
-        mplapack        install-1-linux.sh
+        mplapack        install-2-linux.sh
         gsl                     install.sh
         boost           install-1.7-linux.sh