Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ var/

# IDE-related
.idea/
.vscode/

# Dev
venv

# compile-time generated file
flash_attn_config.py
6 changes: 3 additions & 3 deletions hopper/flash_api.cpp
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that #1791 is landed can you also update the stable file to keep them in sync?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done!

Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ void run_mha_bwd(Flash_bwd_params &params, cudaStream_t stream) {
// h: num_heads
// h_k: num_heads_k
// d: head_size
std::tuple<at::Tensor, at::Tensor, at::Tensor, at::Tensor, at::Tensor, at::Tensor, at::Tensor, at::Tensor> mha_bwd(
std::tuple<at::Tensor, at::Tensor, at::Tensor, at::Tensor, at::Tensor> mha_bwd(
at::Tensor dout, // (b, s_q, h, dv) or (total_q, h, dv) if there is cu_seqlens_q
at::Tensor q, // (b, s_q, h, d) or (total_q, h, d) if there is cu_seqlens_q
at::Tensor k, // (b, s_k, h_k, d) or (total_k, h_k, d) if there is cu_seqlens_k
Expand Down Expand Up @@ -1563,7 +1563,7 @@ std::tuple<at::Tensor, at::Tensor, at::Tensor, at::Tensor, at::Tensor, at::Tenso
softmax_d.zero_();
}

return { dq, dk, dv, softmax_d, softmax_lse_log2, dq_accum, dk_accum, dv_accum };
return { softmax_d, softmax_lse_log2, dq_accum, dk_accum, dv_accum };
}

std::tuple<at::Tensor, at::Tensor>
Expand Down Expand Up @@ -1727,7 +1727,7 @@ TORCH_LIBRARY(flash_attn_3, m) {
"int window_size_right = -1,"
"float softcap = 0.0,"
"bool deterministic = False,"
"int sm_margin = 0) -> (Tensor(dq!), Tensor(dk!), Tensor(dv!), Tensor, Tensor, Tensor, Tensor, Tensor)");
"int sm_margin = 0) -> (Tensor, Tensor, Tensor, Tensor, Tensor)");
m.def("fwd_combine("
"Tensor out_partial,"
"Tensor lse_partial,"
Expand Down
21 changes: 9 additions & 12 deletions hopper/flash_api_stable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ void run_mha_bwd(Flash_bwd_params &params, cudaStream_t stream) {
// h: num_heads
// h_k: num_heads_k
// d: head_size
std::tuple<Tensor, Tensor, Tensor, Tensor, Tensor, Tensor, Tensor, Tensor> mha_bwd(
std::tuple<Tensor, Tensor, Tensor, Tensor, Tensor> mha_bwd(
Tensor dout, // (b, s_q, h, dv) or (total_q, h, dv) if there is cu_seqlens_q
Tensor q, // (b, s_q, h, d) or (total_q, h, d) if there is cu_seqlens_q
Tensor k, // (b, s_k, h_k, d) or (total_k, h_k, d) if there is cu_seqlens_k
Expand Down Expand Up @@ -1641,7 +1641,7 @@ std::tuple<Tensor, Tensor, Tensor, Tensor, Tensor, Tensor, Tensor, Tensor> mha_b
torch::stable::zero_(softmax_d);
}

return { dq, dk, dv, softmax_d, softmax_lse_log2, dq_accum, dk_accum, dv_accum };
return { softmax_d, softmax_lse_log2, dq_accum, dk_accum, dv_accum };
}

std::tuple<Tensor, Tensor>
Expand Down Expand Up @@ -1828,16 +1828,13 @@ void boxed_mha_bwd(
auto deterministic = to<bool>(stack[20]);
auto sm_margin = to<int64_t>(stack[21]);

auto [dq_, dk_, dv_, softmax_d, softmax_lse_log2, dq_accum, dk_accum, dv_accum] = mha_bwd(dout, q, k, v, out, softmax_lse, dq, dk, dv, cu_seqlens_q, cu_seqlens_k, seqused_q, seqused_k, max_seqlen_q, max_seqlen_k, softmax_scale, is_causal, window_size_left, window_size_right, softcap, deterministic, sm_margin);
auto [softmax_d, softmax_lse_log2, dq_accum, dk_accum, dv_accum] = mha_bwd(dout, q, k, v, out, softmax_lse, dq, dk, dv, cu_seqlens_q, cu_seqlens_k, seqused_q, seqused_k, max_seqlen_q, max_seqlen_k, softmax_scale, is_causal, window_size_left, window_size_right, softcap, deterministic, sm_margin);

stack[0] = from(dq_);
stack[1] = from(dk_);
stack[2] = from(dv_);
stack[3] = from(softmax_d);
stack[4] = from(softmax_lse_log2);
stack[5] = from(dq_accum);
stack[6] = from(dk_accum);
stack[7] = from(dv_accum);
stack[0] = from(softmax_d);
stack[1] = from(softmax_lse_log2);
stack[2] = from(dq_accum);
stack[3] = from(dk_accum);
stack[4] = from(dv_accum);
}

void boxed_mha_combine(
Expand Down Expand Up @@ -1949,7 +1946,7 @@ STABLE_TORCH_LIBRARY(flash_attn_3, m) {
"int window_size_right = -1,"
"float softcap = 0.0,"
"bool deterministic = False,"
"int sm_margin = 0) -> (Tensor(dq!), Tensor(dk!), Tensor(dv!), Tensor, Tensor, Tensor, Tensor, Tensor)");
"int sm_margin = 0) -> (Tensor, Tensor, Tensor, Tensor, Tensor)");
m.def("fwd_combine("
"Tensor out_partial,"
"Tensor lse_partial,"
Expand Down
Loading