Skip to content

Conversation

@kawashima-fj
Copy link
Member

Various manpage corrections.

This PR consists of 16 commits. Please read each commit message for each change.

I forgot to write a description in the commit message of 519ddd9.
I changed five things:

  • ompi/mpi/man/man3/MPI.3in originally had a big bug. The values of MPI_ERR_ROOT and below are not equal to values defined in mpi.h and mpif.h. In the manpage, both MPI_ERR_REQUEST and MPI_ERR_ROOThad the value 7 and all error classes below MPI_ERR_ROOT had -1 values.
  • Remove unused MPI_ERR_SYSRESOURCE.
  • Add error classes added in MPI-3.0 (MPI_T and RMA).
  • Increase MPI_ERR_LASTCODE to match mpi.h.
  • Change indentation of existing error classes to be pretty with added error classes.

I'll create a new PR for v2.x if this PR is accepted.
(with appropriate label and milestone)

During my code editing, I found that most MPI_File_* manpages does not have INCLUDE 'mpif.h -> USE MPI change done by Gilles recently. I'll convert them in another PR if anyone is aware.

@lanl-ompi
Copy link
Contributor

Test FAILed.

2 similar comments
@lanl-ompi
Copy link
Contributor

Test FAILed.

@lanl-ompi
Copy link
Contributor

Test FAILed.

@kawashima-fj
Copy link
Member Author

bot:label:documentation

@jsquyres
Copy link
Member

@kawashima-fj We only have the OMPI bot watching the ompi-release PRs, not the ompi (master) PRs.

I found 1 super-minor nit (accidental removal of a const), but otherwise this looks great.

@hppritcha
Copy link
Member

what's going on with jenkins?
bot:retest

@kawashima-fj
Copy link
Member Author

@jsquyres I updated my PR branch for removed const. Thanks.

This reverts commit 2226cdb
and                 d9c93c9.

Because Gilles' b17c89c committed a few hours ago has the same change,
my RP branch had a conflict.
This reverts commit 3253a30.

Because Gilles' b17c89c committed a few hours ago has the same change,
my RP branch had a conflict.
@kawashima-fj
Copy link
Member Author

My PR branch was updated to resolve the conflict with Gilles' b17c89c by reverting my three commits.

jsquyres added a commit that referenced this pull request Oct 20, 2015
@jsquyres jsquyres merged commit 630d6bf into open-mpi:master Oct 20, 2015
@jsquyres
Copy link
Member

@kawashima-fj Perfect -- thank you! Can you PR this to v2.x, as well?

@ggouaillardet
Copy link
Contributor

@kawashima-fj
FYI
when you are working inside a git branch, and it cannot be merged because some conflicting changes occured in the master, you have the option to rebase&and fix conflicts instead of reverting conflicting changes.
for example, you could have done (from your pr/man-correction branch, and once all changes have been commited)

git remote update
# i assume origin points to https://github.com/open-mpi/ompi.git
git rebase -i origin/master

if some conflicts are not automatically resolved, you have to fix them manually with your favorite editor, and then

git commit -a
# or git add <modified files list> followed by  git commit
git rebase --continue

and re-iterate until the rebase operation is fixed.
if the branch was previously pushed into your github account, you need to force the update

# i assume kawashima-fj points to https://github.com/kawashima-fj/ompi.git
git push --force -u kawashima-fj pr/man-correction

@kawashima-fj
Copy link
Member Author

@ggouaillardet Thanks for your information. I'll do it next time.

@kawashima-fj kawashima-fj deleted the pr/man-correction branch December 24, 2015 08:03
jsquyres pushed a commit to jsquyres/ompi that referenced this pull request Aug 23, 2016
btl/openib: update rdmacm for dynamic add_procs
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