enable softcap and gemma2 #288
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gshtras
requested changes
Dec 2, 2024
| @@ -218,12 +218,6 @@ def decode_metadata(self) -> Optional["ROCmFlashAttentionMetadata"]: | |||
| max_encoder_seq_len=self.max_encoder_seq_len, | |||
| cross_slot_mapping=self.cross_slot_mapping, | |||
| cross_block_tables=self.cross_block_tables) | |||
| # Batch may be composed of prefill|decodes, adjust query start indices | |||
There was a problem hiding this comment.
Why is this section being removed?
There was a problem hiding this comment.
sorry... this is accident... it has been restored.
|
|
||
| if logits_soft_cap is None: | ||
| # In flash-attn, setting logits_soft_cap as 0 means no soft cap. | ||
| logits_soft_cap = 0 |
There was a problem hiding this comment.
This effectively enables logits_soft_cap for any model, unconditionally.
There was a problem hiding this comment.
In flash attention, it is 0 by default, I think. https://github.com/ROCm/flash-attention/blob/main/flash_attn/flash_attn_interface.py#L1334
| @@ -511,6 +515,11 @@ def __init__( | |||
| self.use_naive_attn = True | |||
|
|
|||
| if self.use_naive_attn: | |||
| if logits_soft_cap is not None: | |||
There was a problem hiding this comment.
You make sure it's not None in the constructor. So naive flash attention can never be used now
gshtras
approved these changes
Dec 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Gemma2 model needs softcap feature from flash attention.