Skip to content

Conversation

@jsquyres
Copy link
Member

@jsquyres jsquyres commented Apr 8, 2022

Small cleanups found while working on #10223, #10224, and #10245. See individual commit messages, the most important of which is likely the MacOS /usr/bin/python fix.

@jsquyres jsquyres added this to the v5.0.0 milestone Apr 8, 2022
@jsquyres jsquyres requested a review from bwbarrett April 8, 2022 12:35
@jsquyres jsquyres changed the title Miscelaneous cleanups Miscellaneous cleanups Apr 8, 2022
@jsquyres
Copy link
Member Author

jsquyres commented Apr 8, 2022

bot:aws:recheck

@bwbarrett
Copy link
Member

bot:aws:retest

jsquyres added 5 commits May 17, 2022 14:24
Use strings/names that are meaningful to the end user, not just to the
Open MPI developer.

Signed-off-by: Jeff Squyres <[email protected]>
OMPI_CANONICALIZE_PATH broke on MacOS when `/usr/bin/python`
disappeared (in favor of `/usr/bin/python3`) in MacOS Monterrey.  Make
things simpler by not canonicalizing the path to begin with.

Specifically: just look at `pwd`, $srcdir, and $prefix.  Even if
$srcdir and/or $prefix are relative to the build dir, the union of all
the checks will ensure that none of the target paths will contain
spaces.

Signed-off-by: Jeff Squyres <[email protected]>
Add a missing AC_MSG about SPC, and group it together with the rest of
the MPI-layer options.  Also put the library naming test there, since
it emits a message about "libmpi_FOO".

Move the OSHMEM tests down below all of that so that the output in
that section solely has to do with OSHMEM tests (and not have the
results of some OMPI tests tacked on to the end of that section).

Finally, make some trivial whitespace fixes.

Signed-off-by: Jeff Squyres <[email protected]>
Unbelievably, at least some versions of jni.h have a global symbol
named "jvalue".  So avoid using that name as a parameter or variable
in our code.

Signed-off-by: Jeff Squyres <[email protected]>
AC_HELP_STRING --> AS_HELP_STRING

Signed-off-by: Jeff Squyres <[email protected]>
@jsquyres jsquyres force-pushed the pr/misc-cleanups branch from 0ac149f to 0cc63a5 Compare May 17, 2022 18:39
@jsquyres jsquyres requested a review from bwbarrett May 17, 2022 18:40
@jsquyres jsquyres merged commit dda17d4 into open-mpi:main May 17, 2022
@jsquyres jsquyres deleted the pr/misc-cleanups branch May 17, 2022 20:38
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.

2 participants