Skip to content

Fixup: osc/ucx: implement rput and rget using ucp_worker_flush_nb #10668

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Aug 16, 2022
Merged

Fixup: osc/ucx: implement rput and rget using ucp_worker_flush_nb #10668

merged 3 commits into from
Aug 16, 2022

Conversation

@devreal
Copy link
Contributor

@devreal devreal commented Aug 15, 2022 •
edited by awlauria
Loading

This PR brings the changes from #10642 and #10658 to 5.0.x:

  1. Revert a commit that was erroneous on main but correct in 5.0.x in osc/ucx: implement rput and rget using ucp_worker_flush_nb [v5.0.x]  #10554. For consistency purposes, the backport of the faulty commit is reverted and the corrected commit applied.
  2. Bring in a follow-up fixup to ensure proper release of requests in error branches. This again was missing from the master PR.

bot:notacherrypick

devreal added 2 commits August 11, 2022 14:41
@devreal
Revert "osc/ucx: implement rput and rget using ucp_worker_flush_nb"
7263c5a 
This reverts commit ca5b99c.
@devreal
osc/ucx: implement rput and rget using ucp_worker_flush_nb
862a051 
Fallback to the old method of acquiring a request from an atomic operation
is preserved. Some networks might provide better performance
if the request-based operations do not rely on atomic operations.

Some minor fixes to opal_common_ucx_winfo_flush included in this
commit.

Signed-off-by: Joseph Schuchart <schuchart@icl.utk.edu>
(cherry picked from commit e7d8cc7)
@devreal devreal requested a review from janjust August 15, 2022 19:26
@devreal
osc/ucx: Add missing calls to OMPI_OSC_UCX_REQUEST_ALLOC in rget/rput…
9fe00eb 
… error paths

Signed-off-by: Joseph Schuchart <schuchart@icl.utk.edu>
(cherry picked from commit c66aab0)
@devreal devreal force-pushed the osc-ucx-rputget-flushnb-main-fixup-5.0.x branch from 4c18805 to 9fe00eb Compare August 15, 2022 19:32
@devreal
Copy link
Contributor Author

devreal commented Aug 15, 2022

@jsquyres what is the right way to revert commits on release branches? Should I specify the not-a-cherrypick tag?

Error: * 7263c5a: Revert "osc/ucx: implement rput and rget using ucp...
Error: * check_cherry_pick: does not include a cherry pick message (did you need to bot:notacherrypick?)

@jsquyres
Copy link
Member

jsquyres commented Aug 15, 2022 •
edited
Loading

@jsquyres what is the right way to revert commits on release branches? Should I specify the not-a-cherrypick tag?

Yes: bot:notacherrypick in the body of the PR (it doesn't need to be in the commit message -- just the first/initial description on the PR)

@hppritcha
Copy link
Member

hppritcha commented Aug 15, 2022

bot:ompi:retest

@awlauria
Copy link
Contributor

awlauria commented Aug 16, 2022

@janjust please review

@awlauria awlauria merged commit 78d3d9d into open-mpi:v5.0.x Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@janjust janjust janjust approved these changes

Assignees

No one assigned

Labels

Target: v5.0.x

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@devreal @jsquyres @hppritcha @awlauria @janjust