Changeset 26885

Timestamp:

02/13/22 09:29:06 (3 years ago)

Author:

jdquinn

Message:

CHG: Test support for MPLAPACK

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (9 diffs)
• jenkins/ross-debian_linux-full-mplapack (added)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (3 diffs)
• src/c/cores/love_core.cpp (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -295 +295 @@
 
         if [[ ${MINGW} -eq 1 ]]; then
-                path_append "${BLAS_ROOT}/lib" # Allows dynamic loaded to find DLLs
+                path_append "${BLAS_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
 fi
@@ -306 +306 @@
 
         if [[ ${MINGW} -eq 1 ]]; then
-                path_append "${LAPACK_ROOT}/lib" # Allows dynamic loaded to find DLLs
+                path_append "${LAPACK_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
 fi
@@ -317 +317 @@
 
         if [[ ${MINGW} -eq 1 ]]; then
-                path_append "${METIS_ROOT}/lib" # Allows dynamic loaded to find DLLs
+                path_append "${METIS_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
 fi
@@ -327 +327 @@
 
         if [[ ${MINGW} -eq 1 ]]; then
-                path_append "${MUMPS_ROOT}/lib" # Allows dynamic loaded to find DLLs
+                path_append "${MUMPS_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
 fi
@@ -338 +338 @@
 
         if [[ ${MINGW} -eq 1 ]]; then
-                path_append "${PARMETIS_ROOT}/lib" # Allows dynamic loaded to find DLLs
+                path_append "${PARMETIS_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
 fi
@@ -348 +348 @@
 
         if [[ ${MINGW} -eq 1 ]]; then
-                path_append "${SCALAPACK_ROOT}/lib" # Allows dynamic loaded to find DLLs
+                path_append "${SCALAPACK_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
 fi
@@ -365 +365 @@
 
         if [[ ${MINGW} -eq 1 ]]; then
-                path_append "${PETSC_ROOT}/lib" # Allows dynamic loaded to find DLLs
+                path_append "${PETSC_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
 
@@ -413 +413 @@
 fi
 
+MPLAPACK_ROOT="${ISSM_EXT_DIR}/mplapack/install"
+if [ -d "${MPLAPACK_ROOT}" ]; then
+        cplus_include_path_prepend "${MPLAPACK_ROOT}/include"
+        cplus_include_path_prepend "${MPLAPACK_ROOT}/include/mplapack"
+        library_path_prepend "${MPLAPACK_ROOT}/lib"
+        ld_library_path_prepend "${MPLAPACK_ROOT}/lib"
+fi
+
 SCOTCH_ROOT="${ISSM_EXT_DIR}/scotch/install"
 ld_library_path_append "${SCOTCH_ROOT}/lib"
@@ -550 +558 @@
 
         if [[ ${MINGW} -eq 1 ]]; then
-                path_append "${TRIANGLE_ROOT}/lib" # Allows dynamic loaded to find DLLs
+                path_append "${TRIANGLE_ROOT}/lib" # Allows dynamic loader to find DLLs
         fi
 fi

issm/trunk-jpl/m4/issm_options.m4

@@ -1976 +1976 @@
         AC_MSG_RESULT([${HAVE_PLAPACK}])
         dnl }}}
+        dnl MPLAPACK{{{
+        AC_MSG_CHECKING([for MPLAPACK])
+        AC_ARG_WITH(
+                [mplapack-dir],
+                AS_HELP_STRING([--with-mplapack-dir=DIR], [MPLAPACK root directory]),
+                [MPLAPACK_ROOT=${withval}],
+                [MPLAPACK_ROOT="no"]
+        )
+        if test "x${MPLAPACK_ROOT}" == "xno"; then
+                HAVE_MPLAPACK=no
+        else
+                HAVE_MPLAPACK=yes
+                if ! test -d "${MPLAPACK_ROOT}"; then
+                        AC_MSG_ERROR([MPLAPACK directory provided (${MPLAPACK_ROOT}) does not exist!]);
+                fi
+        fi
+        AC_MSG_RESULT([${HAVE_MPLAPACK}])
+
+        dnl MPLAPACK libraries and header files
+        if test "x${HAVE_MPLAPACK}" == "xyes"; then
+                MPLAPACKINCL="-I${MPLAPACK_ROOT}/include/mplapack -I${MPLAPACK_ROOT}/include"
+                MPLAPACKLIB="-L${MPLAPACK_ROOT}/lib -lmpblas__Float128 -lmplapack__Float128 -lgomp -lquadmath"
+                AC_DEFINE([_HAVE_MPLAPACK_], [1], [with MPLAPACK in ISSM src])
+                AC_SUBST([MPLAPACKINCL])
+                AC_SUBST([MPLAPACKLIB])
+        fi
+        AM_CONDITIONAL([MPLAPACK], [test "x${HAVE_MPLAPACK}" == "xyes"])
+        dnl }}}
         dnl MUMPS{{{
         AC_MSG_CHECKING([for MUMPS])

issm/trunk-jpl/src/c/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @TRIANGLEINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @PARMETISINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJINCL@ @ESMFINCL@ @PROJINCL@
+AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @TRIANGLEINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @PARMETISINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJINCL@ @ESMFINCL@ @PROJINCL@ @MPLAPACKINCL@
 AM_FCFLAGS = @SEMICINCL@
 
@@ -715 +715 @@
 if !WINDOWS
 if !STANDALONE_LIBRARIES
-libISSMCore_la_LIBADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(OSLIBS)
+libISSMCore_la_LIBADD = $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACK) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(ADJOINTMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(OSLIBS)
 if FORTRAN
 libISSMCore_la_LIBADD += $(FLIBS) $(FORTRANLIB)
@@ -831 +831 @@
 
 # External packages
-LDADD += $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(NEOPZLIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(ESMFLIB) $(OSLIBS)
+LDADD += $(CHACOLIB) $(DAKOTALIB) $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(NEOPZLIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MPLAPACK) $(SUPERLULIB) $(SPOOLESLIB) $(BLACSLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(SCOTCHLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(ESMFLIB) $(OSLIBS)
 
 if FORTRAN

issm/trunk-jpl/src/c/cores/love_core.cpp

@@ -10 +10 @@
 #include "../solutionsequences/solutionsequences.h"
 #include "petscblaslapack.h"
+#ifdef _HAVE_MPLAPACK_
+#include <quadmath.h>
+#include "mpblas__Float128.h"
+#include "mplapack__Float128.h"
+#endif
+
+#ifdef _HAVE_MPLAPACK_
+_Float128 a = 0.2345234534512079875620048770134538q;
+#endif
 
 /*local definitions:*/