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

Teach DBS to find and use mpirun found at /usr/bin. #620

Merged
merged 1 commit into from
May 14, 2019
Merged
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion config/setupMPI.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function( setMPIflavorVer )
foreach( line ${TEMP} )

# extract the version...
if( ${line} MATCHES "Version" )
if( ${line} MATCHES "Version" OR ${line} MATCHES "OpenRTE")
set(DBS_MPI_VER "${line}")
if( "${DBS_MPI_VER}" MATCHES "[0-9]+[.][0-9]+[.][0-9]+" )
string( REGEX REPLACE ".*([0-9]+)[.]([0-9]+)[.]([0-9]+).*" "\\1"
Expand All @@ -78,6 +78,9 @@ function( setMPIflavorVer )
DBS_MPI_VER_MINOR ${DBS_MPI_VER} )
set( MPI_VERSION "${DBS_MPI_VER_MAJOR}.${DBS_MPI_VER_MINOR}" )
endif()
else()
message(FATAL_ERROR "DBS did not find the MPI version string (is this "
"an older openmpi?)")
endif()

# if needed, make a 2nd pass at identifying the MPI flavor
Expand Down