[mem] Fix idle token_usage missing mamba_usage; add FIXME for naming (#22555)
This commit is contained in:
@@ -1981,6 +1981,8 @@ class GetLoadsReqOutput(BaseReq):
|
||||
max_total_num_tokens: int = field(
|
||||
metadata={"metric": ("gauge", "Maximum token capacity")}
|
||||
)
|
||||
# FIXME: token_usage is actually max usage across all pools (KV, SWA, mamba),
|
||||
# not just KV token usage. Rename requires API deprecation.
|
||||
token_usage: float = field(metadata={"metric": ("gauge", "Token pool usage ratio")})
|
||||
gen_throughput: float = field(
|
||||
metadata={"metric": ("gauge", "Generation throughput tokens/sec")}
|
||||
|
||||
@@ -311,13 +311,14 @@ class SchedulerRuntimeCheckerMixin:
|
||||
(
|
||||
num_used,
|
||||
_,
|
||||
token_usage,
|
||||
_,
|
||||
full_token_usage,
|
||||
mamba_usage,
|
||||
_,
|
||||
_,
|
||||
_,
|
||||
_,
|
||||
) = self._get_mamba_token_info()
|
||||
token_usage = max(full_token_usage, mamba_usage)
|
||||
else:
|
||||
num_used, token_usage, _, _ = self._get_token_info()
|
||||
|
||||
|
||||
@@ -79,6 +79,8 @@ class SchedulerStats:
|
||||
# Basics
|
||||
num_running_reqs: QueueCount = field(default_factory=QueueCount)
|
||||
num_used_tokens: int = 0
|
||||
# FIXME: token_usage is actually max usage across all pools (KV, SWA, mamba),
|
||||
# not just KV token usage. Rename requires API deprecation.
|
||||
token_usage: float = 0.0
|
||||
full_token_usage: float = 0.0
|
||||
pending_prealloc_token_usage: float = 0.0
|
||||
|
||||
Reference in New Issue
Block a user