Branch: smla-only baseline before COMM_PROTOCOL_UBC_CTP ops - #2
Draft
yjyang62 wants to merge 2 commits into
Draft
Conversation
Co-authored-by: INeedAnID<panjie38@huawei.com> # message auto-generated for no-merge-commit merge: !7879 merge bsnd_padding into master bsnd padding功能+fdworkspaceID计算修复 Created-by: INeedAnID Commit-by: INeedAnID Merged-by: cann-robot Description: ## 描述 <!--在这里详细描述你的改动,包括改动的原因和所采取的方法。--> bsnd padding功能+fdworkspaceID计算修复 ## 关联的Issue <!-- 如果这个PR是为了解决特定的Issue,请在这里提供Issue链接。例如:关联Issue #000--> <!-- 如果这个PR是为了解决特定的问题单,请在这里描述问题单单号。--> ## 测试 <!--描述进行了哪些测试来验证你的改动。包括但不限于二级冒烟、算子泛化等。--> ## 文档更新 <!--如果这个PR包含文档的更新,请在这里指出。例如:更新了README.md文件。--> ## 类型标签 <!-- [x] 表示选中 --> - [x] 🐛 Bug修复 - [ ] ✨ 新特性 - [ ] ⚡ 性能优化 - [ ] ♻️ 重构 - [ ] 🧪 测试 - [ ] 📦 构建/CI - [ ] 🔧 配置变更 - [ ] 📝 文档更新 - [ ] ⬆️ 依赖升级 - [ ] 🔒 安全修复 - [ ] 🧹 代码清理 - [ ] ❓ 其他,请描述: See merge request: cann/ops-transformer!7879
Co-authored-by: weinachuan<weinachuan1@huawei.com> !7403 merge codex/smla-optional-stride into master SMLA按stride数组指针获取KV stride0 Created-by: Wei_NaChuan Commit-by: weinachuan Merged-by: cann-robot Description: ## 描述 SparseFlashMla tiling 中获取 optional input stride 时,按 `GetOptionalInputStride` / `GetInputStride` 返回的 stride 数组指针读取第 0 维 stride,判空后使用 `stride[0]`。同时保留对象型 stride 兼容分支,以及无法获取 stride 时回退连续内存推导的行为。 新增 SMLA stride 调测脚本和一键使用README,构造 BSND + SCFA 场景下 0 轴非连续的 `ori_kv` 和 `cmp_kv`,打印输入 stride 信息,并对比非连续 KV view 与 contiguous KV clone 的输出,用于确认内部 CANN 包中新 stride 接口路径生效。 [#3186](https://gitcode.com/cann/ops-transformer/issues/3186) - 执行 `git diff --check`,通过。 - 执行调测脚本语法检查,通过。 - 编译 `sparse_flash_mla` 与 `sparse_flash_mla_metadata` custom 包,通过。 新增 SMLA stride 调测脚本使用说明。 - [ ] 🐛 Bug修复 - [ ] ✨ 新特性 - [ ] ⚡ 性能优化 - [ ] ♻️ 重构 - [ ] 🧪 测试 - [ ] 📦 构建/CI - [ ] 🔧 配置变更 - [x] 📝 文档更新 - [ ] ⬆️ 依赖升级 - [ ] 🔒 安全修复 - [x] 🧹 代码清理 - [ ] ❓ 其他,请描述: See merge request: cann/ops-transformer!7403
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.
Summary
Creates a build-friendly branch for CANN 9.1.T560 / A5 environments that need up-to-date
sparse_flash_mlawithout pulling in mc2 operators that requireCOMM_PROTOCOL_UBC_CTP(e.g.engram_fetch,moe_ep_dispatch).Branch strategy
24b77a54b([flash_attn]整改torch extension目录) — last commit beforeCOMM_PROTOCOL_UBC_CTPusage was introduceddcd6dbdd2— BSND padding + FlashDecode workspace fix for SMLA2b68f554e— SMLA stride array pointer fix for non-contiguous KVWhat this branch includes
sparse_flash_mla+sparse_flash_mla_metadataimplementationWhat this branch excludes
engram_fetch/engram_fetch_waitmoe_ep_dispatch/moe_ep_combineelastic_bufferCOMM_PROTOCOL integrationCOMM_PROTOCOL_UBC_CTPSuggested build commands
Conflict resolution note
Cherry-pick of
2b68f554ehad doc/tiling conflicts; functional SMLA changes from that commit were kept.