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

v4.1.x: Bull 2020 update of coll/han #8437

Closed

Conversation

EmmanuelBRELLE
Copy link
Contributor

This completes and fixes current code for coll/Han:

  • a barrier is added
  • a "simple" scatter is added
  • some Doxygen documentation is added

Fix:

  • compilation and cppcheck warnings
  • corner case errors when parsing a rule file

@ompiteam-bot
Copy link

Can one of the admins verify this patch?

@jsquyres
Copy link
Member

jsquyres commented Feb 2, 2021

ok to test

@gpaulsen gpaulsen added this to the v4.1.1 milestone Feb 2, 2021
EmmanuelBRELLE added a commit to EmmanuelBRELLE/ompi that referenced this pull request Feb 3, 2021
@EmmanuelBRELLE EmmanuelBRELLE force-pushed the patch_Han_Bull_2020H2 branch 2 times, most recently from a1c5295 to 8f64e88 Compare February 3, 2021 12:29
This completes and fixes current code for coll/Han:
- a barrier is added
- a "simple" scatter is added
- some Doxygen documentation is added

Fix:
- compilation and cppcheck warnings
- corner case errors when parsing a rule file

Signed-off-by: Emmanuel Brelle <[email protected]>
@EmmanuelBRELLE
Copy link
Contributor Author

Merge is block by "Mellanox CI" on:
configure: error: Aborting because OpenSHMEM requested, but can not build.
... but this PR does not change shared memory configuration.
What shoud I do ?

@ggouaillardet
Copy link
Contributor

The merge is not blocked by Mellanox CI failure.

It is blocked because only release managers can merge PR into the release branches.

Is there any reason why this PR did not target the master branch?
and once merged, issue an other PR to backport the changes into the release branch(es)

@jsquyres
Copy link
Member

jsquyres commented Feb 5, 2021

Has this been merged on master yet? For any patch that is relevant to both master and a release branch, we require it to be merged on master first, and then cherry picked in a separate PR over to the relevant release branch(es). Please make sure to use the git cherry-pick -x ... option to insert the (cherry picked from ...) tagline in the commit message.

Thanks!

@jsquyres
Copy link
Member

jsquyres commented Feb 5, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jsquyres jsquyres changed the title Bull 2020 update of coll/han v4.1.x: Bull 2020 update of coll/han Feb 5, 2021
@jsquyres jsquyres marked this pull request as draft February 6, 2021 21:20
@jsquyres
Copy link
Member

jsquyres commented Feb 6, 2021

I took the liberty of converting this PR to Draft status so that we don't accidentally merge it before it has been merged to master and cherry-picked to v4.1.x.

@EmmanuelBRELLE
Copy link
Contributor Author

PR #8462 just submitted on master to be merged first (sorry).

@bosilca
Copy link
Member

bosilca commented Feb 8, 2021

I will close this for now. Once the PR on master is merged, you will need to recreate this PR by cherry-picking the SHA from master.

@bosilca bosilca closed this Feb 8, 2021
@EmmanuelBRELLE EmmanuelBRELLE deleted the patch_Han_Bull_2020H2 branch February 16, 2021 15:41
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.

6 participants