Skip to content

Fix Silo build with MPI-enabled HDF5 #1386

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

Merged
sbryngelson merged 2 commits into from
Apr 30, 2026
Merged

Fix Silo build with MPI-enabled HDF5 #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aae2863
CMake fix
ChrisZYJ Apr 28, 2026
d9f39c8
Refine module description for m_bubbles
sbryngelson Apr 29, 2026
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
3 changes: 1 addition & 2 deletions src/simulation/m_bubbles.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

#:include 'macros.fpp'

!> @brief Shared bubble-dynamics procedures (radial acceleration, wall pressure, sound speed) for ensemble- and volume-averaged
!! models
!> @brief Bubble-dynamics procedures for ensemble- and volume-averaged models
module m_bubbles

use m_derived_types
Expand Down
12 changes: 12 additions & 0 deletions toolchain/dependencies/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,17 @@ if (MFC_SILO)
else()
find_package(Git REQUIRED)

# When the system HDF5 is the MPI-enabled variant (e.g. libhdf5-openmpi-dev),
# its headers transitively include mpi.h. Propagate MPI include dirs into the
# silo sub-build so those headers can be found.
find_package(MPI COMPONENTS C QUIET)
set(_silo_c_flags "${CMAKE_C_FLAGS}")
if (MPI_C_FOUND)
foreach(_dir IN LISTS MPI_C_INCLUDE_DIRS)
string(APPEND _silo_c_flags " -I${_dir}")
endforeach()
endif()

ExternalProject_Add(silo
GIT_REPOSITORY "https://github.com/LLNL/Silo"
GIT_TAG 4.12.0
Expand All @@ -98,6 +109,7 @@ if (MFC_SILO)
"-DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}"
"-DCMAKE_FIND_PACKAGE_REDIRECTS_DIR=${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}"
"-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
"-DCMAKE_C_FLAGS=${_silo_c_flags}"
"$<$<STREQUAL:${CMAKE_Fortran_COMPILER_ID},Cray>:-DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/../cmake/cce>"
)
endif()
Expand Down
Loading