Make master abi compatible with 4.1.x #10098
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove a dupliate declaration of MPI_UB and MPI_LB in the case when mpi1-compat is specified. This change mirrors the behavior of the 4.1.x branch. Signed-off-by: Brian Barrett <[email protected]>
unless configure'd with --enable-mpi1-compatibility Thanks Lisandro Dalcin for reporting this. BWB Note: This patch was originally applied directly to v4.0.x in e2638db, but now needs to be added to master, as we are keeping the 4.x mpi1-compat behavior. Signed-off-by: Gilles Gouaillardet <[email protected]> Signed-off-by: Brian Barrett <[email protected]>
Follow-up to open-mpi#6120. As mentioned in [1], it may be desirable to nevertheless get the hidden MPI 1 prototypes, for users who know what they are doing, i.e., the tools guys. @ggouaillardet mentioned in [2], that `-DOMPI_OMIT_MPI1_COMPAT_DECLS=0` should work, but it does not, as than we only get redefinition warnings. See [3]. [1] open-mpi#6120 (comment) [2] open-mpi#6120 (comment) [3] open-mpi#6120 (comment) BWB Note: This patch was originally applied directly to v4.0.x in 73134ab, but now needs to be added to master, as we are keeping the 4.x mpi1-compat behavior. Signed-off-by: Bert Wesarg <[email protected]> Signed-off-by: Brian Barrett <[email protected]>
This patch is similar to 4aa91e1, applied to v4.x, to re-enable building the removed MPI-1 functions and maintain C/mpi-f.h ABI compliance from 3.0.0 through master. Signed-off-by: Brian Barrett <[email protected]>
Be consistent in using OMPI_OMIT_MPI1_COMPAT_DECLS when deciding whether or not to declare removed types/functions/etc. and remove the inconsistent sprinkling of OMPI_BUILDING checks by setting OMPI_OMIT_MPI1_COMPAT_DECLS based on the OMPI_BUILDING value. Signed-off-by: Brian Barrett <[email protected]>
MPI_LB and MPI_UB are always available when building OMPI and, for ABI reasons, must be handled properly by the datatype engine. Signed-off-by: Brian Barrett <[email protected]>
bwbarrett
force-pushed
the
make-master-abi-compatible-with-4.1.x
branch
from
c1d422d to
2308a9c
Compare
|
The first four patches get master basically to the state 4.1.x is currently in (and need to be backported to v5.0.x). The last two fix issues discovered during the first four and need to be backported to v4.1.x nd v4.0.x as well. |
|
Adding @bosilca to the review, because I want to make sure I didn't screw up the datatype change. |
bosilca
approved these changes
Mar 10, 2022
awlauria
approved these changes
Mar 10, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this series of changes, the master branch is abi compatible with the 4.1.2 release according to abi-compliance-checker (assuming mpi extensions are not built).