Skip to content

[misc] use out argument for flash attention#9740

Closed
youkaichao wants to merge 4 commits intovllm-project:mainfrom
youkaichao:flash_out
Closed

[misc] use out argument for flash attention#9740
youkaichao wants to merge 4 commits intovllm-project:mainfrom
youkaichao:flash_out

Conversation

@youkaichao
Copy link
Copy Markdown
Member

rework of #5138

cc @Yard1 @njhill if you have any comments about why it is reverted in #5478

Signed-off-by: youkaichao <youkaichao@gmail.com>
Signed-off-by: youkaichao <youkaichao@gmail.com>
@github-actions
Copy link
Copy Markdown

👋 Hi! Thank you for contributing to the vLLM project.
Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can do one of these:

  • Add ready label to the PR
  • Enable auto-merge.

🚀

Signed-off-by: youkaichao <youkaichao@gmail.com>
Signed-off-by: youkaichao <youkaichao@gmail.com>
@youkaichao youkaichao added the ready ONLY add when PR is ready to merge/full CI is needed label Oct 27, 2024
@WoosukKwon
Copy link
Copy Markdown
Collaborator

@youkaichao Now that #10811 is merged, this PR should pass the test. Please rebase the PR.

Copy link
Copy Markdown
Collaborator

@Yard1 Yard1 left a comment

Choose a reason for hiding this comment

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

Looks good, assuming tests pass

softcap=soft_cap if soft_cap is not None else 0,
window_size=window_size,
).squeeze(1)
out=output.unsqueeze(1),
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

suggestion - do the unsqueeze during creation (either by passing in the modified shape or just .empty_like(...).unsqueeze(1). I think that will be cleaner

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Dec 2, 2024

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @youkaichao.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@youkaichao
Copy link
Copy Markdown
Member Author

close as it has been reworked in #10822

@youkaichao youkaichao closed this Dec 2, 2024
@youkaichao youkaichao deleted the flash_out branch December 2, 2024 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-rebase ready ONLY add when PR is ready to merge/full CI is needed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants