Merge Pull Request trilinos#11739 from bartlettroscoe/Trilinos/11730-tril-lin-solv-proto-1

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Changes to Trilinos for new external TrilinosLinearSolvers package (trilinos#11730)
PR Author: bartlettroscoe

Author: trilinos-autotester

.gitdist.default

@@ -9,6 +9,7 @@ packages/xSDKTrilinos
 packages/framework/GenConfig
 packages/framework/son-ini-files
 packages/framework/srn-ini-files
+packages/trilinos_linear_solvers
 TriBITS
 TriBITS/TriBITSDoc
 run_trilinos_pr_builds

.gitignore

@@ -32,6 +32,7 @@ doxygen_objdb_*.tmp
 /packages/moocho/
 /packages/optika/
 /packages/xSDKTrilinos/
+/packages/trilinos_linear_solvers/
 
 # Ignore local gitdist config file (.gitdis.default is in git repo)
 /.gitdist

PackagesList.cmake

@@ -122,6 +122,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
   NOX                   packages/nox                      PT
   Moertel               packages/moertel                  ST
   MueLu                 packages/muelu                    PT
+  TrilinosLinearSolvers packages/trilinos_linear_solvers  PT
   Zoltan2Sphynx         packages/zoltan2/sphynx           PT
   Zoltan2               packages/zoltan2                  PT
   ShyLU_DD              packages/shylu/shylu_dd           PT
@@ -174,6 +175,7 @@ TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(WebTrilinos)
 TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(xSDKTrilinos)
 TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(SGM)
 TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(UMR)
+TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(TrilinosLinearSolvers)
 
 # TRILFRAME-500
 TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(Rythmos)    # 27115 targets

packages/ifpack2/adapters/thyra/Thyra_Ifpack2PreconditionerFactory_def.hpp

@@ -392,7 +392,17 @@ Ifpack2PreconditionerFactory<MatrixType>::getValidParameters() const
 template <typename MatrixType>
 std::string Ifpack2PreconditionerFactory<MatrixType>::description() const
 {
-  return "Thyra::Ifpack2PreconditionerFactory";
+  std::ostringstream oss;
+  oss << "Thyra::Ifpack2PreconditionerFactory";
+  oss << "{";
+  std::string *precTypePtr = nullptr;
+  if (nonnull(paramList_) &&
+    (precTypePtr = Teuchos::getParameterPtr<std::string>(*paramList_, "Prec Type")) )
+  {
+    oss << "\"Prec Type\" = \"" << *precTypePtr << "\"";
+  }
+  oss << "}";
+  return oss.str();
 }
 
 

packages/intrepid2/doc/.gitignore

@@ -0,0 +1,2 @@
+/html/
+/latex/

packages/muelu/adapters/stratimikos/Xpetra_ThyraLinearOp.hpp

@@ -60,9 +60,6 @@
 #include <Teuchos_AbstractFactoryStd.hpp>
 #include <Stratimikos_LinearSolverBuilder.hpp>
 #include <Thyra_MueLuPreconditionerFactory.hpp>
-# ifdef HAVE_MUELU_IFPACK2
-# include <Thyra_Ifpack2PreconditionerFactory.hpp>
-# endif
 
 
 namespace MueLu {
@@ -157,11 +154,6 @@ namespace MueLu {
       typedef Thyra::PreconditionerFactoryBase<Scalar>                                     Base;
       typedef Thyra::MueLuPreconditionerFactory<Scalar, LocalOrdinal, GlobalOrdinal, Node> ImplMueLu;
       linearSolverBuilder.setPreconditioningStrategyFactory(Teuchos::abstractFactoryStd<Base, ImplMueLu>(), "MueLu");
-#ifdef HAVE_MUELU_IFPACK2
-      // Register Ifpack2 as a Stratimikos preconditioner strategy.
-      typedef Thyra::Ifpack2PreconditionerFactory<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > Impl;
-      linearSolverBuilder.setPreconditioningStrategyFactory(Teuchos::abstractFactoryStd<Base, Impl>(), "Ifpack2");
-#endif
 
       linearSolverBuilder.setParameterList(params);
 

packages/muelu/example/basic/Stratimikos.cpp

@@ -82,11 +82,6 @@ The source code is not MueLu specific and can be used with any Stratimikos strat
 // Galeri includes
 #include <Galeri_XpetraParameters.hpp>
 
-// Ifpack2 includes
-#ifdef HAVE_MUELU_IFPACK2
-#include <Thyra_Ifpack2PreconditionerFactory.hpp>
-#endif
-
 
 template<typename Scalar,class LocalOrdinal,class GlobalOrdinal,class Node>
 int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib lib, int argc, char *argv[]) {
@@ -196,12 +191,6 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib lib, int arg
     Stratimikos::LinearSolverBuilder<Scalar> linearSolverBuilder;
     // Register MueLu as a Stratimikos preconditioner strategy.
     Stratimikos::enableMueLu<Scalar,LocalOrdinal,GlobalOrdinal,Node>(linearSolverBuilder);
-#ifdef HAVE_MUELU_IFPACK2
-    // Register Ifpack2 as a Stratimikos preconditioner strategy.
-    typedef Thyra::PreconditionerFactoryBase<Scalar> Base;
-    typedef Thyra::Ifpack2PreconditionerFactory<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > Impl;
-    linearSolverBuilder.setPreconditioningStrategyFactory(Teuchos::abstractFactoryStd<Base, Impl>(), "Ifpack2");
-#endif
 
     // add coordinates and nullspace to parameter list
     if (paramList->isSublist("Preconditioner Types") &&

packages/muelu/example/basic/Teko.cpp

@@ -75,8 +75,6 @@
 #include "Stratimikos_DefaultLinearSolverBuilder.hpp"
 #include "Stratimikos_MueLuHelpers.hpp"
 
-#include "Thyra_Ifpack2PreconditionerFactory.hpp"
-
 
 // Belos includes
 #include "BelosConfigDefs.hpp"
@@ -200,17 +198,12 @@ void ReadSplittingFromDisk(const std::string & partitionFile,
 template<class SC,class LO, class GO, class NO>
   int solve_thyra(RCP<Tpetra::CrsMatrix<SC,LO,GO,NO> > & crsMat, const std::string &xmlFile) {
   typedef Tpetra::CrsMatrix<SC>       TP_Crs;
-  typedef Thyra::PreconditionerFactoryBase<SC>        Base;
-  typedef Thyra::Ifpack2PreconditionerFactory<TP_Crs> Impl;
 
   typedef Thyra::MultiVectorBase<SC>  MV;
   typedef Thyra::LinearOpBase<SC>     OP;
   auto comm = crsMat->getRowMap()->getComm();
 
-  // tell Stratimikos => Teko about Ifpack2
   RCP<Stratimikos::DefaultLinearSolverBuilder> linearSolverBuilder = Teuchos::rcp(new Stratimikos::DefaultLinearSolverBuilder);
-  linearSolverBuilder->setPreconditioningStrategyFactory(Teuchos::abstractFactoryStd<Base, Impl>(), "Ifpack2");
-  
 
   /////////////////////////////////////////////////////////
   // Build the Thyra operators
@@ -285,7 +278,6 @@ template<class SC,class LO, class GO, class NO>
   //typedef Tpetra::Vector<SC>          TP_Vec;
   typedef Tpetra::CrsMatrix<SC>       TP_Crs;
   typedef Thyra::PreconditionerFactoryBase<SC>        Base;
-  typedef Thyra::Ifpack2PreconditionerFactory<TP_Crs> Impl;
 
   typedef Thyra::MultiVectorBase<SC>  MV;
   typedef Thyra::LinearOpBase<SC>     OP;
@@ -295,7 +287,6 @@ template<class SC,class LO, class GO, class NO>
 
   // tell Stratimikos => Teko about MueLu
   RCP<Stratimikos::DefaultLinearSolverBuilder> linearSolverBuilder = Teuchos::rcp(new Stratimikos::DefaultLinearSolverBuilder);
-  linearSolverBuilder->setPreconditioningStrategyFactory(Teuchos::abstractFactoryStd<Base, Impl>(), "Ifpack2");
   Stratimikos::enableMueLu<SC,LO,GO,NO>(*linearSolverBuilder);
 
   /////////////////////////////////////////////////////////

packages/muelu/research/q2q1/Q2Q1.cpp

@@ -77,7 +77,6 @@
 
 #include <Thyra_DefaultPreconditioner.hpp>
 #include <Thyra_DefaultScaledAdjointLinearOp.hpp>
-#include <Thyra_Ifpack2PreconditionerFactory.hpp>
 #include <Thyra_LinearOpWithSolveBase.hpp>
 #include <Thyra_LinearOpWithSolveBase.hpp>
 #include <Thyra_LinearOpWithSolveFactoryBase.hpp>
@@ -324,7 +323,6 @@ int main(int argc, char *argv[]) {
 
     // Stratimikos vodou
     typedef Thyra::PreconditionerFactoryBase<SC>             Base;
-    typedef Thyra::Ifpack2PreconditionerFactory<tCrsMatrix > Impl;
     typedef Thyra::LinearOpWithSolveFactoryBase<SC>          LOWSFB;
     typedef Thyra::LinearOpWithSolveBase<SC>                 LOWSB;
     typedef Thyra::MultiVectorBase<SC>                       TH_Mvb;

packages/muelu/src/Smoothers/MueLu_StratimikosSmoother_def.hpp

@@ -66,9 +66,7 @@
 
 #include <Stratimikos_DefaultLinearSolverBuilder.hpp>
 #include "Teuchos_AbstractFactoryStd.hpp"
-#if defined(HAVE_MUELU_THYRATPETRAADAPTERS) && defined(HAVE_MUELU_IFPACK2)
-#include <Thyra_Ifpack2PreconditionerFactory.hpp>
-#endif
+#include <Teuchos_ParameterList.hpp>
 #include <unordered_map>
 
 
@@ -132,11 +130,6 @@ namespace MueLu {
 #endif
     }
 
-    typedef Thyra::PreconditionerFactoryBase<Scalar> Base;
-#if defined(HAVE_MUELU_THYRATPETRAADAPTERS) && defined(HAVE_MUELU_IFPACK2)
-    typedef Thyra::Ifpack2PreconditionerFactory<Tpetra::CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Node> > Impl;
-    linearSolverBuilder.setPreconditioningStrategyFactory(Teuchos::abstractFactoryStd<Base, Impl>(), "Ifpack2");
-#endif
     linearSolverBuilder.setParameterList(rcpFromRef(const_cast<ParameterList&>(this->GetParameterList())));