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

Update opal_portable_platform_real.h from upstream gasnet #12829

Merged
merged 1 commit into from
Sep 28, 2024

Conversation

jsquyres
Copy link
Member

@jsquyres jsquyres commented Sep 28, 2024

Pull update from
https://bitbucket.org/berkeleylab/gasnet/src/stable/other/gasnet_portable_platform.h at git hash a90966674. This update brings in two things:

  1. Remove the need for the #define workarounds in opal/include/opal/opal_portable_platform.h
  2. Remove all //-style comments, making this file safe to use with C89-style applications (per Non-compliant C90 comments at mpi.h file leads to compilation failure for codes compiled with gcc -ansi or -std=c90 flags #12710).

Many thanks to the gasnet team for including these changes in their upstream repo.

Note that we still need the #ifndef SIZEOF_VOID_P protection in mpi.h. This commit also makes a minor update in mpi.h[.in] to prefix an OMPI-specific #define with "OMPI_". No one has ever complained about this un-prefixed macro, but prefixing it it felt like the Right Thing to do while mucking around with other portable_platform stuff.


Fixes #12710
This PR proposed as a replacement for #12811
Upstream gasnet PR where the changes went in: https://bitbucket.org/berkeleylab/gasnet/pull-requests/543

Pull update from
https://bitbucket.org/berkeleylab/gasnet/src/stable/other/gasnet_portable_platform.h
at git hash a90966674.  This update brings in two things:

1. Remove the need for the #define workarounds in
   opal/include/opal/opal_portable_platform.h
2. Remove all //-style comments, making this file safe to use with
   C89-style applications (per
   open-mpi#12710).

Many thanks to the gasnet team for including these changes in their
upstream repo.

Note that we still need the #ifndef SIZEOF_VOID_P protection in mpi.h.
This commit also makes a minor update in mpi.h[.in] to prefix an
OMPI-specific #define with "OMPI_".  No one has ever complained about
this un-prefixed macro, but prefixing it it felt like the Right Thing
to do while mucking around with other portable_platform stuff.

Signed-off-by: Jeff Squyres <jeff@squyres.com>
Copy link

@bonachea bonachea left a comment

Choose a reason for hiding this comment

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

LGTM based on source inspection.

Thanks @jsquyres!

Copy link
Contributor

@devreal devreal left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @bonachea and @jsquyres!

@devreal devreal merged commit b7a56e9 into open-mpi:main Sep 28, 2024
17 checks passed
@jsquyres jsquyres deleted the pr/update-portable-platform.h branch September 29, 2024 14:43
rhc54 added a commit to rhc54/openpmix that referenced this pull request Sep 30, 2024
See open-mpi/ompi#12829 for an
explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
rhc54 added a commit to rhc54/prrte that referenced this pull request Sep 30, 2024
See open-mpi/ompi#12829 for an explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
rhc54 added a commit to openpmix/prrte that referenced this pull request Sep 30, 2024
See open-mpi/ompi#12829 for an explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
rhc54 added a commit to openpmix/openpmix that referenced this pull request Sep 30, 2024
See open-mpi/ompi#12829 for an
explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
rhc54 added a commit to rhc54/prrte that referenced this pull request Sep 30, 2024
See open-mpi/ompi#12829 for an explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit bff20a8)
rhc54 added a commit to rhc54/openpmix that referenced this pull request Sep 30, 2024
See open-mpi/ompi#12829 for an
explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit 2412fa3)
rhc54 added a commit to openpmix/prrte that referenced this pull request Sep 30, 2024
See open-mpi/ompi#12829 for an explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit bff20a8)
rhc54 added a commit to openpmix/openpmix that referenced this pull request Sep 30, 2024
See open-mpi/ompi#12829 for an
explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit 2412fa3)
hppritcha pushed a commit to hppritcha/prrte that referenced this pull request Oct 1, 2024
See open-mpi/ompi#12829 for an explanation

Signed-off-by: Ralph Castain <rhc@pmix.org>
(from upstream commit bff20a8)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants