From 6cc493e53a4638241fe9f68b8d5d6ae7b108ac77 Mon Sep 17 00:00:00 2001 From: Matteo Cusini <49037133+CusiniM@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:03:03 -0800 Subject: [PATCH] chore: upgrade Trilinos. (#3475) * chore: upgrade Trilinos. * update LvArray for lc path. udpate GEOS_TPL_TAG --------- Co-authored-by: Randolph Settgast --- .devcontainer/devcontainer.json | 2 +- host-configs/LLNL/lassen-clang-10-cuda-11.cmake | 6 +++--- host-configs/LLNL/lassen-clang-13-cuda-11.cmake | 4 ++-- host-configs/LLNL/lassen-gcc-8-cuda-11.cmake | 2 ++ src/coreComponents/LvArray | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 216993fba02..28ba75bfd2b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "286-547" + "GEOS_TPL_TAG": "288-584" } }, "runArgs": [ diff --git a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake index 74c04803ed8..9c9ff7de26c 100644 --- a/host-configs/LLNL/lassen-clang-10-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-10-cuda-11.cmake @@ -1,7 +1,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-10-cuda-11.cmake) # Fortran -set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/bin/xlf_r CACHE PATH "") +set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2023.06.28/xlf/16.1.1/bin/xlf CACHE PATH "") set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "") set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "") @@ -9,8 +9,8 @@ set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-10.0.1-gcc-8.3.1 CACHE PATH "") -set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0/bin/mpifort CACHE PATH "") +set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) -set(ENABLE_CUDA_NVTOOLSEXT OFF CACHE BOOL "") \ No newline at end of file +set(ENABLE_CUDA_NVTOOLSEXT ON CACHE BOOL "") \ No newline at end of file diff --git a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake index 428274e26d2..c57f0014e51 100644 --- a/host-configs/LLNL/lassen-clang-13-cuda-11.cmake +++ b/host-configs/LLNL/lassen-clang-13-cuda-11.cmake @@ -1,7 +1,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-clang-13-cuda-11.cmake) # Fortran -set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/bin/xlf_r CACHE PATH "") +set(CMAKE_Fortran_COMPILER /usr/tce/packages/xl/xl-2023.06.28/xlf/16.1.1/bin/xlf CACHE PATH "") set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -qarch=pwr9 -qtune=pwr9" CACHE STRING "") set(FORTRAN_MANGLE_NO_UNDERSCORE ON CACHE BOOL "") set(OpenMP_Fortran_FLAGS "-qsmp=omp" CACHE STRING "") @@ -9,7 +9,7 @@ set(OpenMP_Fortran_LIB_NAMES "" CACHE STRING "") # MPI set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-13.0.1-gcc-8.3.1 CACHE PATH "") -set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0/bin/mpifort CACHE PATH "") +set(MPI_Fortran_COMPILER /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0/bin/mpifort CACHE PATH "") include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) diff --git a/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake b/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake index fa12811e52e..3e9fd6783d7 100644 --- a/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake +++ b/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake @@ -14,4 +14,6 @@ set(FORTRAN_MANGLE_NO_UNDERSCORE OFF CACHE BOOL "") set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1 CACHE PATH "") set(MPI_Fortran_COMPILER ${MPI_HOME}/bin/mpifort CACHE PATH "") +set(ENABLE_CUDA_NVTOOLSEXT ON CACHE BOOL "") + include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake) diff --git a/src/coreComponents/LvArray b/src/coreComponents/LvArray index 9b1c0049497..00e3ead6706 160000 --- a/src/coreComponents/LvArray +++ b/src/coreComponents/LvArray @@ -1 +1 @@ -Subproject commit 9b1c00494974c73ff38f8590f010f624efe9964c +Subproject commit 00e3ead67060d3c3d4b8291d8e4abbf680b87eb3