#210: Belos: replace hb reader tpetra

packages/belos/CMakeLists.txt

@@ -104,19 +104,19 @@ ADD_SUBDIRECTORY(src)
 
 TRIBITS_ADD_TEST_DIRECTORIES(test)
 
-IF (Belos_ENABLE_Epetra)
+IF (${PACKAGE_NAME}_ENABLE_Epetra)
   ADD_SUBDIRECTORY(epetra)
 ENDIF()
 
-IF (Belos_ENABLE_Tpetra)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra)
   ADD_SUBDIRECTORY(tpetra)
 ENDIF()
 
-IF (Belos_ENABLE_KokkosKernels)
+IF (${PACKAGE_NAME}_ENABLE_KokkosKernels)
   ADD_SUBDIRECTORY(kokkos)
 ENDIF()
 
-IF (Belos_ENABLE_Xpetra)
+IF (${PACKAGE_NAME}_ENABLE_Xpetra)
   ADD_SUBDIRECTORY(xpetra)
 ENDIF()
 

packages/belos/tpetra/example/BlockCG/BlockCGTpetraExFile.cpp

@@ -48,15 +48,6 @@
 // NOTE: No preconditioner is used in this example.
 //
 
-// Tpetra
-#include <Tpetra_Map.hpp>
-#include <Tpetra_Core.hpp>
-#include <Tpetra_Vector.hpp>
-#include <Tpetra_CrsMatrix.hpp>
-// I/O for Harwell-Boeing files
-#define HIDE_TPETRA_INOUT_IMPLEMENTATIONS
-#include <Tpetra_MatrixIO.hpp>
-
 // Teuchos
 #include <Teuchos_RCP.hpp>
 #include <Teuchos_Comm.hpp>
@@ -66,13 +57,21 @@
 #include "Teuchos_StandardCatchMacros.hpp"
 #include "Teuchos_CommandLineProcessor.hpp"
 
+// Tpetra
+#include <Tpetra_Map.hpp>
+#include <Tpetra_Core.hpp>
+#include <Tpetra_Vector.hpp>
+#include <Tpetra_CrsMatrix.hpp>
+// I/O for Harwell-Boeing files
+#define HIDE_TPETRA_INOUT_IMPLEMENTATIONS
+#include <Tpetra_MatrixIO.hpp>
+
 // Belos
 #include "BelosConfigDefs.hpp"
 #include "BelosBlockCGSolMgr.hpp"
 #include "BelosLinearProblem.hpp"
 #include "BelosTpetraAdapter.hpp"
 
-
 template <typename ScalarType>
 int run(int argc, char *argv[]) {
 
@@ -114,7 +113,7 @@ int run(int argc, char *argv[]) {
     Teuchos::CommandLineProcessor cmdp(false,true);
     cmdp.setOption("verbose","quiet",&verbose,"Print messages and results.");
     cmdp.setOption("frequency",&frequency,"Solvers frequency for printing residuals (#iters).");
-    cmdp.setOption("filename",&filename,"Filename for test matrix.  Acceptable file extensions: *.hb,*.mtx,*.triU,*.triS");
+    cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix.");
     cmdp.setOption("tol",&tol,"Relative residual tolerance used by CG solver.");
     cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for.");
     cmdp.setOption("block-size",&blockSize,"Block size used by CG.");

packages/belos/tpetra/example/BlockCG/CMakeLists.txt

@@ -1,25 +1,20 @@
 
 
-ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Triutils)
-IF (${PACKAGE_NAME}_ENABLE_Triutils)
+TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  BlockCG_Tpetra_File_Ex
+  SOURCES BlockCGTpetraExFile.cpp
+  COMM serial mpi
+  )
 
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
-    BlockCG_Tpetra_File_Ex
-    SOURCES BlockCGTpetraExFile.cpp
-    COMM serial mpi
-    )
+TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  PseudoBlockCG_Tpetra_File_Ex
+  SOURCES PseudoBlockCGTpetraExFile.cpp
+  COMM serial mpi
+  )
 
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
-    PseudoBlockCG_Tpetra_File_Ex
-    SOURCES PseudoBlockCGTpetraExFile.cpp
-    COMM serial mpi
-    )
-
-  ASSERT_DEFINED(Anasazi_SOURCE_DIR)
-  TRIBITS_COPY_FILES_TO_BINARY_DIR(Tpetra_CopyExampleBlockCGFiles
-    SOURCE_DIR ${Anasazi_SOURCE_DIR}/testmatrices
-    SOURCE_FILES bcsstk14.hb
-    EXEDEPS BlockCG_Tpetra_File_Ex
-    )
-
-ENDIF(${PACKAGE_NAME}_ENABLE_Triutils)
+ASSERT_DEFINED(Anasazi_SOURCE_DIR)
+TRIBITS_COPY_FILES_TO_BINARY_DIR(Tpetra_CopyExampleBlockCGFiles
+  SOURCE_DIR ${Anasazi_SOURCE_DIR}/testmatrices
+  SOURCE_FILES bcsstk14.hb
+  EXEDEPS BlockCG_Tpetra_File_Ex
+  )

