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

switch to using upstream vllm with new metric #54

Merged
merged 2 commits into from
Dec 12, 2024
Merged

switch to using upstream vllm with new metric #54

merged 2 commits into from
Dec 12, 2024

Conversation

coolkp
Copy link
Contributor

@coolkp coolkp commented Nov 22, 2024

  • switch to using upstream vllm with new metric
  • use latest series in gauge metric vllm:lora_requests_info using the time value of the series
  • Use label pair running_lora_adapters
  • update vllm example deployment to use latest
    Fixes Switch to upstream vLLM #22

@k8s-ci-robot k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Nov 22, 2024
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 22, 2024
@coolkp coolkp changed the title switch to using upstream vllm with new metric Fixes #22 switch to using upstream vllm with new metric Nov 22, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Nov 22, 2024
@coolkp
Copy link
Contributor Author

coolkp commented Nov 22, 2024

/assign conliu

@k8s-ci-robot
Copy link
Contributor

@coolkp: GitHub didn't allow me to assign the following users: conliu.

Note that only kubernetes-sigs members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

/assign conliu

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

liu-cong
liu-cong reviewed Nov 25, 2024
View reviewed changes
Copy link
Contributor

@liu-cong liu-cong left a comment

Choose a reason for hiding this comment

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

Overall lgtm. Will lgtm once PR is updated with benchmark numbers.

examples/poc/manifests/vllm/vllm-lora-deployment.yaml Show resolved Hide resolved
pkg/ext-proc/backend/vllm/metrics.go Outdated
klog "k8s.io/klog/v2"
)

const (
ActiveLoRAAdaptersMetricName = "vllm:info_active_adapters_info"
LoraRequestInfoMetricName = "vllm:lora_requests_info"
LoraRequestInfoMetricNameRunningAdapters = "running_adapters"
Copy link
Contributor

Choose a reason for hiding this comment

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

LoraRequestInfoMetricNameRunningAdapters -> LoraRequestInfoRunningAdaptersMetricName

pkg/ext-proc/backend/vllm/metrics.go Outdated Show resolved Hide resolved
pkg/ext-proc/backend/vllm/metrics.go Outdated Show resolved Hide resolved
pkg/ext-proc/backend/vllm/metrics.go Show resolved Hide resolved
@liu-cong
Copy link
Contributor

liu-cong commented Dec 2, 2024

/assign

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 3, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 11, 2024
liu-cong
liu-cong reviewed Dec 11, 2024
View reviewed changes
examples/poc/manifests/vllm/vllm-lora-deployment.yaml Show resolved Hide resolved
pkg/ext-proc/backend/vllm/metrics.go Outdated Show resolved Hide resolved
pkg/ext-proc/backend/vllm/metrics.go Outdated Show resolved Hide resolved
pkg/ext-proc/backend/vllm/metrics.go Outdated Show resolved Hide resolved
pkg/ext-proc/backend/vllm/metrics.go Show resolved Hide resolved
@coolkp
Get running adapters from latest series in new metric, add table driv…
3f5c7bb 
…en test function, delete old metrics

Signed-off-by: Kunjan Patel <[email protected]>
Signed-off-by: Kunjan <[email protected]>
@liu-cong
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 11, 2024
ahg-g
ahg-g reviewed Dec 12, 2024
View reviewed changes
pkg/ext-proc/backend/vllm/metrics.go
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"go.uber.org/multierr"
"inference.networking.x-k8s.io/llm-instance-gateway/pkg/ext-proc/backend"
Copy link
Contributor

Choose a reason for hiding this comment

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

lets keep our imports in a separate section

pkg/ext-proc/backend/vllm/metrics.go
@@ -90,35 +95,55 @@ func promToPodMetrics(metricFamilies map[string]*dto.MetricFamily, existing *bac
}
*/
Copy link
Contributor

Choose a reason for hiding this comment

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

@liu-cong do we have an algorithm proposal to use this metric? if not, can we cleanup this code?

@ahg-g
Copy link
Contributor

ahg-g commented Dec 12, 2024

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahg-g, coolkp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 12, 2024
@k8s-ci-robot k8s-ci-robot merged commit 918960c into kubernetes-sigs:main Dec 12, 2024
2 checks passed
@danehans danehans mentioned this pull request Dec 19, 2024
Open
@kfswain kfswain mentioned this pull request Dec 20, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liu-cong liu-cong liu-cong left review comments

@ahg-g ahg-g ahg-g left review comments

@kfswain kfswain Awaiting requested review from kfswain

@robscott robscott Awaiting requested review from robscott

Assignees

@liu-cong liu-cong

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Switch to upstream vLLM
4 participants
@coolkp @k8s-ci-robot @liu-cong @ahg-g