Skip to content

Use self._use_mask in sdpa rewrite call #2135

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

Merged
merged 2 commits into from
Mar 26, 2025
Merged

Use self._use_mask in sdpa rewrite call #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7590799
use self._use_mask in rewrite call
shubhambhokare1 Mar 26, 2025
c0fe363
Merge branch 'main' into sbhokare/sdpa-mask-fix
gramalingam Mar 26, 2025
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
5 changes: 4 additions & 1 deletion onnxscript/rewriter/ort_fusions/sdpa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ def check(self, op, query, key_transposed, value, mask, query_scale, key_scale,
return True

def rewrite(self, op, query, key_transposed, value, mask, **_):
return op.SDPA(query, key_transposed, value, mask, _domain="ai.onnxruntime.fusion")
if self._use_mask:
return op.SDPA(query, key_transposed, value, mask, _domain="ai.onnxruntime.fusion")
else:
return op.SDPA(query, key_transposed, value, _domain="ai.onnxruntime.fusion")


# Rules for SDPA without mask
Expand Down
8 changes: 4 additions & 4 deletions onnxscript/rewriter/ort_fusions/sdpa_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@


@script()
def _unmasked_pre_div_sdpa_script(query, key, value, mask):
def _unmasked_pre_div_sdpa_script(query, key, value):
key_transposed = op.Transpose(key, perm=[0, 1, 3, 2])
divisor = op.Constant(value_float=SQRT_SCALE_FACTOR)
scaled_query = op.Div(query, divisor)
Expand All @@ -41,7 +41,7 @@ def _unmasked_pre_div_sdpa_script(query, key, value, mask):


@script()
def _unmasked_pre_mul_sdpa_script(query, key, value, mask):
def _unmasked_pre_mul_sdpa_script(query, key, value):
key_transposed = op.Transpose(key, perm=[0, 1, 3, 2])
multiplier = op.Constant(value_float=SQRT_MUL_SCALE_FACTOR)
scaled_query = op.Mul(query, multiplier)
Expand All @@ -53,7 +53,7 @@ def _unmasked_pre_mul_sdpa_script(query, key, value, mask):


@script()
def _unmasked_post_div_sdpa_script(query, key, value, mask):
def _unmasked_post_div_sdpa_script(query, key, value):
key_transposed = op.Transpose(key, perm=[0, 1, 3, 2])
divisor = op.Constant(value_float=SCALE_FACTOR)
attn_score = op.MatMul(query, key_transposed)
Expand All @@ -64,7 +64,7 @@ def _unmasked_post_div_sdpa_script(query, key, value, mask):


@script()
def _unmasked_post_mul_sdpa_script(query, key, value, mask):
def _unmasked_post_mul_sdpa_script(query, key, value):
key_transposed = op.Transpose(key, perm=[0, 1, 3, 2])
multiplier = op.Constant(value_float=MUL_SCALE_FACTOR)
attn_score = op.MatMul(query, key_transposed)
Expand Down
Loading