packages/belos/tpetra/example/BlockCG/PseudoBlockCGTpetraExFile.cpp

@@ -63,9 +63,9 @@
 #include <Teuchos_Comm.hpp>
 #include <Teuchos_CommHelpers.hpp>
 #include <Teuchos_DefaultComm.hpp>
-#include "Teuchos_ParameterList.hpp"
-#include "Teuchos_StandardCatchMacros.hpp"
-#include "Teuchos_CommandLineProcessor.hpp"
+#include <Teuchos_ParameterList.hpp>
+#include <Teuchos_StandardCatchMacros.hpp>
+#include <Teuchos_CommandLineProcessor.hpp>
 
 // Belos
 #include "BelosConfigDefs.hpp"
@@ -114,7 +114,7 @@ int run(int argc, char *argv[]) {
     Teuchos::CommandLineProcessor cmdp(false,true);
     cmdp.setOption("verbose","quiet",&verbose,"Print messages and results.");
     cmdp.setOption("frequency",&frequency,"Solvers frequency for printing residuals (#iters).");
-    cmdp.setOption("filename",&filename,"Filename for test matrix.  Acceptable file extensions: *.hb,*.mtx,*.triU,*.triS");
+    cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix.");
     cmdp.setOption("tol",&tol,"Relative residual tolerance used by CG solver.");
     cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for.");
     cmdp.setOption("block-size",&blockSize,"Block size used by CG.");

packages/belos/tpetra/example/BlockGmres/BlockGmresTpetraExFile.cpp

@@ -53,22 +53,24 @@
 #include <Tpetra_Core.hpp>
 #include <Tpetra_Vector.hpp>
 #include <Tpetra_CrsMatrix.hpp>
+// I/O for Harwell-Boeing files
+#define HIDE_TPETRA_INOUT_IMPLEMENTATIONS
+#include <Tpetra_MatrixIO.hpp>
 
 // Teuchos
 #include <Teuchos_RCP.hpp>
 #include <Teuchos_Comm.hpp>
 #include <Teuchos_CommHelpers.hpp>
 #include <Teuchos_DefaultComm.hpp>
-#include "Teuchos_ParameterList.hpp"
-#include "Teuchos_StandardCatchMacros.hpp"
-#include "Teuchos_CommandLineProcessor.hpp"
+#include <Teuchos_ParameterList.hpp>
+#include <Teuchos_StandardCatchMacros.hpp>
+#include <Teuchos_CommandLineProcessor.hpp>
 
 // Belos
 #include "BelosConfigDefs.hpp"
 #include "BelosBlockGmresSolMgr.hpp"
 #include "BelosLinearProblem.hpp"
-#include "BelosTpetraTestFramework.hpp"
-
+#include "BelosTpetraAdapter.hpp"
 
 template <typename ScalarType>
 int run(int argc, char *argv[]) {
@@ -117,7 +119,7 @@ int run(int argc, char *argv[]) {
     cmdp.setOption("verbose","quiet",&verbose,"Print messages and results.");
     cmdp.setOption("debug","nondebug",&debug,"Print debugging information from solver.");
     cmdp.setOption("frequency",&frequency,"Solvers frequency for printing residuals (#iters).");
-    cmdp.setOption("filename",&filename,"Filename for test matrix.  Acceptable file extensions: *.hb,*.mtx,*.triU,*.triS");
+    cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix.");
     cmdp.setOption("tol",&tol,"Relative residual tolerance used by GMRES solver.");
     cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for.");
     cmdp.setOption("block-size",&blockSize,"Block size used by GMRES.");
@@ -138,8 +140,8 @@ int run(int argc, char *argv[]) {
     }
 
     // Get the problem
-    Belos::Tpetra::HarwellBoeingReader<tcrsmatrix_t> reader( comm );
-    RCP<tcrsmatrix_t> A = reader.readFromFile( filename );
+    RCP<tcrsmatrix_t> A;
+    Tpetra::Utils::readHBMatrix(filename, comm, A);
     RCP<const tmap_t> Map = A->getDomainMap();
 
     // Create initial vectors

packages/belos/tpetra/example/BlockGmres/BlockGmresTpetraGaleriEx.cpp

@@ -54,11 +54,11 @@
 #include <Teuchos_Comm.hpp>
 #include <Teuchos_CommHelpers.hpp>
 #include <Teuchos_DefaultComm.hpp>
-#include "Teuchos_ParameterList.hpp"
+#include <Teuchos_ParameterList.hpp>
 #include <Teuchos_TypeNameTraits.hpp>
 #include <Teuchos_oblackholestream.hpp>
-#include "Teuchos_StandardCatchMacros.hpp"
-#include "Teuchos_CommandLineProcessor.hpp"
+#include <Teuchos_StandardCatchMacros.hpp>
+#include <Teuchos_CommandLineProcessor.hpp>
 
 // Belos
 #include "BelosTpetraAdapter.hpp"

packages/belos/tpetra/example/BlockGmres/CMakeLists.txt

@@ -1,39 +1,35 @@
 
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Galeri)
-ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Triutils)
 
-IF (${PACKAGE_NAME}_ENABLE_Triutils)
+TRIBITS_ADD_EXECUTABLE(
+  BlockGmres_Tpetra_File_Ex
+  SOURCES BlockGmresTpetraExFile.cpp
+  COMM serial mpi
+  )
 
-  TRIBITS_ADD_EXECUTABLE(
-    BlockGmres_Tpetra_File_Ex
-    SOURCES BlockGmresTpetraExFile.cpp
-    COMM serial mpi
-    )
-
-  TRIBITS_ADD_EXECUTABLE(
-    PseudoBlockGmres_Tpetra_File_Ex
-    SOURCES PseudoBlockGmresTpetraExFile.cpp
-    COMM serial mpi
-    )
-
-  TRIBITS_COPY_FILES_TO_BINARY_DIR(Tpetra_CopyExampleBlockGmresFiles
-    SOURCE_DIR ${Belos_SOURCE_DIR}/tpetra/example/BlockGmres
-    SOURCE_FILES orsirr1.hb identity.mtx
-    EXEDEPS BlockGmres_Tpetra_File_Ex
-    )
+TRIBITS_ADD_EXECUTABLE(
+  PseudoBlockGmres_Tpetra_File_Ex
+  SOURCES PseudoBlockGmresTpetraExFile.cpp
+  COMM serial mpi
+  )
 
-ENDIF(${PACKAGE_NAME}_ENABLE_Triutils)
+TRIBITS_COPY_FILES_TO_BINARY_DIR(Tpetra_CopyExampleBlockGmresFiles
+  SOURCE_DIR ${Belos_SOURCE_DIR}/tpetra/testmatrices
+  SOURCE_FILES orsirr1.hb identity.mtx
+  EXEDEPS BlockGmres_Tpetra_File_Ex
+  )
 
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Galeri)
 IF (${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Xpetra)
 
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     Tpetra_BlockGmres_Galeri_Ex
     SOURCES BlockGmresTpetraGaleriEx.cpp
     COMM serial mpi
     ARGS "--verbose --nx=10 --ortho=DGKS"
-         "--verbose --nx=10 --ortho=ICGS"
-         "--verbose --nx=10 --ortho=IMGS"
+        "--verbose --nx=10 --ortho=ICGS"
+        "--verbose --nx=10 --ortho=IMGS"
     STANDARD_PASS_OUTPUT
     )
 
