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.

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

bugfix: fix JIT compilation of batch prefill attention kernels #670

Merged
merged 1 commit into from
Dec 17, 2024
Merged

bugfix: fix JIT compilation of batch prefill attention kernels #670

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
45 changes: 14 additions & 31 deletions flashinfer/jit/batch_prefill_templ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"""
Copyright(c) 2024 by FlashInfer team.
Copyright (c) 2024 by FlashInfer team.

Licensed under the Apache License,
Version 2.0(the "License");
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

Expand Down Expand Up @@ -32,18 +31,13 @@ def ragged_prefill_inst_templ(mask_mode: str) -> str:
#include <flashinfer/attention/variants.cuh>

namespace flashinfer {
{
% set use_alibi = "true" if pos_encoding_mode == "PosEncodingMode::kALiBi" else "false" %
}
{% set use_alibi = "true" if pos_encoding_mode == "PosEncodingMode::kALiBi" else "false" %}
using RaggedParamsT =
BatchPrefillRaggedParams<{{dtype_q}}, {{dtype_kv}}, {{dtype_o}}, {{dtype_idx}}>;
constexpr bool use_custom_mask =
""
"
+ mask_mode +
r
""
" == MaskMode::kCustom;
"""
+ mask_mode
+ r""" == MaskMode::kCustom;
using RaggedAttentionVariant =
ComposedAttention<RaggedParamsT,
get_variant_code(use_custom_mask, {{use_sliding_window}},
Expand Down Expand Up @@ -84,18 +78,13 @@ def paged_prefill_inst_templ(mask_mode: str) -> str:
#include <flashinfer/attention/variants.cuh>

namespace flashinfer {
{
% set use_alibi = "true" if pos_encoding_mode == "PosEncodingMode::kALiBi" else "false" %
}
{% set use_alibi = "true" if pos_encoding_mode == "PosEncodingMode::kALiBi" else "false" %}
using PagedParamsT =
BatchPrefillPagedParams<{{dtype_q}}, {{dtype_kv}}, {{dtype_o}}, {{dtype_idx}}>;
constexpr bool use_custom_mask =
""
"
+ mask_mode +
r
""
" == MaskMode::kCustom;
"""
+ mask_mode
+ r""" == MaskMode::kCustom;
using PagedAttentionVariant =
ComposedAttention<PagedParamsT, get_variant_code(use_custom_mask, {{use_sliding_window}},
{{use_logits_soft_cap}}, {{use_alibi}})>;
Expand Down Expand Up @@ -183,8 +172,7 @@ def paged_prefill_inst_templ(mask_mode: str) -> str:

using namespace flashinfer;

{
% set use_alibi = "true" if pos_encoding_mode == "PosEncodingMode::kALiBi" else "false" %}
{% set use_alibi = "true" if pos_encoding_mode == "PosEncodingMode::kALiBi" else "false" %}
using RaggedParamsT = BatchPrefillRaggedParams<{{ dtype_q }}, {{ dtype_kv }}, {{ dtype_o }}, {{ dtype_idx }}>;

namespace flashinfer {
Expand Down Expand Up @@ -245,9 +233,7 @@ def paged_prefill_inst_templ(mask_mode: str) -> str:
(maybe_qk_indptr ? static_cast<{{dtype_idx}}*>(maybe_qk_indptr->data_ptr()) : nullptr),
/*q_offset=*/nullptr, /*k_rope_pos_offset=*/nullptr, static_cast<{{dtype_o}}*>(o.data_ptr()),
/*lse=*/(maybe_lse ? static_cast<float*>(maybe_lse->data_ptr()) : nullptr),
{ % if use_alibi == "true" % } static_cast<float*>(maybe_alibi_slopes->data_ptr()) {
% else %
} nullptr { % endif % },
{% if use_alibi == "true" %} static_cast<float*>(maybe_alibi_slopes->data_ptr()) {% else %} nullptr {% endif %},
num_qo_heads, num_kv_heads, q_stride_n, q_stride_h, kv_stride_n, kv_stride_h, window_left,
logits_soft_cap, sm_scale, rope_scale, rope_theta);

Expand Down Expand Up @@ -316,8 +302,7 @@ def paged_prefill_inst_templ(mask_mode: str) -> str:

using namespace flashinfer;

{
% set use_alibi = "true" if pos_encoding_mode == "PosEncodingMode::kALiBi" else "false" %}
{% set use_alibi = "true" if pos_encoding_mode == "PosEncodingMode::kALiBi" else "false" %}
using PagedParamsT = BatchPrefillPagedParams<{{ dtype_q }}, {{ dtype_kv }}, {{ dtype_o }}, {{ dtype_idx }}>;

namespace flashinfer {
Expand Down Expand Up @@ -397,9 +382,7 @@ def paged_prefill_inst_templ(mask_mode: str) -> str:
(maybe_qk_indptr ? static_cast<{{dtype_idx}}*>(maybe_qk_indptr->data_ptr()) : nullptr),
/*q_offset=*/nullptr, static_cast<{{dtype_o}}*>(o.data_ptr()),
/*lse=*/(maybe_lse ? static_cast<float*>(maybe_lse->data_ptr()) : nullptr),
{ % if use_alibi == "true" % } static_cast<float*>(maybe_alibi_slopes->data_ptr()) {
% else %
} nullptr { % endif % },
{% if use_alibi == "true" %} static_cast<float*>(maybe_alibi_slopes->data_ptr()) {% else %} nullptr {% endif %},
num_qo_heads, q_stride_n, q_stride_h, window_left, logits_soft_cap, sm_scale, rope_scale,
rope_theta);

Expand Down