From 406a7eb173de676b9e0192e30bf61f78cd448227 Mon Sep 17 00:00:00 2001 From: Jerry Watkins Date: Tue, 11 Oct 2022 17:25:48 -0600 Subject: [PATCH] Update weaver modules to use different git/cmake and add c++17 to weaver build - towards #841 & #842 --- doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos | 2 +- doc/dashboards/weaver.sandia.gov/weaver_modules_cuda.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos b/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos index 77c41ce05f..52273752f0 100644 --- a/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos +++ b/doc/dashboards/weaver.sandia.gov/do-cmake-weaver-trilinos @@ -30,7 +30,6 @@ cmake \ -D Trilinos_ASSERT_MISSING_PACKAGES:BOOL=OFF \ -D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \ -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \ - -D Trilinos_ENABLE_CXX11:BOOL=ON \ -D Trilinos_ENABLE_EXAMPLES:BOOL=OFF \ -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON \ -D Trilinos_VERBOSE_CONFIGURE:BOOL=OFF \ @@ -126,4 +125,5 @@ cmake \ -D Kokkos_ENABLE_LIBDL:BOOL=ON \ -D Trilinos_ENABLE_PanzerDofMgr:BOOL=ON \ -D Trilinos_ENABLE_ShyLU_DDFROSch:BOOL=ON \ + -D CMAKE_CXX_STANDARD=17 \ ../ diff --git a/doc/dashboards/weaver.sandia.gov/weaver_modules_cuda.sh b/doc/dashboards/weaver.sandia.gov/weaver_modules_cuda.sh index d98246b4cf..e2885cc5b8 100755 --- a/doc/dashboards/weaver.sandia.gov/weaver_modules_cuda.sh +++ b/doc/dashboards/weaver.sandia.gov/weaver_modules_cuda.sh @@ -1,6 +1,6 @@ #!/bin/bash module purge -module load git/2.31.1 cmake/3.21.2 +module load git/2.10.1 cmake/3.24.2 module load cuda/11.2.2/gcc/8.3.1 module load openmpi/4.1.1/gcc/8.3.1/cuda/11.2.2 module load openblas/0.3.18/gcc/8.3.1