Merge Pull Request #7412 from trilinos/Trilinos/master_merge_20200522…

…_000615

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20200522_000615 branch to master
PR Author: trilinos-autotester

cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake

@@ -110,4 +110,10 @@ set (PanzerMiniEM_MiniEM-BlockPrec_Augmentation_MPI_4_DISABLE ON CACHE BOOL "Tem
 set (PanzerMiniEM_MiniEM-BlockPrec_RefMaxwell_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 set (ROL_example_PDE-OPT_poisson-boltzmann_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 
+# Disable a couple of unit tests in test KokkosCore_UnitTest_Cuda_MPI_1 that
+# are randomly failing in PR test iterations (#6799)
+set (KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS
+  "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution"
+  CACHE STRING "Temporary disable for CUDA PR testing")
+
 include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")

cmake/std/atdm/ATDMDisables.cmake

@@ -306,4 +306,10 @@ IF (ATDM_NODE_TYPE STREQUAL "CUDA")
   # Disable ctest DISABLED test (otherwise, this shows up on CDash as "NotRun")
   ATDM_SET_ENABLE(KokkosContainers_PerformanceTest_Cuda_DISABLE ON)
 
+  # Disable a couple of unit tests in test KokkosCore_UnitTest_Cuda_MPI_1
+  # (#6799)
+  ATDM_SET_CACHE(KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS
+    "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution"
+    CACHE STRING )
+
 ENDIF()

cmake/std/atdm/waterman/tweaks/Tweaks.cmake

@@ -50,6 +50,12 @@ IF (ATDM_NODE_TYPE STREQUAL "CUDA")
   # Disable known falure for ROL CUDA builds (#3543)
   ATDM_SET_ENABLE(ROL_test_elementwise_TpetraMultiVector_MPI_4_DISABLE ON)
 
+  # Disable known failure (#6329)
+  ATDM_SET_ENABLE(ROL_NonlinearProblemTest_MPI_4_DISABLE ON)
+
+  # Disable known randomly timing out test (#7090)
+  ATDM_SET_ENABLE(MueLu_ParameterListInterpreterTpetra_MPI_1_DISABLE ON)
+
   IF (ATDM_CUDA_RDC)
 
     # Disable the build of SEACAS 'explore' for all cuda+rdc builds for now (#6008)

packages/amesos2/example/GappedMtxGIDs-1proc.cpp

@@ -241,7 +241,8 @@ int main(int argc, char *argv[]) {
 
     if( !Amesos2::query(solverName) ){
       std::cerr << solverName << " not enabled.  Exiting..." << endl;
-      return EXIT_FAILURE;
+      return EXIT_SUCCESS;        // Otherwise CTest will pick it up as
+                                  // failure, which it isn't really
     }
 
     RCP<Amesos2::Solver<MAT,MV> > solver = Amesos2::create<MAT,MV>(solverName, A, Xhat, RHS);

packages/amesos2/example/SimpleSolveNonContigMap.cpp

@@ -146,8 +146,7 @@ int main(int argc, char *argv[]) {
     "The non-contiguous map claims to be contiguous.");
 
 
-  //RCP<MAT> A = rcp( new MAT(map,3) ); // max of three entries in a row
-  RCP<MAT> A = rcp( new MAT(map,0) );
+  RCP<MAT> A = rcp( new MAT(map,3) );
 
   /*
    * We will solve a system with a known solution, for which we will be using

packages/amesos2/src/basker/basker_def.hpp

@@ -238,8 +238,8 @@ namespace BaskerClassicNS{
     //U->val =     (Entry *) BASKERCALLOC(U->nnz, sizeof(Entry));
     U->val = new Entry[U->nnz]();
 
-    if((L->col_ptr == NULL) || (L->row_idx == NULL) || (L->val == NULL) ||
-       (U->col_ptr == NULL) || (U->row_idx == NULL) || (U->val == NULL))
+    if((L->col_ptr == nullptr) || (L->row_idx == nullptr) || (L->val == nullptr) ||
+       (U->col_ptr == nullptr) || (U->row_idx == nullptr) || (U->val == nullptr))
       {
         ierr = -1;
         return ierr;
@@ -257,7 +257,7 @@ namespace BaskerClassicNS{
     pinv = new Int[ncol+1]();
 
 
-    if( (tptr == NULL) || (X == NULL) || (pinv == NULL) )
+    if( (tptr == nullptr) || (X == nullptr) || (pinv == nullptr) )
       {
         ierr = -2;
         return ierr;
@@ -600,8 +600,9 @@ namespace BaskerClassicNS{
     cout << endl;
 #endif
 
-    //BASKERFREE(X);
-    //BASKERFREE(tptr);
+    // Cleanup workspace allocations
+    delete [] X;
+    delete [] color;
 
     actual_lnnz = lnnz;
     actual_unnz = unnz;
@@ -645,7 +646,7 @@ namespace BaskerClassicNS{
     //*val     = (Entry *) BASKERCALLOC(L->nnz, sizeof(Entry));
     *val = new Entry[L->nnz];
 
-    if( (*col_ptr == NULL) || (*row_idx == NULL) || (*val == NULL) )
+    if( (*col_ptr == nullptr) || (*row_idx == nullptr) || (*val == nullptr) )
       {
         return -1;
       }
@@ -678,7 +679,7 @@ namespace BaskerClassicNS{
     //*val     = (Entry *) BASKERCALLOC(U->nnz, sizeof(Entry));
     *val = new Entry[U->nnz];
 
-    if( (*col_ptr == NULL) || (*row_idx == NULL) || (*val == NULL) )
+    if( (*col_ptr == nullptr) || (*row_idx == nullptr) || (*val == nullptr) )
       {
         return -1;
       }
@@ -702,7 +703,7 @@ namespace BaskerClassicNS{
     //*p = (Int *) BASKERCALLOC(A->nrow, sizeof(Int));
     *p = new Int[A->nrow];
 
-    if( (*p == NULL ) )
+    if( (*p == nullptr ) )
       {
         return -1;
       }
@@ -858,7 +859,7 @@ namespace BaskerClassicNS{
     B->row_idx = (Int *) BASKERCALLOC(A->nnz, sizeof(Int));
     B->val     = (Entry *) BASKERCALLOC(A->val, sizeof(Int));
 
-    if( (B->col_ptr == NULL) || (B->row_idx == NULL) || (B->val == NULL) )
+    if( (B->col_ptr == nullptr) || (B->row_idx == nullptr) || (B->val == nullptr) )
       {
         perm_flag = false;
         return -1;

packages/amesos2/test/solvers/Basker_UnitTests.cpp

@@ -386,7 +386,7 @@ namespace {
    */
 
 
-  TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( Basker, NonContgGID, SCALAR, LO, GO )
+  TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( Basker, NonContigGID, SCALAR, LO, GO )
   {
     typedef CrsMatrix<SCALAR,LO,GO,Node> MAT;
     typedef ScalarTraits<SCALAR> ST;
@@ -427,8 +427,7 @@ namespace {
           std::logic_error,
           "Basker NonContigGID Test: The non-contiguous map claims to be contiguous.");
 
-      //RCP<MAT> A = rcp( new MAT(map,3) ); // max of three entries in a row
-      RCP<MAT> A = rcp( new MAT(map,0) );
+      RCP<MAT> A = rcp( new MAT(map,3) );
       A->setObjectLabel("A");
 
       /*
@@ -777,7 +776,7 @@ namespace {
   TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( Basker, SymbolicFactorization, SCALAR, LO, GO ) \
   TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( Basker, NumericFactorization, SCALAR, LO, GO ) \
   TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( Basker, Solve, SCALAR, LO, GO ) \
-  TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( Basker, NonContgGID, SCALAR, LO, GO )
+  TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( Basker, NonContigGID, SCALAR, LO, GO )
 
 #define UNIT_TEST_GROUP_ORDINAL( ORDINAL )              \
   UNIT_TEST_GROUP_ORDINAL_ORDINAL( ORDINAL, ORDINAL )

packages/amesos2/test/solvers/KLU2_UnitTests.cpp

@@ -416,7 +416,7 @@ namespace {
     TEST_COMPARE_FLOATING_ARRAYS( xhatnorms, xnorms, 0.005 );
   }
 
-  TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( KLU2, NonContgGID, SCALAR, LO, GO )
+  TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( KLU2, NonContigGID, SCALAR, LO, GO )
   {
     typedef CrsMatrix<SCALAR,LO,GO,Node> MAT;
     typedef ScalarTraits<SCALAR> ST;
@@ -457,7 +457,6 @@ namespace {
           std::logic_error,
           "KLU2 NonContigGID Test: The non-contiguous map claims to be contiguous.");
 
-      //RCP<MAT> A = rcp( new MAT(map,3) ); // max of three entries in a row
       RCP<MAT> A = rcp( new MAT(map,3) );
       A->setObjectLabel("A");
 
@@ -802,7 +801,7 @@ namespace {
   TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( KLU2, NumericFactorizationNullThrows, SCALAR, LO, GO ) \
   TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( KLU2, Solve, SCALAR, LO, GO ) \
   TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( KLU2, SolveTrans, SCALAR, LO, GO ) \
-  TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( KLU2, NonContgGID, SCALAR, LO, GO )
+  TEUCHOS_UNIT_TEST_TEMPLATE_3_INSTANT( KLU2, NonContigGID, SCALAR, LO, GO )
 
 #define UNIT_TEST_GROUP_ORDINAL( ORDINAL )              \
   UNIT_TEST_GROUP_ORDINAL_ORDINAL( ORDINAL, ORDINAL )

packages/amesos2/test/solvers/ShyLUBasker_UnitTests.cpp

@@ -422,7 +422,7 @@ namespace {
    */
 
 
-  TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( ShyLUBasker, NonContgGID, SCALAR, LO, GO )
+  TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( ShyLUBasker, NonContigGID, SCALAR, LO, GO )
   {
     typedef CrsMatrix<SCALAR,LO,GO,Node> MAT;
     typedef ScalarTraits<SCALAR> ST;
@@ -463,8 +463,7 @@ namespace {
           std::logic_error,
           "ShyLUBasker NonContigGID Test: The non-contiguous map claims to be contiguous.");
 
-      //RCP<MAT> A = rcp( new MAT(map,3) ); // max of three entries in a row
-      RCP<MAT> A = rcp( new MAT(map,0) );
+      RCP<MAT> A = rcp( new MAT(map,3) );
       A->setObjectLabel("A");
 
       /*

packages/phalanx/cmake/Dependencies.cmake

@@ -1,6 +1,6 @@
 SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosParameterList TeuchosComm KokkosCore KokkosContainers Sacado)
 SET(LIB_OPTIONAL_DEP_PACKAGES )
-SET(TEST_REQUIRED_DEP_PACKAGES Shards KokkosKernels)
+SET(TEST_REQUIRED_DEP_PACKAGES KokkosKernels)
 SET(TEST_OPTIONAL_DEP_PACKAGES )
 SET(LIB_REQUIRED_DEP_TPLS )
 SET(LIB_OPTIONAL_DEP_TPLS )