Merge branch 'develop' of github.com:trilinos/Trilinos into jewatkins…

…/muelu-semicoarsen-kokkos
trilinos · Sep 7, 2021 · f1e61dc · f1e61dc
2 parents d37961c + 686ca6c
commit f1e61dc
Show file tree

Hide file tree

Showing 551 changed files with 36,304 additions and 12,031 deletions.
diff --git a/cmake/std/atdm/ATDMDisables.cmake b/cmake/std/atdm/ATDMDisables.cmake
@@ -327,4 +327,7 @@ IF (ATDM_NODE_TYPE STREQUAL "CUDA")
   ATDM_SET_ENABLE(KokkosCore_UnitTest_CudaInterOpStreams_MPI_1_SET_RUN_SERIAL ON)
   # See #8543.
   ATDM_SET_ENABLE(KokkosCore_UnitTest_CudaInterOpInit_MPI_1_SET_RUN_SERIAL ON)
+
+  # Attempt to address intermittent timeouts reported in #6805
+  ATDM_SET_ENABLE(KokkosKernels_sparse_cuda_MPI_1_SET_RUN_SERIAL ON)
 ENDIF()
diff --git a/packages/framework/pr_tools/PullRequestLinuxCudaDriver.sh b/packages/framework/pr_tools/PullRequestLinuxCudaDriver.sh
@@ -9,16 +9,16 @@ if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
 fi
 
 # comment out sh and add what we need individually.
-#source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
+#source $WORKSPACE/Trilinos/packages/framework/pr_tools/atdm/load-env.sh $JOB_NAME
 
 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
+  bsub -x -Is -q rhel7G -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/packages/framework/pr_tools/PullRequestLinuxDriver.sh
 else
-  bsub -x -Is -q rhel7F -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+  bsub -x -Is -q rhel7F -n 16 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} ${WORKSPACE}/Trilinos/packages/framework/pr_tools/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'

diff --git a/packages/framework/pr_tools/PullRequestLinuxCudaVortexDriver.sh b/packages/framework/pr_tools/PullRequestLinuxCudaVortexDriver.sh
@@ -9,13 +9,13 @@ if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
 fi
 
 # comment out sh and add what we need individually.
-#source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
+#source $WORKSPACE/Trilinos/packages/framework/pr_tools/atdm/load-env.sh $JOB_NAME
 
 set -x
 
 #TODO: review appropriate job size
 bsub -Is -nnodes 2 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} \
-  ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+  ${WORKSPACE}/Trilinos/packages/framework/pr_tools/PullRequestLinuxDriver.sh
 
 # NOTE: Above, this bsub command should grab a two
 # nodes.  The option '-x' makes sure that only this

diff --git a/packages/framework/pr_tools/PullRequestLinuxDriver-old.sh b/packages/framework/pr_tools/PullRequestLinuxDriver-old.sh