Skip to content

UofL prs and some fixes #53

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 4, 2025

Conversation

hppritcha
Copy link
Member

No description provided.

Signed-off-by: Jeff Squyres <jeff@squyres.com>
(cherry picked from commit 1d867e8)
@hppritcha hppritcha requested a review from jsquyres May 5, 2025 19:58
Copy link

github-actions bot commented May 5, 2025

Hello! The Git Commit Checker CI bot found a few problems with this PR:

0dcab03: Add prefixing capability to prrte library and bina...

  • check_cherry_pick: contains a cherry pick message that refers to a commit that exists, but is in an as-yet unmerged pull request: 8bf42cae93ccdaa5aa5993b2acba60024c599711

95208cd: prted: support --with-prte-binary-prefix

  • check_cherry_pick: contains a cherry pick message that refers to a commit that exists, but is in an as-yet unmerged pull request: f5efe4a175d07cd92173938494fba17a77e287da

10f37e9: prte_configure_options.m4: Add --with-prte-binary-...

  • check_cherry_pick: contains a cherry pick message that refers to a commit that exists, but is in an as-yet unmerged pull request: 40579014b90bdc3c5cdd6d1e510cd79654fd3750

Please fix these problems and, if necessary, force-push new commits back up to the PR branch. Thanks!

@hppritcha hppritcha force-pushed the uofl_prs_and_some_fixes branch from f89ea92 to b3bdbb2 Compare May 5, 2025 20:19
@hppritcha hppritcha changed the title Uofl prs and some fixes UofL prs and some fixes May 5, 2025
@hppritcha
Copy link
Member Author

@jsquyres

@jsquyres
Copy link
Member

@hppritcha Given that we're likely to either try to get these commits upstream (in some form -- probably not exactly as they are now, but as some kind of optional functionality), should we squash these down a little? I don't mean squash everything into a single commit -- but there are some Makefile changes and then fixups to thoseMakefile changes, etc.

Specifically: I don't think it's necessary to 100% honor the cherry-pick of the original commits. I think we want to honor the original authorship and give credit to the original commit authors, but we can do that through Signed-off-by and/or Co-authored-by types of attributions in the commit messages. What do you think?

@hppritcha
Copy link
Member Author

that sounds good to me. Also, I'll repoint the PR to an ompi_main branch to be generated shortly.

@hppritcha hppritcha changed the base branch from main to ompi_main May 13, 2025 23:23
@hppritcha
Copy link
Member Author

@jsquyres could you delete the main branch?

@jsquyres
Copy link
Member

@jsquyres could you delete the main branch?

Done

Add configure CLI option to allow optionally prefixing PRTE binary and
library filenames.

prted: support --with-prte-binary-prefix

Add the prefix to the prted binary name that was passed in via
--with-prte-binary-prefix.

Add prefixing capability to prrte library and binaries

Updated Makefile.am files to include @PRTE_BINARY_PREFIX@ in library and
binary names where appropriate.
Verified successful build and functionality of prefixed binaries
This commit ensures compatiblity with prefixed binary naming while
maintaining the integrity of the build system and runtime.

Added and finalized ompi- prefix updates for PRRTE manpages.

Added ompi- prefix for all instances of prte commands within both the man/man1 and man/man5 directories, and also renamed necessary files to accommodate changes.

Updated and corrected ompi- prefix for prrte manpages

Finalized changes to prrte manpages with -ompi prefix

Changed configuration.rst file to fix warning that is being treated as an error

Also fixed docs/Makefile.am for appropriate file renames

Turned main function in prte.c into library function provided in libprrte.so

manual addition of much of the content of UofL work in

uofl-capstone-open-mpi#6

avoid defining PRTE_BINARY_PREFIX twice

makefile fixes for prrte binary prefixing

There were changes to PRRTE after UofL merged

uofl-capstone-open-mpi#9

into their fork of prrte.  These changes get it working again.

modify some makefiles that UofL somehow missed

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
@hppritcha hppritcha force-pushed the uofl_prs_and_some_fixes branch from 4ca2e9c to 1e939fe Compare June 2, 2025 16:51
@hppritcha hppritcha merged commit 572d99a into open-mpi:ompi_main Jun 4, 2025
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants