Skip to content

v4.0.x: orterun.1in: fix minor mistake in :PE=2 example and add more descriptions/explanations#8099

Merged
gpaulsen merged 3 commits intoopen-mpi:v4.0.xfrom
jsquyres:pr/v4.0.x/fix-minor-mistake-in-mpirun.1in
Nov 9, 2020
Merged

v4.0.x: orterun.1in: fix minor mistake in :PE=2 example and add more descriptions/explanations#8099
gpaulsen merged 3 commits intoopen-mpi:v4.0.xfrom
jsquyres:pr/v4.0.x/fix-minor-mistake-in-mpirun.1in

Conversation

@jsquyres
Copy link
Member

@jsquyres jsquyres commented Oct 17, 2020

See individual commit messages for detail

These are not cherry-picks from master because PRRTE has replaced ORTE on master, and orterun.1in no longer exists in master.

Refs #7717

@jsquyres
Copy link
Member Author

@rhc54 If this is correct, I'll make a PR to cherry-pick this to the v4.1.x branch.

@lanl-ompi
Copy link
Contributor

Can one of the admins verify this patch?

@gpaulsen
Copy link
Member

gpaulsen commented Nov 4, 2020

@jsquyres Can you please update or comment on @rhc54's comment please?

@jsquyres jsquyres force-pushed the pr/v4.0.x/fix-minor-mistake-in-mpirun.1in branch from 24d6149 to 4cc3649 Compare November 7, 2020 19:13
@jsquyres
Copy link
Member Author

jsquyres commented Nov 7, 2020

@rhc54 Per our phone conversation, I updated the text. I actually made 3 separate commits that you may want to look at individually:

  1. Fix the example and add a little further explanation of that example.
  2. Add sections to define "slot" and "processor element".
  3. Add a little more markup (no content changed, just markup).

@jsquyres jsquyres changed the title v4.0.x: mpirun.1in: fix minor mistake in :PE=2 example v4.0.x: mpirun.1in: fix minor mistake in :PE=2 example and add more descriptions/explanations Nov 7, 2020
@jsquyres jsquyres changed the title v4.0.x: mpirun.1in: fix minor mistake in :PE=2 example and add more descriptions/explanations v4.0.x: orterun.1in: fix minor mistake in :PE=2 example and add more descriptions/explanations Nov 7, 2020
Fix mistake in orterun(1) (i.e., mpirun(1)) with an example using the
:PE=x modifier.  Additionally, add some extra text with some further
explanation.

This is not a cherry-pick from master because PRRTE has replaced ORTE
on master, and orterun.1in no longer exists in master.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
@jsquyres jsquyres force-pushed the pr/v4.0.x/fix-minor-mistake-in-mpirun.1in branch from 4cc3649 to 2aeb796 Compare November 7, 2020 19:28
@jjhursey
Copy link
Member

jjhursey commented Nov 9, 2020

Note: We need to make sure to sync the language in this PR with the PRRTE version being developed (I'll do that - just dropping a note to link the two)

Jeff Squyres added 2 commits November 9, 2020 10:55
Add descriptive definitions of "slot" and "processor element" at the
top of the man page (and effectively delete / move some text from
lower in the man page up into those definitions).

Also add a little blurb in the --use-hwthread-cpus description about how
it changes the definition of "processor element".

This is not a cherry-pick from master because PRRTE has replaced ORTE
on master, and orterun.1in no longer exists in master.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
Add some nroff markup into the paragraph, just to clearly delineate
the option names from the paragraph text.  No other content changes.

This is not a cherry-pick from master because PRRTE has replaced ORTE
on master, and orterun.1in no longer exists in master.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
@jsquyres jsquyres force-pushed the pr/v4.0.x/fix-minor-mistake-in-mpirun.1in branch from 2aeb796 to 25f84be Compare November 9, 2020 15:56
@gpaulsen gpaulsen merged commit 1c8837e into open-mpi:v4.0.x Nov 9, 2020
@jsquyres jsquyres deleted the pr/v4.0.x/fix-minor-mistake-in-mpirun.1in branch November 9, 2020 18:25
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