Merge branch 'zoltan2-tpetra-dep' into muelu-tpetra-dep

cmake/ctest/drivers/ascicgpu031/CMakeLists.txt

@@ -1,50 +1,27 @@
 TRILINOS_DRIVER_SETUP()
 
 TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_NOUVM_NODEPRECATED_CRS
+  DEBUG_CUDA_NOUVM_NODEPRECATED_DEV
   ctest_linux_nightly_mpi_debug_nouvm_ascicgpu031_crs.cmake
   CTEST_INSTALLER_TYPE debug
   RUN_SERIAL
   TIMEOUT_MINUTES 420
   )
 
 TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_UVM_NODEPRECATED_CRS
+  DEBUG_CUDA_UVM_NODEPRECATED_DEV
   ctest_linux_nightly_mpi_debug_uvm_nodeprecated_ascicgpu031_crs.cmake
   CTEST_INSTALLER_TYPE debug
   RUN_SERIAL
   TIMEOUT_MINUTES 420
   )
 
 TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_UVM_DEPRECATED_CRS
+  DEBUG_CUDA_UVM_DEPRECATED_DEV
   ctest_linux_nightly_mpi_debug_uvm_deprecated_ascicgpu031_crs.cmake
   CTEST_INSTALLER_TYPE debug
   RUN_SERIAL
   TIMEOUT_MINUTES 420
   )
-TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_NOUVM_NODEPRECATED_SAKE
-  ctest_linux_nightly_mpi_debug_nouvm_ascicgpu031_sake.cmake
-  CTEST_INSTALLER_TYPE debug
-  RUN_SERIAL
-  TIMEOUT_MINUTES 420
-  )
-
-TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_UVM_NODEPRECATED_SAKE
-  ctest_linux_nightly_mpi_debug_uvm_nodeprecated_ascicgpu031_sake.cmake
-  CTEST_INSTALLER_TYPE debug
-  RUN_SERIAL
-  TIMEOUT_MINUTES 420
-  )
-
-TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_UVM_DEPRECATED_SAKE
-  ctest_linux_nightly_mpi_debug_uvm_deprecated_ascicgpu031_sake.cmake
-  CTEST_INSTALLER_TYPE debug
-  RUN_SERIAL
-  TIMEOUT_MINUTES 420
-  )
 
 TRILINOS_ADD_REQUIRED_CMAKE_INSTALLS()

cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.crs.cmake

@@ -71,7 +71,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
   ENDIF()
 
   SET(Trilinos_REPOSITORY_LOCATION_NIGHTLY_DEFAULT "[email protected]:trilinos-project/Trilinos.git")
-  SET(Trilinos_BRANCH "tpetraCrsRefactor" )
+  SET(Trilinos_BRANCH "develop" )
 
   SET(CTEST_DASHBOARD_ROOT  "${TRILINOS_CMAKE_DIR}/../../${BUILD_DIR_NAME}" )
   SET(CTEST_NOTES_FILES     "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}" )

cmake/std/PullRequestLinuxCuda10.1.105uvmOffTestingSettings.cmake

