fix(merge): drop stray break in amo_nonfetch_add#17
Open
fergusfinn wants to merge 1 commit into
Open
Conversation
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
1 participant
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.