WIP (Do Not Merge!!): Belos Small Dense Matrix Abstraction

packages/belos/epetra/src/Belos_Details_Epetra_registerSolverFactory.cpp

@@ -37,20 +37,21 @@ void registerSolverFactory() {
   typedef double ST;
   typedef Epetra_MultiVector MV;
   typedef Epetra_Operator OP;
+  typedef Teuchos::SerialDenseMatrix<int,ST> DM;
 
   Impl::registerSolverSubclassForTypes<BiCGStabSolMgr<ST,MV,OP>, ST, MV, OP> ("BICGSTAB");
-  Impl::registerSolverSubclassForTypes<BlockCGSolMgr<ST,MV,OP>, ST, MV, OP> ("BLOCK CG");
-  Impl::registerSolverSubclassForTypes<BlockGmresSolMgr<ST,MV,OP>, ST, MV, OP> ("BLOCK GMRES");
+  Impl::registerSolverSubclassForTypes<BlockCGSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("BLOCK CG");
+  Impl::registerSolverSubclassForTypes<BlockGmresSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("BLOCK GMRES");
   Impl::registerSolverSubclassForTypes<FixedPointSolMgr<ST,MV,OP>, ST, MV, OP> ("FIXED POINT");
-  Impl::registerSolverSubclassForTypes<GCRODRSolMgr<ST,MV,OP>, ST, MV, OP> ("GCRODR");
-  Impl::registerSolverSubclassForTypes<GmresPolySolMgr<ST,MV,OP>, ST, MV, OP> ("HYBRID BLOCK GMRES");
-  Impl::registerSolverSubclassForTypes<LSQRSolMgr<ST,MV,OP>, ST, MV, OP> ("LSQR");
-  Impl::registerSolverSubclassForTypes<MinresSolMgr<ST,MV,OP>, ST, MV, OP> ("MINRES");
-  Impl::registerSolverSubclassForTypes<PCPGSolMgr<ST,MV,OP>, ST, MV, OP> ("PCPG");
-  Impl::registerSolverSubclassForTypes<PseudoBlockCGSolMgr<ST,MV,OP>, ST, MV, OP> ("PSEUDOBLOCK CG");
-  Impl::registerSolverSubclassForTypes<PseudoBlockGmresSolMgr<ST,MV,OP>, ST, MV, OP> ("PSEUDOBLOCK GMRES");
+  Impl::registerSolverSubclassForTypes<GCRODRSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("GCRODR");
+  Impl::registerSolverSubclassForTypes<GmresPolySolMgr<ST,MV,OP,DM>, ST, MV, OP> ("HYBRID BLOCK GMRES");
+  Impl::registerSolverSubclassForTypes<LSQRSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("LSQR");
+  Impl::registerSolverSubclassForTypes<MinresSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("MINRES");
+  Impl::registerSolverSubclassForTypes<PCPGSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("PCPG");
+  Impl::registerSolverSubclassForTypes<PseudoBlockCGSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("PSEUDOBLOCK CG");
+  Impl::registerSolverSubclassForTypes<PseudoBlockGmresSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("PSEUDOBLOCK GMRES");
   Impl::registerSolverSubclassForTypes<PseudoBlockTFQMRSolMgr<ST,MV,OP>, ST, MV, OP> ("PSEUDOBLOCK TFQMR");
-  Impl::registerSolverSubclassForTypes<RCGSolMgr<ST,MV,OP>, ST, MV, OP> ("RCG");
+  Impl::registerSolverSubclassForTypes<RCGSolMgr<ST,MV,OP,DM>, ST, MV, OP> ("RCG");
   Impl::registerSolverSubclassForTypes<TFQMRSolMgr<ST,MV,OP>, ST, MV, OP> ("TFQMR");
 }
 

packages/belos/epetra/test/MVOPTester/cxx_main.cpp

@@ -27,6 +27,7 @@
 #include "BelosMVOPTester.hpp"
 #include "BelosEpetraAdapter.hpp"
 #include "BelosOutputManager.hpp"
+#include "BelosTeuchosDenseAdapter.hpp"
 
 #include "Teuchos_StandardCatchMacros.hpp"
 
@@ -121,7 +122,7 @@ int main(int argc, char *argv[])
 
     // Issue several useful typedefs;
     typedef Belos::MultiVec<double> EMV;
-    //typedef Belos::Operator<double> EOP; // unused
+    typedef Teuchos::SerialDenseMatrix<int, double> TDM;
 
     // Create an Epetra_MultiVector for an initial std::vector to start the solver.
     // Note that this needs to have the same number of columns as the blocksize.
@@ -135,7 +136,7 @@ int main(int argc, char *argv[])
     }
 
     // test the Epetra adapter multivector
