Merge branch 'master' of https://github.com/trilinos/Trilinos

crtrott · Feb 4, 2016 · 7187c1f · 7187c1f
2 parents 12896cf + 1ebd8d8
commit 7187c1f
Show file tree

Hide file tree

Showing 109 changed files with 4,357 additions and 1,323 deletions.
diff --git a/cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc-cuda.cmake b/cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc-cuda.cmake
@@ -86,7 +86,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
       ### TPLS ###
       "-DTPL_ENABLE_CUDA:BOOL=ON"
       "-DTPL_ENABLE_CUSPARSE:BOOL=ON"
-      "-DTPL_ENABLE_HWLOC:BOOL=ON"
+      "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
       ### PACKAGE CONFIGURATION ###
           "-DKokkos_ENABLE_Cuda:BOOL=ON"

diff --git a/.../drivers/geminga/ctest_linux_nightly_mpi_debug_muelu_kokkos_refactor_openmp_geminga.cmake b/.../drivers/geminga/ctest_linux_nightly_mpi_debug_muelu_kokkos_refactor_openmp_geminga.cmake
@@ -90,7 +90,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
       "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...nga/ctest_linux_nightly_mpi_release_muelu_no_epetra_no_serial_openmp_broken_geminga.cmake b/...nga/ctest_linux_nightly_mpi_release_muelu_no_epetra_no_serial_openmp_broken_geminga.cmake
@@ -88,7 +88,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
   "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...rs/geminga/ctest_linux_nightly_mpi_release_muelu_no_epetra_no_serial_openmp_geminga.cmake b/...rs/geminga/ctest_linux_nightly_mpi_release_muelu_no_epetra_no_serial_openmp_geminga.cmake
@@ -88,7 +88,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
   "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...e/ctest/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_broken_geminga.cmake b/...e/ctest/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_broken_geminga.cmake
@@ -91,7 +91,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
       "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/cmake/ctest/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_geminga.cmake b/cmake/ctest/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_geminga.cmake
@@ -91,7 +91,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
       "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...eminga/ctest_linux_nightly_mpi_release_muelu_no_int_no_serial_openmp_broken_geminga.cmake b/...eminga/ctest_linux_nightly_mpi_release_muelu_no_int_no_serial_openmp_broken_geminga.cmake
@@ -90,7 +90,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
   "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...ivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_no_serial_openmp_geminga.cmake b/...ivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_no_serial_openmp_geminga.cmake
@@ -90,7 +90,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
   "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/.../drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_openmp_broken_geminga.cmake b/.../drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_openmp_broken_geminga.cmake
@@ -90,7 +90,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
   "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...e/ctest/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_openmp_geminga.cmake b/...e/ctest/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_int_openmp_geminga.cmake
@@ -90,7 +90,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
   "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...test/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_serial_broken_geminga.cmake b/...test/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_serial_broken_geminga.cmake
@@ -89,7 +89,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
       "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/cmake/ctest/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_serial_geminga.cmake b/cmake/ctest/drivers/geminga/ctest_linux_nightly_mpi_release_muelu_no_serial_geminga.cmake
@@ -89,7 +89,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
       "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...eminga/ctest_linux_nightly_mpi_release_muelu_tpetra_no_int_no_serial_broken_geminga.cmake b/...eminga/ctest_linux_nightly_mpi_release_muelu_tpetra_no_int_no_serial_broken_geminga.cmake
@@ -91,7 +91,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
       "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...ivers/geminga/ctest_linux_nightly_mpi_release_muelu_tpetra_no_int_no_serial_geminga.cmake b/...ivers/geminga/ctest_linux_nightly_mpi_release_muelu_tpetra_no_int_no_serial_geminga.cmake