-ENDIF (${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Xpetra)
+ENDIF ()

packages/belos/tpetra/example/BlockGmres/PseudoBlockGmresTpetraExFile.cpp

@@ -48,26 +48,29 @@
 // NOTE: No preconditioner is used in this example.
 //
 
-// Tpetra
-#include <Tpetra_Map.hpp>
-#include <Tpetra_Core.hpp>
-#include <Tpetra_Vector.hpp>
-#include <Tpetra_CrsMatrix.hpp>
-
 // Teuchos
 #include <Teuchos_RCP.hpp>
 #include <Teuchos_Comm.hpp>
 #include <Teuchos_CommHelpers.hpp>
 #include <Teuchos_DefaultComm.hpp>
-#include "Teuchos_ParameterList.hpp"
-#include "Teuchos_StandardCatchMacros.hpp"
-#include "Teuchos_CommandLineProcessor.hpp"
+#include <Teuchos_ParameterList.hpp>
+#include <Teuchos_StandardCatchMacros.hpp>
+#include <Teuchos_CommandLineProcessor.hpp>
+
+// Tpetra
+#include <Tpetra_Map.hpp>
+#include <Tpetra_Core.hpp>
+#include <Tpetra_Vector.hpp>
+#include <Tpetra_CrsMatrix.hpp>
+// I/O for Harwell-Boeing files
+#define HIDE_TPETRA_INOUT_IMPLEMENTATIONS
+#include <Tpetra_MatrixIO.hpp>
 
 // Belos
 #include "BelosConfigDefs.hpp"
 #include "BelosPseudoBlockGmresSolMgr.hpp"
 #include "BelosLinearProblem.hpp"
-#include "BelosTpetraTestFramework.hpp"
+#include "BelosTpetraAdapter.hpp"
 
 
 template <typename ScalarType>
@@ -114,7 +117,7 @@ int run(int argc, char *argv[]) {
     Teuchos::CommandLineProcessor cmdp(false,true);
     cmdp.setOption("verbose","quiet",&verbose,"Print messages and results.");
     cmdp.setOption("frequency",&frequency,"Solvers frequency for printing residuals (#iters).");
-    cmdp.setOption("filename",&filename,"Filename for test matrix.  Acceptable file extensions: *.hb,*.mtx,*.triU,*.triS");
+    cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix.");
     cmdp.setOption("tol",&tol,"Relative residual tolerance used by GMRES solver.");
     cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for.");
     cmdp.setOption("block-size",&blockSize,"Block size used by GMRES.");
@@ -133,9 +136,9 @@ int run(int argc, char *argv[]) {
       std::cout << Belos::Belos_Version() << std::endl << std::endl;
     }
 
-    // Get the problem
-    Belos::Tpetra::HarwellBoeingReader<tcrsmatrix_t> reader( comm );
-    RCP<tcrsmatrix_t> A = reader.readFromFile( filename );
+    // Get the problem   
+    RCP<tcrsmatrix_t> A;
+    Tpetra::Utils::readHBMatrix(filename, comm, A);
     RCP<const tmap_t> Map = A->getDomainMap();
 
     // Create initial vectors