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

Add ABI support for HPE's MPT and HMPT implementations #580

Merged
merged 7 commits into from
May 5, 2022
Merged

Add ABI support for HPE's MPT and HMPT implementations #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d562fa
Add MPT constants file
sloede Apr 24, 2022
8a01334
Fix some of the open TODOs
sloede Apr 25, 2022
f09db2d
Remove TODOs for enums as `@const_ref` since that seems be also used …
sloede Apr 25, 2022
cc6de6d
Add detection mechanism for HPE MPT ABI
sloede Apr 25, 2022
9208d91
Add missing parens
sloede Apr 25, 2022
a36dc35
Add HPE MPT/HMPT to list of supported ABIs in the docs
sloede Apr 26, 2022
6464c8d
Merge branch 'JuliaParallel:master' into msl/add-mpt-abi
sloede May 2, 2022
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
1 change: 1 addition & 0 deletions docs/src/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ The following MPI implementations should work out-of-the-box with MPI.jl:
- [MVAPICH](http://mvapich.cse.ohio-state.edu/)
- [Cray MPICH](https://docs.nersc.gov/development/compilers/wrappers/)
- [Fujitsu MPI](https://www.fujitsu.com/global/about/resources/publications/technicalreview/2020-03/article07.html#cap-03)
- [HPE MPT/HMPT](https://support.hpe.com/hpesc/public/docDisplay?docLocale=en_US&docId=a00105727en_us)

If the implementation is changed, you will need to use [`MPI.use_system_binary()`](@ref MPIPreferences.use_system_binary)
or [`MPI.use_jll_binary()`](@ref MPIPreferences.use_jll_binary).
Expand Down
22 changes: 21 additions & 1 deletion lib/MPIPreferences/src/MPIPreferences.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,32 +222,52 @@ function identify_abi(libmpi)
if (m = match(r"CRAY MPICH version (\d+.\d+.\d+)", version_string)) !== nothing
version = VersionNumber(m.captures[1])
end

elseif startswith(version_string, "FUJITSU MPI")
impl = "FujitsuMPI"
# "FUJITSU MPI Library 4.0.0 (4.0.1fj4.0.0)\0"
if (m = match(r"^FUJITSU MPI Library (\d+.\d+.\d+)", version_string)) !== nothing
version = VersionNumber(m.captures[1])
end

elseif startswith(version_string, "MPIwrapper")
impl = "MPIwrapper"
# MPIwrapper 2.2.2
if (m = match(r"^MPIwrapper Version:\t(\d+.\d+.\d+\w*)", version_string)) !== nothing
version = VersionNumber(m.captures[1])
end

elseif startswith(version_string, "HPE MPT")
impl = "HPE MPT"
# HPE MPT 2.23 08/26/20 02:54:49-root
if (m = match(r"^HPE MPT (\d+.\d+)", version_string)) !== nothing
version = VersionNumber(m.captures[1])
end

elseif startswith(version_string, "HPE HMPT")
impl = "HPE HMPT"
# HPE HMPT 2.23 08/26/20 02:59:48-root
if (m = match(r"^HPE HMPT (\d+.\d+)", version_string)) !== nothing
version = VersionNumber(m.captures[1])
end
end

# 3) determine the abi from the implementation + version
if (impl == "MPICH" && version >= v"3.1" ||
impl == "IntelMPI" && version > v"2014" ||
impl == "MVAPICH" && version >= v"2" ||
impl == "CrayMPICH" && version >= v"7")
impl == "CrayMPICH" && version >= v"7" ||
# https://www.mpich.org/abi/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment should go at the line below?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure. The website specifically lists which MPI libraries starting which version are compatible to MPICH. HMPT is not listed on that website, however, I know from the docs that it is supposed to be compatible. Thus I tried to exclude it by putting it below the existing comment, but I can also move it up again. What do you think?

impl == "HPE HMPT")
abi = "MPICH"
elseif impl == "OpenMPI" || impl == "IBMSpectrumMPI" || impl == "FujitsuMPI"
abi = "OpenMPI"
elseif impl == "MicrosoftMPI"
abi = "MicrosoftMPI"
elseif impl == "MPIwrapper"
abi = "MPItrampoline"
elseif impl == "HPE MPT"
abi = "HPE MPT"
simonbyrne marked this conversation as resolved.
Show resolved Hide resolved
else
abi = "unknown"
end
Expand Down
2 changes: 2 additions & 0 deletions src/consts/consts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ elseif MPIPreferences.abi == "MicrosoftMPI"
include("microsoftmpi.jl")
elseif MPIPreferences.abi == "MPItrampoline"
include("mpitrampoline.jl")
elseif MPIPreferences.abi == "HPE MPT"
include("mpt.jl")
else
error("Unknown MPI ABI $(MPIPreferences.abi)")
end
Expand Down
Loading