Merge remote-tracking branch 'origin/develop' into atdm-nightly

trilinos · Sep 19, 2020 · 294b04f · 294b04f
2 parents 6507e7b + e17e27e
commit 294b04f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 612 deletions.
diff --git a/cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc-cuda.cmake b/cmake/ctest/drivers/geminga/TrilinosCTestDriverCore.geminga.gcc-cuda.cmake
@@ -101,6 +101,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
 
       ### TPLS ###
       "-DTPL_ENABLE_CUDA:BOOL=ON"
+      "-DCMAKE_POLICY_DEFAULT_CMP0074=NEW"
       "-DTPL_ENABLE_CUSPARSE:BOOL=ON"
       "-DTPL_ENABLE_HWLOC:BOOL=OFF"
 

diff --git a/cmake/ctest/drivers/geminga/cron_driver.sh b/cmake/ctest/drivers/geminga/cron_driver.sh
@@ -76,7 +76,7 @@ export CTEST_CONFIGURATION="nvcc_wrapper"
 module load sems-env
 module load sems-cmake/3.12.2
 module load sems-gcc/8.3.0
-module load sems-boost/1.63.0/base
+module load sems-boost/1.69.0/base
 module load sems-python/2.7.9
 module load sems-zlib/1.2.8/base
 module load sems-openmpi/4.0.2
@@ -115,7 +115,7 @@ module unload sems-cuda/10.1
 module unload sems-openmpi/4.0.2
 module unload sems-zlib/1.2.8/base
 module unload sems-python/2.7.9
-module unload sems-boost/1.63.0/base
+module unload sems-boost/1.69.0/base
 module unload sems-gcc/8.3.0
 module unload sems-cmake/3.12.2
 module unload sems-env

diff --git a/packages/tpetra/core/src/Tpetra_Details_checkPointer.cpp b/packages/tpetra/core/src/Tpetra_Details_checkPointer.cpp
diff --git a/packages/tpetra/core/src/Tpetra_Details_checkPointer.hpp b/packages/tpetra/core/src/Tpetra_Details_checkPointer.hpp