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

v5.0.x: Update opal_portable_platform_real.h from upstream gasnet #12830

Merged

Conversation

jsquyres
Copy link
Member

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.

Signed-off-by: Jeff Squyres jeff@squyres.com
(cherry picked from commit 50c05da)


Refs #12710
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>
(cherry picked from commit 50c05da)
@github-actions github-actions bot added this to the v5.0.6 milestone Sep 29, 2024
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, thank you @jsquyres!

@janjust janjust merged commit da2c8fd into open-mpi:v5.0.x Sep 30, 2024
15 checks passed
@jsquyres jsquyres deleted the pr/v5.0.x/update-portable-platform.h branch September 30, 2024 19:22
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.

3 participants