-    ierr = Belos::TestMultiVecTraits<double,EMV>(MyOM,ivec);
+    ierr = Belos::TestMultiVecTraits<double,EMV,TDM>(MyOM,ivec);
     gerr &= ierr;
     if (ierr) {
       MyOM->print(Belos::Warnings,"*** EpetraAdapter PASSED TestMultiVecTraits()\n");

packages/belos/epetra/test/OrthoManager/belos_orthomanager_epetra.cpp

@@ -315,7 +315,7 @@ main (int argc, char *argv[])
   // subclass, given a name for the subclass.  The name is not the
   // same as the class' syntactic name: e.g., "DKGS" is the name of
   // DkgsOrthoManager.
-  Belos::OrthoManagerFactory< scalar_type, MV, OP > factory;
+  Belos::OrthoManagerFactory< scalar_type, MV, OP, serial_matrix_type > factory;
   // The name of the (Mat)OrthoManager subclass to instantiate.
   std::string ortho (factory.defaultName());
 
@@ -528,7 +528,7 @@ main (int argc, char *argv[])
     // should return zero).
     int numFailed = 0;
     {
-      typedef Belos::Test::OrthoManagerTester<scalar_type, MV> tester_type;
+      typedef Belos::Test::OrthoManagerTester<scalar_type, MV, serial_matrix_type> tester_type;
       debugOut << "Running OrthoManager tests..." << endl;
       numFailed = tester_type::runTests (OM, isRankRevealing, S,
           sizeX1, sizeX2, outMan);

packages/belos/kokkos/example/CMakeLists.txt

@@ -8,6 +8,12 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   COMM serial mpi
   )
 
+TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  Kokkos_KKGMRESEx
+  SOURCES ex_real_A.cpp
+  COMM serial mpi
+  )
+
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   Kokkos_BlockCGEx
   SOURCES BlockCGKokkosExFile.cpp
@@ -25,8 +31,8 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
 
 TRIBITS_COPY_FILES_TO_BINARY_DIR(CopyExampleMtxFiles
   SOURCE_DIR ${Belos_SOURCE_DIR}/kokkos/example
-  SOURCE_FILES bcsstk12.mtx
-  EXEDEPS Kokkos_BlockCGEx Kokkos_BlockGmresEx Kokkos_GCRODREx
+  SOURCE_FILES bcsstk12.mtx bcsstk09.mtx
+  EXEDEPS Kokkos_BlockCGEx Kokkos_BlockGmresEx Kokkos_GCRODREx Kokkos_KKGMRESEx
   )
 
 IF(Teuchos_ENABLE_COMPLEX)

packages/belos/kokkos/example/GCRODRComplexKokkosExFile.cpp

@@ -17,6 +17,7 @@
 #include "BelosGCRODRSolMgr.hpp"
 #include "BelosOutputManager.hpp"
 
+#include "Teuchos_SerialDenseMatrix.hpp"
 #include "Teuchos_CommandLineProcessor.hpp"
 #include "Teuchos_ParameterList.hpp"
 #include "Teuchos_StandardCatchMacros.hpp"
@@ -41,11 +42,12 @@ bool success = true;
   typedef Kokkos::complex<double>           ST;
   typedef int                               OT;
   typedef Kokkos::DefaultExecutionSpace     EXSP;
-  typedef Teuchos::ScalarTraits<ST>        SCT;
+  typedef Teuchos::ScalarTraits<ST>         SCT;
+  typedef Teuchos::SerialDenseMatrix<int,ST>DM;
   typedef SCT::magnitudeType                MT;
-  typedef Belos::KokkosMultiVec<ST, EXSP>         MV;
-  typedef Belos::MultiVec<ST> KMV;
-  typedef Belos::Operator<ST> KOP; 
+  typedef Belos::KokkosMultiVec<ST, EXSP>   MV;
+  typedef Belos::MultiVec<ST>               KMV;
+  typedef Belos::Operator<ST>               KOP; 
   typedef Belos::MultiVecTraits<ST,KMV>     MVT;
   typedef Belos::OperatorTraits<ST,KMV,KOP>  OPT;
 
@@ -136,8 +138,8 @@ try {
   // *******************************************************************
   //
   // Create an iterative solver manager.
-  RCP< Belos::SolverManager<ST,KMV,KOP> > newSolver
-    = rcp( new Belos::GCRODRSolMgr<ST,KMV,KOP,true>(rcpFromRef(problem), rcpFromRef(belosList)) );
+  RCP< Belos::SolverManager<ST,KMV,KOP,DM> > newSolver
+    = rcp( new Belos::GCRODRSolMgr<ST,KMV,KOP,DM,true>(rcpFromRef(problem), rcpFromRef(belosList)) );
 
   //
   // **********Print out information about problem*******************

packages/belos/kokkos/example/GCRODRKokkosExFile.cpp

@@ -137,7 +137,7 @@ try {
   //
   // Create an iterative solver manager.
   RCP< Belos::SolverManager<ST,KMV,KOP> > newSolver
-    = rcp( new Belos::GCRODRSolMgr<ST,KMV,KOP,true>(rcpFromRef(problem), rcpFromRef(belosList)) );
+    = rcp( new Belos::GCRODRSolMgr<ST,KMV,KOP>(rcpFromRef(problem), rcpFromRef(belosList)) );
 
   //
   // **********Print out information about problem*******************