Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20220521_005247 branch to master

Version.cmake

@@ -59,10 +59,10 @@
 # for release mode and set the version.
 #
 
-SET(Trilinos_VERSION 13.1)
+SET(Trilinos_VERSION 13.5)
 SET(Trilinos_MAJOR_VERSION 13)
-SET(Trilinos_MAJOR_MINOR_VERSION 130100)
-SET(Trilinos_VERSION_STRING "13.1 (Dev)")
+SET(Trilinos_MAJOR_MINOR_VERSION 130500)
+SET(Trilinos_VERSION_STRING "13.5 (Dev)")
 SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT ON) # Change to 'OFF' for a release
 
 # Used by testing scripts and should not be used elsewhere

cmake/std/PullRequestLinuxCommonTestingSettings.cmake

@@ -60,6 +60,9 @@ set (Piro_EpetraSolver_MPI_4_DISABLE ON CACHE BOOL "Set by default for PR testin
 # Disable tests that timeout in PR testing until it can be fixed (#4614)
 set (PanzerAdaptersSTK_PoissonInterfaceExample_2d_diffsideids_MPI_1_DISABLE ON CACHE BOOL "Set by default for PR testing")
 
+# Disable tests that randomly fail in PR testing (#10412)
+set (PanzerAdaptersSTK_PoissonInterfaceTpetra_2d_diffsideids_MPI_1_DISABLE ON CACHE BOOL "Set by default for PR testing")
+
 # Disable long-failing Anazazi test until it can be fixed (#3585)
 set (Anasazi_Epetra_OrthoManagerGenTester_0_MPI_4_DISABLE ON CACHE BOOL "Set by default for PR testing")
 

cmake/std/PullRequestLinuxDriver.sh

@@ -34,12 +34,12 @@ function bootstrap_modules() {
             exit -1
         fi
     else
-	source /projects/sems/modulefiles/utils/sems-modules-init.sh
-	module unload sems-git
-	module unload sems-python
-	module load sems-git/2.29.0
-	module load sems-python/3.8.6
-	export PYTHON_EXE=python3
+      	source /projects/sems/modulefiles/utils/sems-modules-init.sh
+      	module unload sems-git
+      	module unload sems-python
+      	module load sems-git/2.29.0
+      	module load sems-python/3.8.6
+      	export PYTHON_EXE=python3
     fi
 
     module list

cmake/std/PullRequestLinuxGCC8.3.0TestingSettings.cmake

@@ -31,6 +31,7 @@ set (Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D ON CACHE BOOL "Temporarily di
 # this build is different from the others in using static libraries
 set (BUILD_SHARED_LIBS OFF CACHE BOOL "Off by default for PR testing in GCC 4.8.4")
 
+set (Zoltan_ch_simple_parmetis_parallel_DISABLE ON CACHE BOOL "Turned off until fixed")
 set(CMAKE_CXX_FLAGS "-fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-inline -Wno-nonnull-compare -Wno-address -Werror -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS" CACHE STRING "Warnings as errors settings")
 
 include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")

cmake/std/PullRequestLinuxIntel17.0.1TestingSettings.cmake

@@ -85,6 +85,12 @@ set (Amesos2_SuperLU_DIST_Solver_Test_MPI_4_DISABLE ON CACHE BOOL
 set (Stratimikos_test_single_amesos2_tpetra_solver_driver_SuperLU_DIST_MPI_1_DISABLE ON CACHE BOOL
   "Temporarily disabled in PR testing")
 
+# These 3 tests have been holding up a few PRs after the autotester has come back.
+# Turning them off so we can get a few PRs merged before we replace Intel 17 with Intel 19.
+set (Zoltan_ch_simple_parmetis_parallel_DISABLE ON CACHE BOOL "Disabled in PR testing")
+set (Zoltan_ch_simple_scotch_parallel_DISABLE ON CACHE BOOL "Disabled in PR testing")
+set (Zoltan_ch_7944_parmetis_parallel_DISABLE ON CACHE BOOL "Disabled in PR testing")
+
 set (Tpetra_INST_INT_INT ON CACHE BOOL "INST_INT_INT ON")
 set (Trilinos_ENABLE_STKBalance OFF CACHE BOOL "Hard disabled since Tpetra_INST_INT_INT=ON in this build" FORCE)
 #STK-TODO: try to remember to come back and remove this when stk-balance

cmake/std/PullRequestLinuxIntel19.0.5TestingSettings.cmake

@@ -57,18 +57,6 @@ set (ROL_test_step_TrustRegion_MPI_1_DISABLE ON CACHE BOOL "Temporarily disabled
 set (ROL_tutorial_BoundAndInequality_MPI_1_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
 
 
-# Tests turned off until an issue with Scotch can be resolved
-set (Zoltan2_scotch_example_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Zoltan2_Partitioning1_VWeights_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Zoltan2_Partitioning1_OneProc_VWeights_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Zoltan2_Partitioning1_OneProc_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Zoltan2_Partitioning1_OneProc_EWeights_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Zoltan2_Partitioning1_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Zoltan2_Partitioning1_EWeights_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Zoltan2_pamgenMeshAdapterTest_scotch_MPI_4_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Phalanx_dynamic_data_layout_MPI_1_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
-set (Zoltan_ENABLE_Scotch OFF CACHE BOOL "Temporarily disabled in PR testing")
-
 # Misc options typically added by CI testing mode in TriBITS
 
 # Use the below option only when submitting to the dashboard

cmake/std/PullRequestLinuxWeaverTestingSettings.cmake

@@ -128,6 +128,9 @@ 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")
 
+# Disable randomly failing test (#10420)
+set (Krino_krino_unit_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+
 # Disable a few failing tests for initial release of Cuda 10.2.2 PR build
 set (EpetraExt_inout_test_LL_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 set (EpetraExt_inout_test_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")

cmake/std/PullRequestLinuxWeaverUvmOffTestingSettings.cmake

@@ -131,6 +131,9 @@ 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")
 
+# Disable randomly failing test (#10420)
+set (Krino_krino_unit_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+
 # Disable a few failing tests for initial release of Cuda 10.2.2 PR build
 set (EpetraExt_inout_test_LL_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 set (EpetraExt_inout_test_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")

cmake/std/pr_config/pullrequest.ini

@@ -161,18 +161,15 @@ setenv PATH:       "/projects/sierra/linux_rh7/install/Python/3.6.3/share/bin:${
 unsetenv PATH_TMP:
 
 
-[MODULE-PURGE]
-module-purge:
-
 
-[SEMS-ENV]
-use MODULE-PURGE:
+[SEMS-ARCHIVE-ENV]
+module-purge:
 module-use: /projects/sems/modulefiles/projects
 module-load sems-archive-env:
 
 
 
-[SEMS-DEFAULT]
+[SEMS-ARCHIVE-DEFAULT]
 module-load sems-archive-openmpi  : 1.10.1
 module-load sems-archive-boost    : 1.63.0/base
 module-load sems-archive-zlib     : 1.2.8/base
@@ -183,7 +180,26 @@ module-load sems-archive-scotch   : 6.0.3/nopthread_64bit_parallel
 module-load sems-archive-superlu  : 4.3/base
 module-load sems-archive-git      : 2.10.1
 module-load sems-archive-cmake    : 3.17.1
-#module-load sems-archive-python: 3.5.2
+use SIERRA-PYTHON-3.6.3:
+setenv OMP_NUM_THREADS    : 2
+
+
+
+[SEMS-DEFAULT]
+module-load sems-git            : 2.11.1
+module-load sems-openmpi        : 4.0.5
+module-load sems-boost          : 1.74.0
+module-load sems-zlib           : 1.2.11
+module-load sems-hdf5           : 1.10.7
+module-load sems-netcdf-c       : 4.7.3
+module-load sems-netcdf-cxx     : 4.2
+module-load sems-netcdf-fortran : 4.5.3
+module-load sems-parallel-netcdf: 1.12.1
+module-load sems-metis-int64    : 5.1.0
+module-load sems-parmetis-int64 : 4.0.3
+module-load sems-scotch-int64   : 6.0.3
+module-load sems-superlu        : 4.3
+module-load sems-cmake          : 3.18.4
 use SIERRA-PYTHON-3.6.3:
 setenv OMP_NUM_THREADS    : 2
 
@@ -200,19 +216,19 @@ module-load atdm-ninja_fortran: 1.7.2
 
 
 [Trilinos_pullrequest_gcc_4.8.4]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 use ATDM-ENV:
 module-load sems-archive-gcc: 4.8.4
-use SEMS-DEFAULT:
+use SEMS-ARCHIVE-DEFAULT:
 use ATDM-DEFAULT:
 
 
 
 [Trilinos_pullrequest_gcc_4.9.3_SERIAL]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 use ATDM-ENV:
 module-load sems-archive-gcc: 4.9.3
-use SEMS-DEFAULT:
+use SEMS-ARCHIVE-DEFAULT:
 use ATDM-DEFAULT:
 module-remove sems-archive-hdf5:
 module-remove sems-archive-netcdf:
@@ -226,12 +242,11 @@ setenv OMP_NUM_THREADS: 1
 
 
 
-
 [Trilinos_pullrequest_gcc_7.2.0]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 use ATDM-ENV:
 module-load sems-archive-gcc: 7.2.0
-use SEMS-DEFAULT:
+use SEMS-ARCHIVE-DEFAULT:
 use ATDM-DEFAULT:
 
 
@@ -242,7 +257,7 @@ use Trilinos_pullrequest_gcc_7.2.0:
 
 
 [Trilinos_pullrequest_gcc_7.2.0_serial]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 module-load sems-archive-git: 2.10.1
 module-load sems-archive-gcc: 7.2.0
 #module-load sems-archive-python: 2.7.9
@@ -262,24 +277,20 @@ setenv OMP_NUM_THREADS: 2
 
 
 [Trilinos_pullrequest_gcc_8.3.0]
-use SEMS-ENV:
-use ATDM-ENV:
-module-load sems-archive-gcc: 8.3.0
-module-load sems-archive-ninja_fortran: 1.10.0
+module-purge:
+module-load sems-gcc: 8.3.0
+module-load sems-ninja: 1.10.1
 use SEMS-DEFAULT:
-use ATDM-DEFAULT:
-module-remove sems-archive-boost:
-module-load sems-archive-boost: 1.66.0/base
 
 
 
 [Trilinos_pullrequest_intel_17.0.1]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 use ATDM-ENV:
 module-load sems-archive-gcc: 5.3.0
 module-load sems-archive-intel: 17.0.1
 module-load sems-archive-mpich: 3.2
-use SEMS-DEFAULT:
+use SEMS-ARCHIVE-DEFAULT:
 module-remove sems-archive-openmpi:
 module-remove sems-archive-superlu:
 module-load sems-archive-superlu_dist: 5.2.2/32bit_parallel
@@ -289,40 +300,36 @@ setenv LDFLAGS: -lifcore
 
 
 [Trilinos_pullrequest_intel_19.0.5]
-use SEMS-ENV:
-use ATDM-ENV:
-module-load sems-archive-gcc: 6.1.0
-module-load sems-archive-intel: 19.0.5
-module-load sems-archive-mpich: 3.2
+module-purge:
+module-load sems-intel: 19.0.5
+module-load sems-mpich: 3.2.1
 use SEMS-DEFAULT:
-module-remove sems-archive-openmpi:
-use ATDM-DEFAULT:
 setenv LDFLAGS: -lifcore
 
 
 
 [Trilinos_pullrequest_clang_7.0.1]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 use ATDM-ENV:
 module-load sems-archive-gcc: 5.3.0
 module-load sems-archive-clang: 7.0.1
-use SEMS-DEFAULT:
+use SEMS-ARCHIVE-DEFAULT:
 use ATDM-DEFAULT:
 
 
 
 [Trilinos_pullrequest_clang_9.0.0]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 use ATDM-ENV:
 module-load sems-archive-gcc: 5.3.0
 module-load sems-archive-clang: 9.0.0
-use SEMS-DEFAULT:
+use SEMS-ARCHIVE-DEFAULT:
 use ATDM-DEFAULT:
 
 
 
 [Trilinos_pullrequest_clang_10.0.0]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 module-load sems-archive-git: 2.10.1
 module-load sems-archive-gcc: 5.3.0
 module-load sems-archive-clang: 10.0.0
@@ -371,8 +378,10 @@ setenv PATH_TMP: /ascldap/users/rabartl/install/white-ride/ninja-1.8.2/bin:${PAT
 setenv PATH:     /home/atdm-devops-admin/tools/ride/cmake-3.17.2/bin:${PATH_TMP}
 unsetenv PATH_TMP:
 
+
+
 [Trilinos_pullrequest_cuda_11.4-spack_weaver]
-use MODULE-PURGE:
+module-purge:
 module-load devpack: openmpi/4.1.1/gcc/8.3.1/cuda/11.4
 setenv OMPI_CXX: ${WORKSPACE}/Trilinos/packages/kokkos/bin/nvcc_wrapper
 setenv OMPI_CC: ${CC}
@@ -382,8 +391,10 @@ setenv CUDA_MANAGED_FORCE_DEVICE_ALLOC: 1
 setenv Trilinos_CTEST_RUN_CUDA_AWARE_MPI: 1
 setenv TPETRA_ASSUME_CUDA_AWARE_MPI: 1
 
+
+
 [Trilinos_pullrequest_cuda_10.2.2-spack_weaver]
-use MODULE-PURGE:
+module-purge:
 module-use: /home/projects/ppc64le-pwr9-nvidia/spack/share/spack/modules/linux-rhel7-ppc64le
 module-load devpack: 20210226/openmpi/4.0.5/gcc/7.2.0/cuda/10.2.2-spack-testing
 setenv OMPI_CXX: ${WORKSPACE}/Trilinos/packages/kokkos/bin/nvcc_wrapper
@@ -394,8 +405,10 @@ setenv CUDA_MANAGED_FORCE_DEVICE_ALLOC: 1
 setenv Trilinos_CTEST_RUN_CUDA_AWARE_MPI: 1
 setenv TPETRA_ASSUME_CUDA_AWARE_MPI: 1
 
+
+
 [Trilinos_pullrequest_cuda_weaver]
-use MODULE-PURGE:
+module-purge:
 module-load devpack: 20190814/openmpi/4.0.1/gcc/7.2.0/cuda/10.1.105
 module-unload cmake:
 module-load cmake: 3.19.3
@@ -407,9 +420,13 @@ setenv CUDA_MANAGED_FORCE_DEVICE_ALLOC: 1
 setenv Trilinos_CTEST_RUN_CUDA_AWARE_MPI: 1
 setenv TPETRA_ASSUME_CUDA_AWARE_MPI: 1
 
+
+
 [Trilinos_pullrequest_cuda_weaver_uvm_off]
 use Trilinos_pullrequest_cuda_weaver:
 
+
+
 [Trilinos_pullrequest_cuda_10.1.243]
 module-load StdEnv:
 module-load git: 2.20.0
@@ -446,12 +463,19 @@ unsetenv PATH_TMP:
 
 
 [Trilinos_pullrequest_gcc_8.3.0_installation_testing]
-use Trilinos_pullrequest_gcc_8.3.0:
+use SEMS-ARCHIVE-ENV:
+use ATDM-ENV:
+module-load sems-archive-gcc: 8.3.0
+module-load sems-archive-ninja_fortran: 1.10.0
+use SEMS-ARCHIVE-DEFAULT:
+use ATDM-DEFAULT:
+module-remove sems-archive-boost:
+module-load sems-archive-boost: 1.66.0/base
 
 
 
 [Trilinos_pullrequest_python_3]
-use SEMS-ENV:
+use SEMS-ARCHIVE-ENV:
 use ATDM-ENV:
 module-load sems-archive-gcc: 7.2.0
 use ATDM-DEFAULT: