Skip to content

support gqa #2

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.

Sign up for GitHub

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

Open
STwangyingrui wants to merge 1 commit into
base: main
Choose a base branch
from
Open

support gqa #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion spas_sage_attn/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,13 @@ def get_block_map_meansim(q, k, is_causal=False, BLKQ=128, BLKK=64, simthreshd1=
pooled_qblocks, sim_qblocks = get_pool_sim_triton_simmean(q, BLKQ, simthreshd1)
pooled_kblocks, sim_kblocks = get_pool_sim_triton_simmean(k, BLKK, simthreshd1)

# GQA
num_kv_heads = k.size(1)
if num_kv_heads != Headnum:
repeat_factor = Headnum // num_kv_heads
pooled_kblocks = pooled_kblocks.repeat_interleave(repeat_factor, dim=1)
sim_kblocks = sim_kblocks.repeat_interleave(repeat_factor, dim=1)

sim_kblocks = sim_kblocks.unsqueeze(-2).expand(-1, -1, nq, -1) # faster than repeat
sim_qblocks = sim_qblocks.unsqueeze(-1).expand(-1, -1, -1, nk)
pooled_score = pooled_qblocks @ pooled_kblocks.transpose(-1, -2) * q.shape[-1] ** -0.5
Expand Down Expand Up @@ -383,6 +390,13 @@ def get_block_map_meansim_fuse_quant(q, k, km=None, is_causal=False, BLKQ=128, B
pooled_qblocks, sim_qblocks, q_int8, q_scale = get_pool_sim_triton_simmean_fuse_quant(q, None, BLKQ, simthreshd1)
pooled_kblocks, sim_kblocks, k_int8, k_scale = get_pool_sim_triton_simmean_fuse_quant(k, km, BLKK, simthreshd1)

# GQA
num_kv_heads = k.size(1)
if num_kv_heads != Headnum:
repeat_factor = Headnum // num_kv_heads
pooled_kblocks = pooled_kblocks.repeat_interleave(repeat_factor, dim=1)
sim_kblocks = sim_kblocks.repeat_interleave(repeat_factor, dim=1)

sim_kblocks = sim_kblocks.unsqueeze(-2).expand(-1, -1, nq, -1) # faster than repeat
sim_qblocks = sim_qblocks.unsqueeze(-1).expand(-1, -1, -1, nk)
pooled_score = pooled_qblocks @ pooled_kblocks.transpose(-1, -2) * q.shape[-1] ** -0.5
Expand Down Expand Up @@ -444,4 +458,4 @@ def block_map_lut(block_map):
lut = torch.sort(filled_matrix, dim=-1)[0] - 1 # make index start from 0
lut[:, :, :, 1:] = lut[:, :, :, 1:] - lut[:, :, :, :-1]

return lut.to(torch.int32), valid_entry_num.to(torch.int32)
return lut.to(torch.int32), valid_entry_num.to(torch.int32)