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

GitFlow: Merge develop into main for 4.10 release #417

Merged
merged 4 commits into from
Dec 2, 2024
Merged

GitFlow: Merge develop into main for 4.10 release #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8aef1e1
v4: Fix multiple MPI_STACK sets
mathomp4 Nov 18, 2024
ba22bce
Update changelog for release
mathomp4 Nov 27, 2024
7226204
Update changelog for release
mathomp4 Dec 2, 2024
4526c90
Merge pull request #416 from GEOS-ESM/feature/mathomp4/mpi-stack-bett…
mathomp4 Dec 2, 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [4.10.0] - 2024-12-02

### Fixed

- Fixed bad behavior in the `MPI_STACK` detection on subsequent calls to `DetermineMPIStack`

## [4.9.0] - 2024-11-13

### Fixed
Expand Down
110 changes: 61 additions & 49 deletions external_libraries/DetermineMPIStack.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,69 @@ include(CMakePrintHelpers)

set(ALLOWED_MPI_STACKS "intelmpi;mvapich;mpt;mpich;openmpi")

if (MPI_STACK)
if (NOT MPI_STACK IN_LIST ALLOWED_MPI_STACKS)
message(FATAL_ERROR "MPI_STACK must be one of the following: ${ALLOWED_MPI_STACKS}")
else()
set(MPI_STACK_TYPE "User Specified")
message(WARNING "MPI_STACK is user specified. Please ensure that the specified MPI stack is compatible with the build. NOTE: MPI_STACK_VERSION is not being set.")
endif()
else ()
message(STATUS "MPI_STACK not specified. Attempting to autodetect MPI stack...")
message(DEBUG "MPI_Fortran_LIBRARY_VERSION_STRING: ${MPI_Fortran_LIBRARY_VERSION_STRING}")
# Define a helper variable to track whether the block was processed
# This let's us avoid weird warnings since MPI_STACK was defined
# in the first run
if (NOT DEFINED MPI_STACK_PROCESSED)
set(MPI_STACK_PROCESSED OFF CACHE INTERNAL "Flag to track if MPI_STACK block was processed")
endif()

string(REPLACE " " ";" MPI_Fortran_LIBRARY_VERSION_LIST ${MPI_Fortran_LIBRARY_VERSION_STRING})
message(DEBUG "MPI_Fortran_LIBRARY_VERSION_LIST: ${MPI_Fortran_LIBRARY_VERSION_LIST}")
list(GET MPI_Fortran_LIBRARY_VERSION_LIST 0 MPI_Fortran_LIBRARY_VERSION_FIRSTWORD)
message(DEBUG "MPI_Fortran_LIBRARY_VERSION_FIRSTWORD: ${MPI_Fortran_LIBRARY_VERSION_FIRSTWORD}")
if (NOT MPI_STACK_PROCESSED)
set(MPI_STACK_PROCESSED ON CACHE INTERNAL "Flag to track if MPI_STACK block was processed")
if (MPI_STACK)
if (NOT MPI_STACK IN_LIST ALLOWED_MPI_STACKS)
message(FATAL_ERROR "MPI_STACK must be one of the following: ${ALLOWED_MPI_STACKS}")
else()
set(MPI_STACK_TYPE "User Specified")
message(WARNING "MPI_STACK is user specified. Please ensure that the specified MPI stack is compatible with the build. NOTE: MPI_STACK_VERSION is not being set.")
endif()
else ()
message(STATUS "MPI_STACK not specified. Attempting to autodetect MPI stack...")
message(DEBUG "MPI_Fortran_LIBRARY_VERSION_STRING: ${MPI_Fortran_LIBRARY_VERSION_STRING}")

if(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "Intel")
set(MPI_STACK intelmpi)
list(GET MPI_Fortran_LIBRARY_VERSION_LIST 3 MPI_STACK_VERSION)
elseif(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "MVAPICH")
set(MPI_STACK mvapich)
# MVAPICH output for MPI_Fortran_LIBRARY_VERSION_STRING is complex and multi-line.
# So we need to extract the first line from that multi-line string.
string(REGEX REPLACE "\n.*" "" MPI_Fortran_LIBRARY_VERSION_STRING_FIRST_LINE ${MPI_Fortran_LIBRARY_VERSION_STRING})
# Now we need to grab the last word from the first line of the string
string(REGEX MATCH "[^ ]+$" MPI_STACK_VERSION ${MPI_Fortran_LIBRARY_VERSION_STRING_FIRST_LINE})
# Now we need to remove any colons, spaces, tabs, etc., but keep dots and letters.
string(REGEX REPLACE "[^a-zA-Z0-9.]" "" MPI_STACK_VERSION ${MPI_STACK_VERSION})
elseif(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "MPT")
set(MPI_STACK mpt)
list(GET MPI_Fortran_LIBRARY_VERSION_LIST 2 MPI_STACK_VERSION)
elseif(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "MPICH")
set(MPI_STACK mpich)
# MPICH output for MPI_Fortran_LIBRARY_VERSION_STRING is complex and multi-line.
# So we need to extract the first line from that multi-line string.
string(REGEX REPLACE "\n.*" "" MPI_Fortran_LIBRARY_VERSION_STRING_FIRST_LINE ${MPI_Fortran_LIBRARY_VERSION_STRING})
# Now we need to grab the last word from the first line of the string
string(REGEX MATCH "[^ ]+$" MPI_STACK_VERSION ${MPI_Fortran_LIBRARY_VERSION_STRING_FIRST_LINE})
# Now we need to remove any colons, spaces, tabs, etc., but keep dots and letters.
string(REGEX REPLACE "[^a-zA-Z0-9.]" "" MPI_STACK_VERSION ${MPI_STACK_VERSION})
elseif(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "Open MPI")
set(MPI_STACK openmpi)
list(GET MPI_Fortran_LIBRARY_VERSION_LIST 2 DETECTED_MPI_STACK_VERSION_STRING_WITH_COMMA)
string(REPLACE "," "" DETECTED_MPI_STACK_VERSION_STRING_WITH_V ${DETECTED_MPI_STACK_VERSION_STRING_WITH_COMMA})
string(REPLACE "v" "" MPI_STACK_VERSION ${DETECTED_MPI_STACK_VERSION_STRING_WITH_V})
else()
message (FATAL_ERROR "ERROR: MPI_STACK autodetection failed. Must specify a value for MPI_STACK with cmake ... -DMPI_STACK=<mpistack>. The acceptable values are: intelmpi, mvapich, mpt, mpich, openmpi")
string(REPLACE " " ";" MPI_Fortran_LIBRARY_VERSION_LIST ${MPI_Fortran_LIBRARY_VERSION_STRING})
message(DEBUG "MPI_Fortran_LIBRARY_VERSION_LIST: ${MPI_Fortran_LIBRARY_VERSION_LIST}")
list(GET MPI_Fortran_LIBRARY_VERSION_LIST 0 MPI_Fortran_LIBRARY_VERSION_FIRSTWORD)
message(DEBUG "MPI_Fortran_LIBRARY_VERSION_FIRSTWORD: ${MPI_Fortran_LIBRARY_VERSION_FIRSTWORD}")

