Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Refactor] Uniform PoDAttention API with Horizontal Fusion SMs Schedule #967

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
happierpig committed Mar 20, 2025
commit bbfae998b418ecf04c6ef6deb159a0e69afb5134
11 changes: 8 additions & 3 deletions csrc/pod.cu
Original file line number Diff line number Diff line change
@@ -174,9 +174,7 @@ void PODWithPagedKVCacheRun(at::Tensor float_workspace_buffer, at::Tensor int_wo
params.paged_kv = paged_kv;

if (plan_info.split_kv) {
params.partition_kv = true;
params.merge_indptr =
GetPtrFromBaseOffset<IdType>(int_buffer_ptr, plan_info.merge_indptr_offset);
params.partition_kv = true; // used in prefill kernel
tmp_v = GetPtrFromBaseOffset<DTypeO>(float_buffer_ptr, plan_info.v_offset);
tmp_s = GetPtrFromBaseOffset<float>(float_buffer_ptr, plan_info.s_offset);
if (plan_info.enable_cuda_graph) {
@@ -195,6 +193,13 @@ void PODWithPagedKVCacheRun(at::Tensor float_workspace_buffer, at::Tensor int_wo
_configureParams(params_p, pod_plan_info.plan_info_p, pod_plan_info.batch_size_vec_p);
_configureParams(params_d, pod_plan_info.plan_info_d, pod_plan_info.batch_size_vec_d);

if (pod_plan_info.plan_info_p.split_kv || pod_plan_info.plan_info_d.split_kv) {
params_p.merge_indptr = GetPtrFromBaseOffset<IdType>(
int_buffer_ptr, pod_plan_info.plan_info_p.merge_indptr_offset);
params_d.merge_indptr = GetPtrFromBaseOffset<IdType>(
int_buffer_ptr, pod_plan_info.plan_info_d.merge_indptr_offset);
}

cudaError_t status = cudaSuccess;

DISPATCH_CTA_TILE_Q(pod_plan_info.plan_info_p.cta_tile_q, CTA_TILE_Q_P, {
1 change: 1 addition & 0 deletions flashinfer/pod.py
Original file line number Diff line number Diff line change
@@ -665,6 +665,7 @@ def run(
sm_scale,
rope_scale,
rope_theta,
get_cuda_stream(q.device),
]

self._cached_module.paged_run(*run_args)
9 changes: 7 additions & 2 deletions include/flashinfer/attention/scheduler.cuh
Original file line number Diff line number Diff line change
@@ -1425,8 +1425,13 @@ struct PoDPlanInfo {
}
// Append boundary element
// used in produce_kv_page
kv_start_ptr_h_p.push_back(kv_start_ptr_h_p.back() + kv_len_ptr_h_p.back());
kv_start_ptr_h_d.push_back(kv_start_ptr_h_d.back() + kv_len_ptr_h_d.back());
if (!kv_start_ptr_h_p.empty()) {
kv_start_ptr_h_p.push_back(kv_start_ptr_h_p.back() + kv_len_ptr_h_p.back());
}
if (!kv_start_ptr_h_d.empty()) {
kv_start_ptr_h_d.push_back(kv_start_ptr_h_d.back() + kv_len_ptr_h_d.back());
}

return std::make_tuple(partition_bitmask, qo_start_ptr_h_p, qo_len_ptr_h_p, kv_start_ptr_h_p,
kv_len_ptr_h_p, kv_last_page_len_h_p, qo_start_ptr_h_d, qo_len_ptr_h_d,
kv_start_ptr_h_d, kv_len_ptr_h_d, kv_last_page_len_h_d);