Changeset 26910

Timestamp:

03/01/22 11:27:06 (3 years ago)

Author:

jdquinn

Message:

CHG: Support for MPLAPACK; clean up

Location:

issm/trunk-jpl

Files:

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

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

@@ -16 +16 @@
 ## Constants
 #
-VER="0.9.3"
+VER="1.0.1"
 
 PREFIX="${ISSM_DIR}/externalpackages/mplapack/install" # Set to location where external package should be installed
@@ -43 +43 @@
 # Configure
 cd src
-pushd mplapack/debug
+pushd mplapack/test/compare
 bash gen.Makefile.am.sh
 popd
-autoreconf -ivf
+autoreconf --force --install
+aclocal
+autoconf
+automake --add-missing
+autoreconf --force --install
 ./configure \
         --prefix="${PREFIX}" \
@@ -52 +56 @@
         --enable-fast-install=yes \
         --disable-dependency-tracking \
-        --enable-debug=yes \
         --enable-fortranwrapper=yes \
         --enable-gmp=yes \
@@ -60 +63 @@
         --enable-double=yes \
         --enable-_Float128=yes \
-        --enable-_Float64x=yes \
-        --with-external-blas="-L${BLAS_ROOT}/lib -lfblas" \
-        --with-external-lapack="-L${LAPACK_ROOT}/lib -lflapack"
+        --enable-_Float64x=yes
 
 # Compile and install

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

@@ -18 +18 @@
         --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
         --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
-        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
+        --with-mpi-include="${ISSM_DIR}/externalpackages/petsc/install/include" \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
-        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
-        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
-        --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
-        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
-        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
-        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
-        --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
-        --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
+        --with-blas-lapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-parmetis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-scalapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-hdf5-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-gsl-dir="${ISSM_DIR}/externalpackages/gsl/install" \
+        --with-boost-dir="${ISSM_DIR}/externalpackages/boost/install" \
+        --with-dakota-dir="${ISSM_DIR}/externalpackages/dakota/install" \
+        --with-proj-dir="${ISSM_DIR}/externalpackages/proj/install" \
+        --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install" \
+        --with-chaco-dir="${ISSM_DIR}/externalpackages/chaco/install" \
+        --with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" \
+        --with-semic-dir="${ISSM_DIR}/externalpackages/semic/install" \
 '
 

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

@@ -28 +28 @@
         --with-hdf5-dir="${ISSM_DIR}/externalpackages/petsc/install" \
         --with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+        --with-mplapack-dir="${ISSM_DIR}/externalpackages/mplapack/install" \
         --with-gsl-dir="${ISSM_DIR}/externalpackages/gsl/install" \
         --with-boost-dir="${ISSM_DIR}/externalpackages/boost/install" \
@@ -46 +47 @@
         cmake           install.sh
         petsc           install-3.12-linux.sh
+        mplapack        install-1-linux.sh
         gsl                     install.sh
         boost           install-1.7-linux.sh