Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade Trilinos. #3475

Merged
merged 12 commits into from
Dec 11, 2024
Merged

chore: upgrade Trilinos. #3475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aa8b873
chore: upgrade Trilinos.
CusiniM Dec 4, 2024
d1510fc
Merge branch 'develop' into chore/cusini/upgradeTrilinos
rrsettgast Dec 5, 2024
a929eb8
fortran compiler on LC
CusiniM Dec 6, 2024
de81811
Merge branch 'chore/cusini/upgradeTrilinos' of github.com:GEOS-DEV/GE…
CusiniM Dec 6, 2024
9cffe8e
try different fortran compilers.
CusiniM Dec 6, 2024
2661837
fix path
CusiniM Dec 6, 2024
0fd9a21
Merge branch 'develop' into chore/cusini/upgradeTrilinos
rrsettgast Dec 10, 2024
30cbe25
revert and modify LC hostconfigs
rrsettgast Dec 10, 2024
c3460b9
use gcc again
rrsettgast Dec 11, 2024
d1f559f
update LvArray for lc path. udpate GEOS_TPL_TAG
rrsettgast Dec 11, 2024
efebbd2
Merge branch 'develop' into chore/cusini/upgradeTrilinos
rrsettgast Dec 11, 2024
c9ae464
update submodule.
CusiniM Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"GEOS_TPL_TAG": "286-547"
"GEOS_TPL_TAG": "288-584"
}
},
"runArgs": [
Expand Down
6 changes: 3 additions & 3 deletions host-configs/LLNL/lassen-clang-10-cuda-11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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 "")
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 "")
set(ENABLE_CUDA_NVTOOLSEXT ON CACHE BOOL "")
4 changes: 2 additions & 2 deletions host-configs/LLNL/lassen-clang-13-cuda-11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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 "")
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)

Expand Down
2 changes: 2 additions & 0 deletions host-configs/LLNL/lassen-gcc-8-cuda-11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion src/coreComponents/LvArray
Open in desktop
Submodule LvArray updated 1 files
+1 −1 host-configs/LLNL/llnl-tpls-base.cmake
Loading