Merge pull request #13102 from iyamazaki/amesos-css

Amesos : add MKL Cluster Sparse Solver interface
trilinos · Jul 1, 2024 · a21f061 · a21f061
2 parents bd7c4f7 + 462eb6f
commit a21f061
Show file tree

Hide file tree

Showing 10 changed files with 1,239 additions and 425 deletions.
diff --git a/packages/amesos/CMakeLists.txt b/packages/amesos/CMakeLists.txt
@@ -35,6 +35,15 @@ IF(NOT TPL_ENABLE_MPI)
 ENDIF()
 ENDIF()
 
+# if using CSC, must be parallel and needs Pardiso_MKL
+IF (${PACKAGE_NAME}_ENABLE_CSS_MKL)
+  IF (NOT TPL_ENABLE_MPI)
+    MESSAGE(WARNING "*****Amesos_ENABLE_CSS_MKL requires MPI. Turning off CSS_MKL. *****")
+    SET(AMESOS_ENABLE_CSS_MKL OFF)
+    SET(HAVE_AMESOS_CSS_MKL OFF)
+  ENDIF()
+ENDIF()
+
 # if using parallel MUMPS, must also link in scalapack and BLACS
 
 IF(${PACKAGE_NAME}_ENABLE_MUMPS AND ${PACKAGE_NAME}_ENABLE_MPI AND NOT ${PACKAGE_NAME}_ENABLE_SCALAPACK)

diff --git a/packages/amesos/cmake/Amesos_config.h.in b/packages/amesos/cmake/Amesos_config.h.in
@@ -6,6 +6,9 @@
 /* Using pre July 2005 Superlu */
 #cmakedefine AMESOS_SUPERLU_PRE_JULY2005
 
+/* Define if want to build amesos-cssmkl */
+#cmakedefine HAVE_AMESOS_CSS_MKL
+
 /* Define if want to build amesos-dscpack */
 #cmakedefine HAVE_AMESOS_DSCPACK
 

diff --git a/packages/amesos/cmake/Dependencies.cmake b/packages/amesos/cmake/Dependencies.cmake
@@ -3,6 +3,6 @@ SET(LIB_OPTIONAL_DEP_PACKAGES EpetraExt)
 SET(TEST_REQUIRED_DEP_PACKAGES)
 SET(TEST_OPTIONAL_DEP_PACKAGES Triutils Galeri)
 SET(LIB_REQUIRED_DEP_TPLS)
-SET(LIB_OPTIONAL_DEP_TPLS SuperLUDist ParMETIS UMFPACK SuperLU BLACS SCALAPACK MUMPS TAUCS PARDISO_MKL PARDISO CSparse)
+SET(LIB_OPTIONAL_DEP_TPLS SuperLUDist ParMETIS UMFPACK SuperLU BLACS SCALAPACK MUMPS TAUCS CSS_MKL PARDISO_MKL PARDISO CSparse)
 SET(TEST_REQUIRED_DEP_TPLS)
 SET(TEST_OPTIONAL_DEP_TPLS)
diff --git a/packages/amesos/src/Amesos.cpp b/packages/amesos/src/Amesos.cpp
@@ -56,6 +56,9 @@
 #ifdef HAVE_AMESOS_TAUCS
 #include "Amesos_Taucs.h"
 #endif
+#ifdef HAVE_AMESOS_CSS_MKL
+#include "Amesos_CssMKL.h"
+#endif
 #ifdef HAVE_AMESOS_PARAKLETE
 #include "Amesos_Paraklete.h"
 #endif
@@ -158,6 +161,15 @@ Amesos_BaseSolver* Amesos::Create(const std::string CT,
 #endif
   } 
 
+  if (CT == "Amesos_CssMKL") {
+#ifdef HAVE_AMESOS_CSS_MKL
+    return new Amesos_CssMKL(LinearProblem);
+#else
+    if (verbose) std::cerr << "Amesos_CssMKL is not implemented" << std::endl ;
+    return(0);
+#endif
+  }
+
   if ((CT == "Amesos_Paraklete") || (CT == "Paraklete")) { 
 #ifdef HAVE_AMESOS_PARAKLETE
     return new Amesos_Paraklete(LinearProblem);