@@ -152,7 +152,6 @@ set (Kokkos_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (KokkosKernels_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (MueLu_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (NOX_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
-set (Phalanx_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (ROL_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (Sacado_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (SEACAS_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")

cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in

@@ -67,14 +67,14 @@ SET(${PROJECT_NAME}_Fortran_COMPILER "${CMAKE_Fortran_COMPILER_FOR_CONFIG_FILE}"
 
 SET(${PROJECT_NAME}_CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
 
-SET(${PROJECT_NAME}_CXX_COMPILER_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}")
+SET(${PROJECT_NAME}_CXX_COMPILER_FLAGS [[${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}]])
 
-SET(${PROJECT_NAME}_C_COMPILER_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+SET(${PROJECT_NAME}_C_COMPILER_FLAGS [[${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}]])
 
-SET(${PROJECT_NAME}_Fortran_COMPILER_FLAGS "${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE}}")
+SET(${PROJECT_NAME}_Fortran_COMPILER_FLAGS [[${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE}}]])
 
 ## Extra link flags (e.g., specification of fortran libraries)
-SET(${PROJECT_NAME}_EXTRA_LD_FLAGS "${${PROJECT_NAME}_EXTRA_LINK_FLAGS}")
+SET(${PROJECT_NAME}_EXTRA_LD_FLAGS [[${${PROJECT_NAME}_EXTRA_LINK_FLAGS}]])
 
 ## This is the command-line entry used for setting rpaths. In a build
 ## with static libraries it will be empty. 

packages/belos/src/BelosBiCGStabIter.hpp

@@ -57,7 +57,6 @@
 #include "BelosOperatorTraits.hpp"
 #include "BelosMultiVecTraits.hpp"
 
-#include "Teuchos_BLAS.hpp"
 #include "Teuchos_SerialDenseMatrix.hpp"
 #include "Teuchos_SerialDenseVector.hpp"
 #include "Teuchos_ScalarTraits.hpp"

packages/belos/src/BelosBiCGStabSolMgr.hpp

@@ -58,16 +58,14 @@
 #include "BelosStatusTestCombo.hpp"
 #include "BelosStatusTestOutputFactory.hpp"
 #include "BelosOutputManager.hpp"
-#include "Teuchos_BLAS.hpp"
-#include "Teuchos_LAPACK.hpp"
 #ifdef BELOS_TEUCHOS_TIME_MONITOR
 #include "Teuchos_TimeMonitor.hpp"
 #endif
 
-/** \example BiCGStab/BiCGStabEpetraExFile.cpp
+/** \example BiCGStab/BiCGStabExFile.cpp
     This is an example of how to use the Belos::BiCGStabSolMgr solver manager.
 */
-/** \example BiCGStab/PseudoBlockPrecCGEpetraExFile.cpp
+/** \example BiCGStab/PrecBiCGStabExFile.cpp
     This is an example of how to use the Belos::BiCGStabSolMgr solver manager with an Ifpack preconditioner.
 */
 
@@ -95,16 +93,6 @@ namespace Belos {
     BiCGStabSolMgrLinearProblemFailure(const std::string& what_arg) : BelosError(what_arg)
     {}};
 
-  /** \brief BiCGStabSolMgrOrthoFailure is thrown when the orthogonalization manager is
-   * unable to generate orthonormal columns from the initial basis vectors.
-   *
-   * This std::exception is thrown from the BiCGStabSolMgr::solve() method.
-   *
-   */
-  class BiCGStabSolMgrOrthoFailure : public BelosError {public:
-    BiCGStabSolMgrOrthoFailure(const std::string& what_arg) : BelosError(what_arg)
-    {}};
-
   template<class ScalarType, class MV, class OP>
   class BiCGStabSolMgr : public SolverManager<ScalarType,MV,OP> {
 
@@ -630,8 +618,6 @@ ReturnType BiCGStabSolMgr<ScalarType,MV,OP>::solve ()
     setParameters (params_);
   }
 
-  Teuchos::BLAS<int,ScalarType> blas;
-
   TEUCHOS_TEST_FOR_EXCEPTION
     (! problem_->isProblemSet (), BiCGStabSolMgrLinearProblemFailure,
      "Belos::BiCGStabSolMgr::solve: Linear problem is not ready.  "

packages/belos/src/BelosBlockCGIter.hpp

@@ -57,7 +57,6 @@
 #include "BelosOperatorTraits.hpp"
 #include "BelosMultiVecTraits.hpp"
 
-#include "Teuchos_BLAS.hpp"
 #include "Teuchos_LAPACK.hpp"
 #include "Teuchos_SerialDenseMatrix.hpp"
 #include "Teuchos_SerialDenseVector.hpp"

packages/belos/src/BelosBlockCGSolMgr.hpp

@@ -61,7 +61,6 @@
 #include "BelosStatusTestCombo.hpp"
 #include "BelosStatusTestOutputFactory.hpp"
 #include "BelosOutputManager.hpp"
-#include "Teuchos_BLAS.hpp"
 #include "Teuchos_LAPACK.hpp"
 #ifdef BELOS_TEUCHOS_TIME_MONITOR
 #  include "Teuchos_TimeMonitor.hpp"
@@ -102,17 +101,6 @@ namespace Belos {
     BlockCGSolMgrLinearProblemFailure(const std::string& what_arg) : BelosError(what_arg)
     {}};
 
-  /** \brief BlockCGSolMgrOrthoFailure is thrown when the orthogonalization manager is
-   * unable to generate orthonormal columns from the initial basis vectors.
-   *
-   * This std::exception is thrown from the BlockCGSolMgr::solve() method.
-   *
-   */
-  class BlockCGSolMgrOrthoFailure : public BelosError {public:
-    BlockCGSolMgrOrthoFailure(const std::string& what_arg) : BelosError(what_arg)
-    {}};
-
-
   template<class ScalarType, class MV, class OP,
            const bool lapackSupportsScalarType =
            Belos::Details::LapackSupportsScalar<ScalarType>::value>
@@ -840,7 +828,6 @@ ReturnType BlockCGSolMgr<ScalarType,MV,OP,true>::solve() {
     setParameters(Teuchos::parameterList(*getValidParameters()));
   }
 
-  Teuchos::BLAS<int,ScalarType> blas;
   Teuchos::LAPACK<int,ScalarType> lapack;
 
   TEUCHOS_TEST_FOR_EXCEPTION( !problem_->isProblemSet(),

packages/belos/src/BelosBlockGCRODRSolMgr.hpp

@@ -59,7 +59,6 @@
 #include "BelosStatusTestCombo.hpp"
 #include "BelosStatusTestOutputFactory.hpp"
 #include "BelosOutputManager.hpp"
-#include "Teuchos_BLAS.hpp"
 #include "Teuchos_LAPACK.hpp"
 #include "Teuchos_as.hpp"
 #ifdef BELOS_TEUCHOS_TIME_MONITOR

packages/belos/src/BelosBlockGmresSolMgr.hpp

@@ -63,7 +63,6 @@
 #include "BelosStatusTestOutput.hpp"
 #include "BelosStatusTestOutputFactory.hpp"
 #include "BelosOutputManager.hpp"
-#include "Teuchos_BLAS.hpp"
 #ifdef BELOS_TEUCHOS_TIME_MONITOR
 #include "Teuchos_TimeMonitor.hpp"
 #endif
@@ -889,8 +888,6 @@ ReturnType BlockGmresSolMgr<ScalarType,MV,OP>::solve() {
     setParameters(Teuchos::parameterList(*getValidParameters()));
   }
 
-  Teuchos::BLAS<int,ScalarType> blas;
-
   TEUCHOS_TEST_FOR_EXCEPTION(problem_ == Teuchos::null,BlockGmresSolMgrLinearProblemFailure,
     "Belos::BlockGmresSolMgr::solve(): Linear problem is not a valid object.");
 

packages/belos/src/BelosFixedPointIteration.hpp

@@ -100,26 +100,6 @@ namespace Belos {
     FixedPointIterateFailure(const std::string& what_arg) : BelosError(what_arg)
     {}};
 
-  /** \brief FixedPointIterationOrthoFailure is thrown when the FixedPointIteration object is unable to
-   * compute independent direction vectors in the FixedPointIteration::iterate() routine. 
-   *
-   * This std::exception is thrown from the FixedPointIteration::iterate() method.
-   *
-   */
-  class FixedPointIterationOrthoFailure : public BelosError {public:
-    FixedPointIterationOrthoFailure(const std::string& what_arg) : BelosError(what_arg)
-    {}};
-
-  /** \brief FixedPointIterationLAPACKFailure is thrown when a nonzero return value is passed back
-   * from an LAPACK routine.
-   *
-   * This std::exception is thrown from the FixedPointIteration::iterate() method.
-   *
-   */
-  class FixedPointIterationLAPACKFailure : public BelosError {public:
-    FixedPointIterationLAPACKFailure(const std::string& what_arg) : BelosError(what_arg)
-    {}};
-
   //@}
 
 

packages/belos/src/BelosFixedPointSolMgr.hpp

@@ -59,8 +59,6 @@
 #include "BelosStatusTestCombo.hpp"
 #include "BelosStatusTestOutputFactory.hpp"
 #include "BelosOutputManager.hpp"
-#include "Teuchos_BLAS.hpp"
-#include "Teuchos_LAPACK.hpp"
 #ifdef BELOS_TEUCHOS_TIME_MONITOR
 #  include "Teuchos_TimeMonitor.hpp"
 #endif
@@ -600,9 +598,6 @@ ReturnType FixedPointSolMgr<ScalarType,MV,OP>::solve() {
     setParameters(Teuchos::parameterList(*getValidParameters()));
   }
 
-  Teuchos::BLAS<int,ScalarType> blas;
-  Teuchos::LAPACK<int,ScalarType> lapack;
-
   TEUCHOS_TEST_FOR_EXCEPTION( !problem_->isProblemSet(),
     FixedPointSolMgrLinearProblemFailure,
     "Belos::FixedPointSolMgr::solve(): Linear problem is not ready, setProblem() "

packages/belos/src/BelosLSQRIter.hpp

@@ -55,9 +55,7 @@
 #include "BelosStatusTest.hpp"
 #include "BelosOperatorTraits.hpp"
 #include "BelosMultiVecTraits.hpp"
-//#include "BelosMatOrthoManager.hpp"  (needed for blocks)
 
-//#include "Teuchos_BLAS.hpp"  (needed for blocks)
 #include "Teuchos_SerialDenseMatrix.hpp"
 #include "Teuchos_SerialDenseVector.hpp"
 #include "Teuchos_ScalarTraits.hpp"

packages/belos/src/BelosLSQRIteration.hpp

@@ -130,26 +130,6 @@ class LSQRIterateFailure : public BelosError {public:
       LSQRIterateFailure(const std::string& what_arg) : BelosError(what_arg)
     {}};
 
-  /** \brief LSQRIterationOrthoFailure is thrown when the LSQRIteration object is unable to
-   * compute independent direction vectors in the iterate() routine. 
-   *
-   * This std::exception is thrown from the iterate() method.
-   *
-   */
-class LSQRIterationOrthoFailure : public BelosError {public:
-      LSQRIterationOrthoFailure(const std::string& what_arg) : BelosError(what_arg)
-    {}};
-
-  /** \brief LSQRIterationLAPACKFailure is thrown when a nonzero return value is passed back
-   * from an LAPACK routine.
-   *
-   * This std::exception is thrown from the iterate() method.
-   *
-   */
-class LSQRIterationLAPACKFailure : public BelosError {public:
-      LSQRIterationLAPACKFailure(const std::string& what_arg) : BelosError(what_arg)
-    {}};
-
   //@}
 
 } // end Belos namespace

packages/belos/src/BelosLSQRSolMgr.hpp

@@ -59,8 +59,6 @@
 #include "BelosStatusTestOutputFactory.hpp"
 #include "BelosOutputManager.hpp"
 #include "Teuchos_as.hpp"
-#include "Teuchos_BLAS.hpp"
-#include "Teuchos_LAPACK.hpp"
 
 #ifdef BELOS_TEUCHOS_TIME_MONITOR
 #include "Teuchos_TimeMonitor.hpp"
@@ -85,21 +83,6 @@ class LSQRSolMgrLinearProblemFailure : public BelosError {
   {}
 };
 
-/** \brief LSQRSolMgrOrthoFailure is thrown when the orthogonalization manager is
- * unable to generate orthonormal columns from the initial basis vectors.
- *
- * \warning DO NOT USE; DEPRECATED.
- *
- * This std::exception is thrown from the LSQRSolMgr::solve() method.
- *
- */
-class LSQRSolMgrOrthoFailure : public BelosError {
-public:
-  LSQRSolMgrOrthoFailure(const std::string& what_arg)
-    : BelosError(what_arg)
-  {}
-};
-
 /** \brief LSQRSolMgrBlockSizeFailure is thrown when the linear problem has
  * more than one RHS.  This is unique to single vector methods.
  *

packages/belos/src/BelosMinresIter.hpp

@@ -74,7 +74,6 @@
 #include "Teuchos_ScalarTraits.hpp"
 #include "Teuchos_ParameterList.hpp"
 #include "Teuchos_TimeMonitor.hpp"
-#include "Teuchos_BLAS.hpp"
 
 namespace Belos {
 
@@ -465,8 +464,6 @@ class MinresIter : virtual public MinresIteration<ScalarType,MV,OP> {
       initialize();
     }
 
-    Teuchos::BLAS<int,ScalarType> blas;
-
     // Create convenience variables for zero and one.
     const ScalarType one = SCT::one();
     const ScalarType zero = SCT::zero();

packages/belos/src/BelosMinresIteration.hpp

@@ -117,26 +117,6 @@ namespace Belos {
     MinresIterateFailure(const std::string& what_arg) : BelosError(what_arg)
     {}};
 
-  /** \brief MinresIterationOrthoFailure is thrown when the MinresIteration object is unable to
-   * compute independent direction vectors in the MinresIteration::iterate() routine.
-   *
-   * This std::exception is thrown from the MinresIteration::iterate() method.
-   *
-   */
-  class MinresIterationOrthoFailure : public BelosError {public:
-    MinresIterationOrthoFailure(const std::string& what_arg) : BelosError(what_arg)
-    {}};
-
-  /** \brief MinresIterationLAPACKFailure is thrown when a nonzero return value is passed back
-   * from an LAPACK routine.
-   *
-   * This std::exception is thrown from the MinresIteration::iterate() method.
-   *
-   */
-  class MinresIterationLAPACKFailure : public BelosError {public:
-    MinresIterationLAPACKFailure(const std::string& what_arg) : BelosError(what_arg)
-    {}};
-
   //@}
 
 

packages/belos/src/BelosMinresSolMgr.hpp

@@ -57,8 +57,6 @@
 #include "BelosStatusTestCombo.hpp"
 #include "BelosStatusTestOutputFactory.hpp"
 #include "BelosOutputManager.hpp"
-#include "Teuchos_BLAS.hpp"
-#include "Teuchos_LAPACK.hpp"
 #ifdef BELOS_TEUCHOS_TIME_MONITOR
 #include "Teuchos_TimeMonitor.hpp"
 #endif