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

Jump to bottom

[1.7 Cherry Picks] #1572

Merged
merged 2 commits into from
Feb 1, 2024
Merged

[1.7 Cherry Picks] #1572

merged 2 commits into from
Feb 1, 2024

Conversation

dsikka
Copy link
Contributor

@dsikka dsikka commented Jan 31, 2024 •
edited
Loading

@dsikka
[server] Disable the elastic scheduler when continuous batching is en…
29a826d 
…abled (#1569)

* update server to disable the context/elastic scheduler when continuous batching is enabled

* clean up when context is created
@dsikka
[TextGeneration] Fix initialization; don't try v1 init for text gen (#…
2f6cd9d 
…1571)

* only check capacity condition durin prefill; already have check in generation

* dont try v1 if running text gen; just raise error
@dsikka dsikka requested a review from bfineran January 31, 2024 22:31
@dsikka dsikka changed the title Cherry pick [1.7 Cherry Picks] Jan 31, 2024
rahul-tuli
rahul-tuli approved these changes Jan 31, 2024
View reviewed changes
Copy link
Member

@rahul-tuli rahul-tuli left a comment

Choose a reason for hiding this comment

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

Ship it! 🚢

@dsikka dsikka merged commit 16f9409 into release/1.7 Feb 1, 2024
12 checks passed
@dsikka dsikka deleted the cherry_pick branch February 1, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgoin mgoin mgoin approved these changes

@bfineran bfineran bfineran approved these changes

@rahul-tuli rahul-tuli rahul-tuli approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dsikka @mgoin @bfineran @rahul-tuli