pmix/ext2x: fix support for external PMIx v3.1 #6253
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
The PMIX_MODEX and PMIX_INFO_ARRAY macros were removed from the PMIx 3.1 standard. Open MPI does not really need them (they are only used to be reported as not supported), so smply #ifdef protect them to support an external PMIx v3.1 external PMIx v3 is supported via the pmix/ext2x component, and it has worked so far until PMIx v3.1 removed some macros, the change to support external PMIx v3.1 is minimal, so we do not need to bother creating a new pmix/ext3x component. The change only need to be done in ext2x/ext2x.c. But since this file is automatically generated from pmix2x/pmix2x.c, we have to update the latter file. Refs. open-mpi#6247 Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp> (back-ported from commit open-mpi/ompi@950ba16)
rhc54
approved these changes
Jan 8, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The PMIX_MODEX and PMIX_INFO_ARRAY macros were removed from the PMIx 3.1 standard.
Open MPI does not really need them (they are only used to be reported as not supported),
so smply #ifdef protect them to support an external PMIx v3.1
external PMIx v3 is supported via the pmix/ext2x component, and it has worked so far
until PMIx v3.1 removed some macros, the change to support external PMIx v3.1 is minimal,
so we do not need to bother creating a new pmix/ext3x component.
The change only need to be done in ext2x/ext2x.c.
But since this file is automatically generated from pmix2x/pmix2x.c, we have to update
the latter file.
Refs. #6247
Signed-off-by: Gilles Gouaillardet gilles@rist.or.jp
(back-ported from commit 950ba16)