[bugfix] fix flex-attention not supported on Ascend NPU, update BlockMask type annotations to str #38369
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.
What does this PR do?
1. Problem 1
Flex-attention has not been fully verified on Ascend NPU yet. In PR #37866 , the func
is_torch_flex_attn_availabledefined in below code does not contain logical judgment about Ascend NPU. In this situation, when we use torch>=2.5.0, this func will returnTrueon Ascend NPU, which is not correct.transformers/src/transformers/utils/import_utils.py
Line 412 in d03a3ca
2. Problem 2
If func
is_torch_flex_attn_availablereturnFalseon Ascend NPU as expected, objectBlockMaskwill not be imported in below codetransformers/src/transformers/masking_utils.py
Line 29 in a5a0c7b
But this object is directly called in type annotations in below code now, directly causing importance error.
transformers/src/transformers/masking_utils.py
Line 585 in a5a0c7b
Therefore, this PR is committed for solving above two problems. By adding flex-attention not supported on Ascend NPU logic in
is_torch_flex_attn_available, and updatingBlockMasktype annotations to string format.Fixes # (issue)
#38362
Before submitting
Pull Request section?
to it if that's the case.
documentation guidelines, and
here are tips on formatting docstrings.