Repository navigation
Upstream sync 26/N: merge 5fa8ca971a [ROCm][CI] Move ROCm AITER quantization tests (#40938) (conflict) - #1273
Merged
Merged
Conversation
Signed-off-by: Andreas Karatzas <akaratza@amd.com> Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com> Co-authored-by: OpenAI Codex <codex@openai.com>
…tion tests (vllm-project#40938) (conflict) Conflict-only step. One conflict, and it is a *rename/location* conflict rather than a content one - the only instance of this shape so far in the campaign: CONFLICT (file location): tests/rocm/aiter/test_fused_qk_norm_mrope_kvcache.py added in rogarcia.merge-upstream-121 inside a directory that was renamed in 5fa8ca9, suggesting it should perhaps be moved to tests/kernels/quantization/test_fused_qk_norm_mrope_kvcache.py Upstream dissolves tests/rocm/aiter/ into the standard tests/kernels/ tree (test_aiter_hipb_mm_linear_kernel.py, test_quant_op_schema.py, test_grouped_quant.py all move to tests/kernels/quantization/, and test_mla_fp8_support_check.py becomes tests/kernels/attention/test_rocm_aiter_mla_fp8_support.py). The fork owns one additional file in that directory, and git relocated it but left it staged AU (added by us, unmerged) for confirmation rather than deciding on its own. ours: tests/rocm/aiter/test_fused_qk_norm_mrope_kvcache.py theirs: <directory renamed away; file does not exist upstream> resolved: tests/kernels/quantization/test_fused_qk_norm_mrope_kvcache.py (same content, new location - accept git's relocation) Accepted the relocation. Verified it is a pure move: diffed the file at the new path against the fork's copy at batch 25 - byte-identical, no content merge happened - and confirmed tests/rocm/ is now empty rather than left as a stray half-populated directory. The part worth checking, since a misplaced test does not fail but simply stops running: CI still covers it. No reference to tests/rocm or rocm/aiter survives anywhere under .buildkite/, and kernels.yaml runs the whole directory (pytest -v -s kernels/quantization, sharded), so the relocated file is picked up by path rather than by name. Leaving it at the old location would have quietly dropped the fork's qk-norm/mrope/kvcache coverage from every CI run. py_compile passes on the relocated file.
|
|
Author
Feel free to push commits on the PRs |
Signed-off-by: Dan Eble <Dan.Eble@amd.com>
eble-amd
approved these changes
Sep 10, 2026
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
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.
Context
Twenty-sixth step. Stacked on #1272. Conflict-only step.
Merged upstream changes:
5fa8ca971a[ROCm][CI] Move ROCm AITER quantization tests vllm-project/vllm#40938 — [ROCm][CI] Move ROCm AITER quantization testsOne conflict, and it is a rename/location conflict rather than a content one — the only instance of this shape in the campaign:
Upstream dissolves
tests/rocm/aiter/into the standardtests/kernels/tree. The fork owns one extra file there; git relocated it but left it stagedAU(added by us, unmerged) rather than deciding alone.Audit
Verified it is a pure move: diffed the file at the new path against the fork's copy at batch 25 — byte-identical, no content merge occurred — and confirmed
tests/rocm/is now empty rather than a stray half-populated tree.The part that actually matters, because a misplaced test does not fail, it simply stops running: no reference to
tests/rocmorrocm/aitersurvives anywhere under.buildkite/, andkernels.yamlruns the whole directory (pytest -v -s kernels/quantization, sharded), so the relocated file is picked up by path. Leaving it at the old location would have quietly dropped the fork's qk-norm/mrope/kvcache coverage from every CI run.py_compilepasses on the relocated file.Merge commit only — do not squash or rebase.
AI assistance was used to prepare this merge.
Test plan
Build + 6-model benchmark sweep vs the Strix Halo dashboard (queued)(N/A: no relevant program code was touched)