Skip to content

v4.0.x: Add Missing MPI_F_XXX C constants #10530 #10533

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

Merged
merged 2 commits into from
Jun 30, 2022
Merged

v4.0.x: Add Missing MPI_F_XXX C constants #10530 #10533

merged 2 commits into from
Jun 30, 2022

Conversation

drwootton
Copy link
Contributor

This is a cherry pick of #10491 to include MPI Fortran constants used by C code in mpi.in.h for the v4.0.x branch.
This also includes commit d44ec62 for #10528

Signed-off-by: David Wootton [email protected]

Signed-off-by: David Wootton <[email protected]>
(cherry picked from commit f27c1de)
@drwootton drwootton requested review from jsquyres and jjhursey June 29, 2022 20:38
@drwootton drwootton self-assigned this Jun 29, 2022
@jjhursey jjhursey added this to the v4.0.8 milestone Jun 29, 2022
@jsquyres
Copy link
Member

Was there a reason for the change in authorship of the 2nd commit on this PR? It's also confusing that there's 2 cherry-picked messages on that commit.

@drwootton
Copy link
Contributor Author

I may have done something wrong in git processing since the cherry-pick did not run cleanly.
One of your changes was to fix whitespace at the end of the declarations for MPI_Comm_idup_with_inf and PMPI_Comm_idup_with_inf.
When I ran the cherry pick command for both v4.0.x and v4.1.x it complained about conflicts which I resolved by removing those two declarations, then ran a git add and git commit as advised by the messages in the cherry pick command output.

Add some clarifying comments, update some stale comments, and fix some
whitespace.

No code or logic changes.

Signed-off-by: Jeff Squyres <[email protected]>
(cherry picked from commit d5f871d)
@jjhursey
Copy link
Member

Looks like the wrong hash was grabbed (the v5 PR hash instead of the 'main' hash). It's all fixed up now.

@jsquyres
Copy link
Member

bot:aws:recheck

@hppritcha hppritcha merged commit 448b374 into open-mpi:v4.0.x Jun 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants