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

PackagesList.cmake

@@ -112,6 +112,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
   Compadre              packages/compadre                 ST
   STK                   packages/stk                      PT # Depends on boost
   Percept               packages/percept                  PT # Depends on boost
+  Krino                 packages/krino                    PT # Depends on boost
   SCORECapf_zoltan      SCOREC/zoltan                     ST
   SCORECapf_stk         SCOREC/stk                        ST
   SCORECma              SCOREC/ma                         ST

cmake/std/PullRequestLinuxCuda10.1.105TestingSettings.cmake

@@ -78,7 +78,9 @@ set (TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH "Set by default for CUDA PR testi
 # The compile times for two Panzer files went up to over 6 hours. This
 # turns off one feature that allows these in about 24 minutes. Please remove
 # when issue #7532 is resolved.
-set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" )
+# Compile time issues addressed by #8377. Commenting out the override of 
+# Sacado_NEW_FAD_DESIGN_IS_DEFAULT to return to default settings.
+#set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" )
 
 # Disable some packages that can't be tested with this PR build
 set (Trilinos_ENABLE_ShyLU_NodeTacho OFF CACHE BOOL

cmake/std/PullRequestLinuxCuda10.1.105uvmOffTestingSettings.cmake

@@ -77,7 +77,9 @@ set (TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH "Set by default for CUDA PR testi
 # The compile times for two Panzer files went up to over 6 hours. This
 # turns off one feature that allows these in about 24 minutes. Please remove
 # when issue #7532 is resolved.
-set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" )
+# Compile time issues addressed by #8377. Commenting out the override of 
+# Sacado_NEW_FAD_DESIGN_IS_DEFAULT to return to default settings.
+#set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" )
 
 # Disable some packages that can't be tested with this PR build
 set (Trilinos_ENABLE_ShyLU_NodeTacho OFF CACHE BOOL
@@ -146,7 +148,6 @@ set (Domi_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 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 (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")
 set (ShyLU_DD_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (STK_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")

cmake/std/PullRequestLinuxCuda10.1.243TestingSettings.cmake

@@ -84,7 +84,9 @@ set (TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH "Set by default for CUDA PR testi
 # The compile times for two Panzer files went up to over 6 hours. This
 # turns off one feature that allows these in about 24 minutes. Please remove
 # when issue #7532 is resolved.
-set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" )
+# Compile time issues addressed by #8377. Commenting out the override of 
+# Sacado_NEW_FAD_DESIGN_IS_DEFAULT to return to default settings.
+#set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" )
 
 # Disable some packages that can't be tested with this PR build
 set (Trilinos_ENABLE_ShyLU_NodeTacho OFF CACHE BOOL

cmake/std/PullRequestLinuxCuda11Driver.sh

@@ -0,0 +1,29 @@
+#!/bin/bash -l
+
+if [ "${BSUB_CTEST_TIME_LIMIT}" == "" ] ; then
+  export BSUB_CTEST_TIME_LIMIT=12:00
+fi
+
+if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
+  export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
+fi
+
+# comment out sh and add what we need individually.
+#source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
+
+set -x
+
+#TODO: review appropriate job size
+#cuda 10.1.105 will be built with rhel7G
+
+bsub -x -q dev -Is -n 20 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+
+#if [[ "${JOB_NAME}" == "trilinos-folder/Trilinos_pullrequest_cuda_10.1.105"* ]] ; then
+#  bsub -x -Is -q rhel7G -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+#else
+#  bsub -x -Is -q rhel7F -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+#fi
+# NOTE: Above, this bsub command should grab a single rhel7F (Firestone,
+# Dual-Socket POWER8, 8 cores per socket, K80 GPUs) node.  The option '-x'
+# makes sure that only this job runs on that node.  The options '-n 16' and
+# '-q rhel7G' should make bsub allocate a single one of these nodes.

cmake/std/PullRequestLinuxCudaDriver.sh

@@ -15,11 +15,14 @@ set -x
 
 #TODO: review appropriate job size
 #cuda 10.1.105 will be built with rhel7G
-if [[ "${JOB_NAME}" == "trilinos-folder/Trilinos_pullrequest_cuda_10.1.105"* ]] ; then
-  bsub -x -Is -q rhel7G -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
-else
-  bsub -x -Is -q rhel7F -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
-fi
+
+bsub -x -Is -n 20 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+
+#if [[ "${JOB_NAME}" == "trilinos-folder/Trilinos_pullrequest_cuda_10.1.105"* ]] ; then
+#  bsub -x -Is -q rhel7G -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+#else
+#  bsub -x -Is -q rhel7F -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+#fi
 # NOTE: Above, this bsub command should grab a single rhel7F (Firestone,
 # Dual-Socket POWER8, 8 cores per socket, K80 GPUs) node.  The option '-x'
 # makes sure that only this job runs on that node.  The options '-n 16' and

cmake/std/PullRequestLinuxCudaWeaverDriver.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -l
+
+if [ "${BSUB_CTEST_TIME_LIMIT}" == "" ] ; then
+  export BSUB_CTEST_TIME_LIMIT=12:00
+fi
+
+if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
+  export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
+fi
+
+# comment out sh and add what we need individually.
+#source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
+
+set -x
+
+#TODO: review appropriate job size
+bsub -Is -n20 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} \
+  ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+
+# NOTE: Above, this bsub command should grab a two
+# nodes.  The option '-x' makes sure that only this
+# job runs on those nodes.

cmake/std/PullRequestLinuxDriver.sh

@@ -12,10 +12,10 @@ function bootstrap_modules() {
     print_banner "Bootstrap environment modules start"
 
     cuda_regex=".*(_cuda_).*"
-    ride_regex=".*(ride).*"
+    weaver_regex=".*(weaver).*"
     vortex_regex=".*(vortex).*"
     if [[ ${JOB_BASE_NAME:?} =~ ${cuda_regex} ]]; then
-        if [[ ${NODE_NAME:?} =~ ${ride_regex} ]]; then
+        if [[ ${NODE_NAME:?} =~ ${weaver_regex} ]]; then
             message_std "PRDriver> " "Job is CUDA"
             module unload git
             module unload python
@@ -34,10 +34,10 @@ 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.10.1
+        source /projects/sems/modulefiles/utils/sems-archive-modules-init.sh
+        module unload sems-archive-git
+        module unload sems-archive-python
+        module load sems-archive-git/2.10.1
 
 #        module load sems-python/3.5.2      # Currently not on cloud nodes
 #        #pip3 install --user configparser
@@ -68,9 +68,11 @@ function bootstrap_modules() {
 print_banner "PullRequestLinuxDriver.sh"
 
 # Set up Sandia PROXY environment vars
-export https_proxy=http://proxy.sandia.gov:80
-export http_proxy=http://proxy.sandia.gov:80
-export no_proxy='localhost,.sandia.gov,localnets,127.0.0.1,169.254.0.0/16,forge.sandia.gov'
+if [[ "${TRILINOS_PR_DO_NOT_SET_PROXY}}" == "" ]] ; then
+  export https_proxy=http://proxy.sandia.gov:80
+  export http_proxy=http://proxy.sandia.gov:80
+  export no_proxy='localhost,.sandia.gov,localnets,127.0.0.1,169.254.0.0/16,forge.sandia.gov'
+fi
 
 
 # bootstrap the python and git modules for this system
@@ -178,6 +180,3 @@ message_std "PRDriver> " "cd $(pwd)"
 message_std "PRDriver> " "${test_cmd:?} --pullrequest-cdash-track='${PULLREQUEST_CDASH_TRACK:?}'"
 ${test_cmd} --pullrequest-cdash-track="${PULLREQUEST_CDASH_TRACK:?}"
 exit $?
-
-
-

cmake/std/PullRequestLinuxGCC8.3.0TestingSettings.cmake

@@ -31,6 +31,6 @@ 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")
 
-include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")
-
 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")