fix(merge): drop stray break in amo_nonfetch_add - #17
Closed
fergusfinn wants to merge 21 commits into
Closed
Conversation
- add a libfabric CXI transport backend and wire it into the EP proxy runtime - add generic build switches for USE_LIBFABRIC_CXI and NUM_MAX_NVL_PEERS - relax internode benchmark assumptions so validation works on non-8-GPU nodes
Add CXI transport support for EP
- remove premature loop exits when posting quiet and barrier commands - ensure every proxy thread is drained before RDMA buffer reuse
- remove premature loop exits when posting quiet and barrier commands - ensure every proxy thread is drained before RDMA buffer reuse
[bugfix]: drain all proxy queues during sync
fix(ep): guard CXI libfabric include
- keep the default MAX_NUM_GPUS value at 8 - allow setup.py and Makefile builds to override MAX_NUM_GPUS - preserve NUM_MAX_NVL_PEERS as a separate EP topology knob
- restore the sync loop exit so BARRIER remains posted through one representative queue - keep QUIET handling separate from BARRIER semantics for CXI timeout debugging
- widen quiet and barrier wr id storage so FIFO ring bits are not truncated - keep the existing negative sentinel while preserving high 32-bit queue indices
- post QUIET to every CXI D2H queue so sibling proxy queues are drained - track the posted queue index and wait on the exact queue for completion
# Conflicts: # ep/Makefile
uccl-project#997 refactored the per-channel for-loop into a direct index computation (removing its trailing break); uccl-project#998 touched adjacent lines so the 3-way merge kept uccl-project#998's body, resurrecting a break now outside any loop. Invalid C++ (uccl_ibgda.cuh: 'break may only be used within a loop or switch'). Semantic resolution of the uccl-project#997+uccl-project#998 compose that the clean textual merge missed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changed
Drops a stray
break;left innvshmemi_ibgda_amo_nonfetch_addafter composing the upstream-base stack.Why
The uccl-project#997 change refactored the per-channel loop into a direct channel-index computation, removing the loop that the trailing
break;originally belonged to. uccl-project#998 touched the adjacent body, and the clean textual merge preserved a now-invalidbreak;outside any loop/switch.Validation
git diff --check origin/upstream-base..HEAD/v1/chat/completionsreturnedOK.