Skip to content

Updates MPI setup in Axom export to optionally depend on Fortran #1806

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

Draft
kennyweiss wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

Updates MPI setup in Axom export to optionally depend on Fortran #1806

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5b2569
Updates blt submodule
kennyweiss Feb 19, 2026
5d17181
Fixes MPI export to only require Fortran when MPI was set up with For…
kennyweiss Feb 19, 2026
2d78fcc
Updates RELEASE-NOTES
kennyweiss Feb 19, 2026
c280f8a
Updates blt submodule again
kennyweiss Feb 19, 2026
9c22bae
Improve export/import logic for Axom's MPI package
kennyweiss Feb 19, 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
2 changes: 2 additions & 0 deletions RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
- Primal: Axom's polygon clipping was modified to handle some corner cases.

### Fixed
- MPI setup in exported Axom config only requires Fortran when Axom's MPI was set up with Fortran.
This is in support of configs that require Fortran and MPI, but not an MPI wrapper for Fortran.

### Removed

Expand Down
7 changes: 7 additions & 0 deletions src/cmake/AxomConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ if(AXOM_ENABLE_MPI AND ENABLE_FORTRAN)
endif()
endif()

if(AXOM_ENABLE_MPI)
set(AXOM_REQUIRED_MPI_COMPONENTS C CXX)
if(ENABLE_FORTRAN AND MPI_Fortran_COMPILER)
list(APPEND AXOM_REQUIRED_MPI_COMPONENTS Fortran)
endif()
endif()


## Add a configuration define for each enabled axom component
foreach(comp ${AXOM_COMPONENTS_ENABLED})
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/axom-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ if(NOT AXOM_FOUND)

# Load mpi targets because we require the optional Conduit mpi targets
if(AXOM_USE_MPI)
find_package(MPI REQUIRED)
find_package(MPI REQUIRED COMPONENTS @AXOM_REQUIRED_MPI_COMPONENTS@)
endif()

find_dependency(Conduit REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/blt
Open in desktop
Submodule blt updated 22 files
+6 −1 .gitlab/build_dane.yml
+6 −0 RELEASE-NOTES.md
+1 −1 cmake/BLTInstallableMacros.cmake
+12 −6 cmake/thirdparty/BLTSetupMPI.cmake
+5 −8 docs/tutorial/common_hpc_dependencies.rst
+9 −9 docs/tutorial/host_configs.rst
+0 −67 host-configs/llnl/blueos_3_ppc64le_ib_p9/clang@10.0.1_nvcc_c++14_export_tpls.cmake
+0 −80 host-configs/llnl/blueos_3_ppc64le_ib_p9/clang@10.0.1_nvcc_c++14_xlf.cmake
+0 −64 host-configs/llnl/blueos_3_ppc64le_ib_p9/clang@10.0.1_nvcc_c++17.cmake
+0 −61 host-configs/llnl/blueos_3_ppc64le_ib_p9/clang@10.0.1_nvcc_c++17_no_separable.cmake
+0 −40 host-configs/llnl/blueos_3_ppc64le_ib_p9/clang@14.0.5_with_gcc@8.3.1_nvcc_c++_only.cmake
+2 −0 host-configs/llnl/toss_4_x86_64_ib/gcc@10.3.1_nvcc.cmake
+1 −1 host-configs/llnl/toss_4_x86_64_ib/intel@2022.1.0-c++17.cmake
+52 −0 host-configs/llnl/toss_4_x86_64_ib/intel@2025.2.0-c++20.cmake
+3 −2 tests/smoke/CMakeLists.txt
+10 −3 tests/smoke/blt_cuda_runtime_smoke.cpp
+14 −0 tests/smoke/blt_mpi_smoke.cpp
+7 −2 thirdparty_builtin/googletest-1.16.0/googletest/cmake/internal_utils.cmake
+6 −2 thirdparty_builtin/googletest-1.16.0/googletest/include/gtest/gtest-printers.h
+28 −0 thirdparty_builtin/patches/gtest-2025-12-08-fix-flag-change-intel-llvm.patch
+13 −0 thirdparty_builtin/patches/gtest-2025-12-09-remove-Winline.patch
+22 −0 thirdparty_builtin/patches/gtest-2026-01-20-quiet-implicit-cast-warning.patch