Merge latest develop into meta/fmha-fwd-block-sparsity (resolve conflicts) - #1
Open
poyenc wants to merge 5456 commits into
Open
Merge latest develop into meta/fmha-fwd-block-sparsity (resolve conflicts)#1poyenc wants to merge 5456 commits into
poyenc wants to merge 5456 commits into
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Resolves the merge conflicts blocking PR ROCm#6534 by merging the latest
ROCm/rocm-libraries:developinto this branch.The branch had diverged: 39 commits ahead of a merge base that
developwas ~5455 commits past. Three files conflicted, all in the FMHA forward example/test:example/ck_tile/01_fmha/example_fmha_fwd.cppexample/ck_tile/01_fmha/fmha_fwd_runner.hpptest/ck_tile/fmha/test_fmha_fwd.cppResolution
All conflicts were the same "both-added" shape: this branch added a
block_maskparameter whiledevelopindependently addedpack_gqa. Both were kept, with two correctness details:.insert(...)fluent arg-parser chain, dropped the statement-terminating;afterblock_maskso the chain continues intopack_gqa.block_mask_str->pack_gqaat every call site to match the runner signature infmha_fwd_runner.hpp(positional args).Formatting
clang-format-18usingprojects/composablekernel/.clang-format.Verification
git diffof the merge result vsorigin/developshows only this branch'sblock_maskadditions;develop'spack_gqapreserved.How to land
Merge this into
meta/fmha-fwd-block-sparsity; that advances the head branch of ROCm#6534 and clears its conflict state againstdevelop.