@@ -91,7 +91,7 @@ SET(EXTRA_CONFIGURE_OPTIONS
       "-DSuperLU_LIBRARY_DIRS:PATH=/home/aprokop/local/opt/superlu-4.3/lib"
       "-DSuperLU_LIBRARY_NAMES:STRING=superlu_4.3"
   "-DTrilinos_ENABLE_OpenMP:BOOL=ON"
-  "-DTPL_ENABLE_HWLOC:BOOL=ON"
+  "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 
   ### PACKAGES CONFIGURATION ###
       "-DMueLu_ENABLE_Experimental:BOOL=ON"

diff --git a/...I_OPT_GCC_4.4.7/ctest_linux_nightly_mpi_development_opt_gcc_4.4.7_rhel6-x86_64_xyce.cmake b/...I_OPT_GCC_4.4.7/ctest_linux_nightly_mpi_development_opt_gcc_4.4.7_rhel6-x86_64_xyce.cmake
@@ -54,7 +54,7 @@
 # @HEADER
 
 
-INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.linux.gcc-4.4.cmake")
+INCLUDE("${CTEST_SCRIPT_DIRECTORY}/../TrilinosCTestDriverCore.rhel6-x86_64.gcc4.4.7.cmake")
 
 #
 # Set the options specific to this build case

diff --git a/cmake/ctest/drivers/rhel6-x86_64/TrilinosCTestDriverCore.rhel6-x86_64.gcc4.4.7.cmake b/cmake/ctest/drivers/rhel6-x86_64/TrilinosCTestDriverCore.rhel6-x86_64.gcc4.4.7.cmake
@@ -54,7 +54,7 @@
 # @HEADER
 
 
-INCLUDE("${CTEST_SCRIPT_DIRECTORY}/../../TrilinosCTestDriverCore.cmake")
+INCLUDE("${CTEST_SCRIPT_DIRECTORY}/../../../TrilinosCTestDriverCore.cmake")
 
 #
 # Platform/compiler specific options for trilinos-test using gcc
@@ -67,9 +67,9 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
 
   SET( CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}" )
 
-  SET_DEFAULT( CTEST_BUILD_FLAGS "-j8 -i" )
+  SET_DEFAULT( CTEST_BUILD_FLAGS "-j3 -i" )
 
-  SET_DEFAULT( CTEST_PARALLEL_LEVEL "8" )
+  SET_DEFAULT( CTEST_PARALLEL_LEVEL "3" )
 
   SET( CTEST_COVERAGE_COMMAND /usr/bin/gcov )
   SET( CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind )

diff --git a/cmake/ctest/drivers/shiller/TrilinosCTestDriverCore.shiller.generic.cmake b/cmake/ctest/drivers/shiller/TrilinosCTestDriverCore.shiller.generic.cmake
@@ -101,6 +101,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
     "-DZlib_INCLUDE_DIRS:FILEPATH=$ENV{ZLIB_ROOT}/include"
     "-DZlib_LIBRARY_DIRS:FILEPATH=$ENV{ZLIB_ROOT}/lib"
     "-DTPL_ENABLE_X11:BOOL=OFF"
+    "-DTPL_ENABLE_Matio=OFF"
 
     )
 

diff --git a/packages/belos/doc/parameterList/CMakeLists.txt b/packages/belos/doc/parameterList/CMakeLists.txt
@@ -1,5 +1,7 @@
 # -*- cmake -*-
 
+IF (${PACKAGE_NAME}_ENABLE_Tpetra)
+
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../tpetra/src )
 
 # Create the ValidParameters executable
@@ -18,3 +20,4 @@ TRIBITS_ADD_TEST(
   ARGS "--add-xsl-header"
   )
 
+ENDIF()
diff --git a/packages/belos/epetra/test/TFQMR/CMakeLists.txt b/packages/belos/epetra/test/TFQMR/CMakeLists.txt
@@ -3,6 +3,15 @@
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Triutils)
 IF (${PACKAGE_NAME}_ENABLE_Triutils)
 
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    pseudo_tfqmr_hb
+    SOURCES test_pseudo_tfqmr_hb.cpp createEpetraProblem.cpp
+    COMM serial mpi
+    ARGS
+      "--verbose --filename=orsirr1_scaled.hb"
+    STANDARD_PASS_OUTPUT 
+  )
+
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     tfqmr_hb
     SOURCES test_tfqmr_hb.cpp createEpetraProblem.cpp

diff --git a/packages/belos/epetra/test/TFQMR/test_pseudo_ptfqmr_hb.cpp b/packages/belos/epetra/test/TFQMR/test_pseudo_ptfqmr_hb.cpp
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) {
     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("maxiters",&maxiters,"Maximum number of iterations per linear system (-1 = adapted to problem/block size).");
+    cmdp.setOption("maxiters",&maxiters,"Maximum number of iterations per linear system (-1 = adapted to problem size).");
     if (cmdp.parse(argc,argv) != Teuchos::CommandLineProcessor::PARSE_SUCCESSFUL) {
       return -1;
     }