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.

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: update trilinos, hypre and fmt. #3214

Merged
merged 25 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cfd04a5
udpate raja and chai.
CusiniM Jul 5, 2024
e437040
udpate raja and chai.
CusiniM Jul 5, 2024
f6086d7
udpate trilinos. New path for trilinos CmakeConfig.
CusiniM Jul 8, 2024
1f94377
Merge remote-tracking branch 'origin/develop' into tpls-update/cusini…
CusiniM Jul 8, 2024
bc7cf31
add new images and remove pecan and centos.
CusiniM Jul 8, 2024
a26e01a
Merge branch 'develop' into tpls-update/cusini/update-raja-chai
CusiniM Jul 8, 2024
37e754f
MGR improvements (#3199)
victorapm Jul 9, 2024
78c90c9
Merge branch 'develop' into tpls-update/cusini/update-raja-chai
CusiniM Jul 9, 2024
c493ee7
Update .devcontainer/devcontainer.json
CusiniM Jul 9, 2024
4bf57c7
Update .devcontainer/devcontainer.json
CusiniM Jul 9, 2024
e2fde18
Update devcontainer.json
rrsettgast Jul 9, 2024
6366dfc
Merge branch 'develop' into tpls-update/cusini/update-raja-chai
rrsettgast Jul 9, 2024
4309474
add template parameter.
CusiniM Jul 9, 2024
0f72220
lvarray.
CusiniM Jul 9, 2024
877ce5e
fix lifo storage.
CusiniM Jul 9, 2024
1255c62
fix lifo storage
CusiniM Jul 10, 2024
ec48f36
fmt:fmt to fmt::fmt-header-only
CusiniM Jul 10, 2024
dafdf54
Update .devcontainer/devcontainer.json
CusiniM Jul 10, 2024
84f1137
move fmt find_package.
CusiniM Jul 10, 2024
a7d2f76
add missing const qualifiers.
CusiniM Jul 11, 2024
364fe68
revert raja update related changes
CusiniM Jul 11, 2024
51e2194
tpl tag update
CusiniM Jul 11, 2024
1232013
lvarray update.
CusiniM Jul 11, 2024
442daf8
update lvarray hash and remove rockylinux work.
CusiniM Jul 11, 2024
92c1457
Merge branch 'develop' into tpls-update/cusini/update-raja-chai
CusiniM Jul 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"GEOS_TPL_TAG": "270-418"
"GEOS_TPL_TAG": "273-442"
CusiniM marked this conversation as resolved.
Show resolved Hide resolved
}
},
"runArgs": [
Expand Down
42 changes: 9 additions & 33 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,19 +170,6 @@ jobs:
ENABLE_HYPRE: ON
ENABLE_TRILINOS: OFF

- name: Pecan CPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5)
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/pecan-cpu-gcc8.2.0-openmpi4.0.1-mkl2019.5
HOST_CONFIG: host-configs/TOTAL/pecan-CPU.cmake
GCP_BUCKET: geosx/Pecan-CPU

- name: Pangea 2 (centos 7.6, gcc 8.3.0, open-mpi 2.1.5, mkl 2019.3)
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3
ENABLE_HYPRE: ON
ENABLE_TRILINOS: OFF
GCP_BUCKET: geosx/Pangea2

- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10)
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
Expand Down Expand Up @@ -295,16 +282,6 @@ jobs:
DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia --gpus all -v /etc/pki/ca-trust/source/anchors/:/usr/local/share/ca-certificates/llnl:ro"
DOCKER_CERTS_DIR: "/usr/local/share/ca-certificates"
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-certificates"

- name: Centos (7.7, gcc 8.3.1, open-mpi 1.10.7, cuda 11.8.89)
BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/centos7.7-gcc8.3.1-cuda11.8.89
RUNS_ON: streak2
NPROC: 8
DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro"
DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"

# compiler error in ElasticFirstOrderWaveEquationSEMKernel::StressComputation::launch in call to FE_TYPE::computeFirstOrderStiffnessTermX
# - name: Rockylinux (8, clang 17.0.6, cuda 12.5)
Expand All @@ -315,20 +292,19 @@ jobs:
# NPROC: 2
# DOCKER_RUN_ARGS: "--cpus=1 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro"
# DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
# DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"

# Below this line, jobs that deploy to Google Cloud.
- name: Pecan GPU (centos 7.7, gcc 8.2.0, open-mpi 4.0.1, mkl 2019.5, cuda 11.5.119)
BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema"
# DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"

- name: Rockylinux (8, gcc 8.5, cuda 12.5)
BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119
HOST_CONFIG: host-configs/TOTAL/pecan-GPU.cmake
DOCKER_REPOSITORY: geosx/rockylinux8-gcc8-cuda12.5
RUNS_ON: streak2
NPROC: 8
DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro"
NPROC: 2
DOCKER_RUN_ARGS: "--cpus=1 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro"
DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"

# Below this line, jobs that deploy to Google Cloud.
- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 11.7.1,)
BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema"
CMAKE_BUILD_TYPE: Release
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/thirdparty/SetupGeosxThirdParty.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ endif()
if(DEFINED TRILINOS_DIR AND ENABLE_TRILINOS)
message(STATUS "TRILINOS_DIR = ${TRILINOS_DIR}")

include(${TRILINOS_DIR}/lib/cmake/Trilinos/TrilinosConfig.cmake)
include(${TRILINOS_DIR}/lib64/cmake/Trilinos/TrilinosConfig.cmake)

list(REMOVE_ITEM Trilinos_LIBRARIES "gtest")
list(REMOVE_DUPLICATES Trilinos_LIBRARIES)
Expand Down
2 changes: 1 addition & 1 deletion src/coreComponents/LvArray
2 changes: 2 additions & 0 deletions src/coreComponents/common/Format.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
#endif

#ifdef GEOSX_USE_FMT
#ifndef FMT_HEADER_ONLY
CusiniM marked this conversation as resolved.
Show resolved Hide resolved
#define FMT_HEADER_ONLY
#endif
// Differentiate between standalone fmt path and umpire's fmt path
#include "../include/fmt/core.h"
#include "../include/fmt/chrono.h"
Expand Down
Loading