if(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "Intel")
set(MPI_STACK intelmpi)
list(GET MPI_Fortran_LIBRARY_VERSION_LIST 3 MPI_STACK_VERSION)
elseif(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "MVAPICH")
set(MPI_STACK mvapich)
# MVAPICH output for MPI_Fortran_LIBRARY_VERSION_STRING is complex and multi-line.
# So we need to extract the first line from that multi-line string.
string(REGEX REPLACE "\n.*" "" MPI_Fortran_LIBRARY_VERSION_STRING_FIRST_LINE ${MPI_Fortran_LIBRARY_VERSION_STRING})
# Now we need to grab the last word from the first line of the string
string(REGEX MATCH "[^ ]+$" MPI_STACK_VERSION ${MPI_Fortran_LIBRARY_VERSION_STRING_FIRST_LINE})
# Now we need to remove any colons, spaces, tabs, etc., but keep dots and letters.
string(REGEX REPLACE "[^a-zA-Z0-9.]" "" MPI_STACK_VERSION ${MPI_STACK_VERSION})
elseif(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "MPT")
set(MPI_STACK mpt)
list(GET MPI_Fortran_LIBRARY_VERSION_LIST 2 MPI_STACK_VERSION)
elseif(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "MPICH")
set(MPI_STACK mpich)
# MPICH output for MPI_Fortran_LIBRARY_VERSION_STRING is complex and multi-line.
# So we need to extract the first line from that multi-line string.
string(REGEX REPLACE "\n.*" "" MPI_Fortran_LIBRARY_VERSION_STRING_FIRST_LINE ${MPI_Fortran_LIBRARY_VERSION_STRING})
# Now we need to grab the last word from the first line of the string
string(REGEX MATCH "[^ ]+$" MPI_STACK_VERSION ${MPI_Fortran_LIBRARY_VERSION_STRING_FIRST_LINE})
# Now we need to remove any colons, spaces, tabs, etc., but keep dots and letters.
string(REGEX REPLACE "[^a-zA-Z0-9.]" "" MPI_STACK_VERSION ${MPI_STACK_VERSION})
elseif(MPI_Fortran_LIBRARY_VERSION_STRING MATCHES "Open MPI")
set(MPI_STACK openmpi)
list(GET MPI_Fortran_LIBRARY_VERSION_LIST 2 DETECTED_MPI_STACK_VERSION_STRING_WITH_COMMA)
string(REPLACE "," "" DETECTED_MPI_STACK_VERSION_STRING_WITH_V ${DETECTED_MPI_STACK_VERSION_STRING_WITH_COMMA})
string(REPLACE "v" "" MPI_STACK_VERSION ${DETECTED_MPI_STACK_VERSION_STRING_WITH_V})
else()
message (FATAL_ERROR "ERROR: MPI_STACK autodetection failed. Must specify a value for MPI_STACK with cmake ... -DMPI_STACK=<mpistack>. The acceptable values are: intelmpi, mvapich, mpt, mpich, openmpi")
endif()
set(MPI_STACK_TYPE "Autodetected")
endif()
set(MPI_STACK_TYPE "Autodetected")
endif()

set(MPI_STACK "${MPI_STACK}" CACHE STRING "MPI_STACK Value")
set(MPI_STACK_VERSION "${MPI_STACK_VERSION}" CACHE STRING "MPI_STACK_VERSION Value")
set(MPI_STACK "${MPI_STACK}" CACHE STRING "MPI_STACK Value")
set(MPI_STACK_VERSION "${MPI_STACK_VERSION}" CACHE STRING "MPI_STACK_VERSION Value")
else ()
message(STATUS "MPI_STACK previously detected.")
endif ()
message(STATUS "Using ${MPI_STACK_TYPE} MPI_STACK: ${MPI_STACK}. Version: ${MPI_STACK_VERSION}")
Loading