tzhouam
d7cfe195ea
- Updated OmniARScheduler to wrap output in OmniSchedulerOutput, including transfer metadata for finished requests needing KV cache transfer. - Enhanced OmniGenerationScheduler to handle routed experts and finish reasons more effectively, ensuring proper output structure. - Introduced performance statistics handling in both schedulers for improved monitoring. Signed-off-by: [Your Name] <your.email@example.com> Signed-off-by: tzhouam <tzhouam@connect.ust.hk>
77 lines
2.6 KiB
Python
77 lines
2.6 KiB
Python
from dataclasses import dataclass, field
|
|
|
|
from vllm.v1.core.sched.output import CachedRequestData, NewRequestData, SchedulerOutput
|
|
from vllm.v1.request import Request
|
|
|
|
from vllm_omni.engine import AdditionalInformationPayload, PromptEmbedsPayload
|
|
|
|
|
|
@dataclass
|
|
class OmniNewRequestData(NewRequestData):
|
|
"""New request data for omni models with embeddings support.
|
|
|
|
Extends NewRequestData to include prompt embeddings and additional
|
|
information for direct transfer between pipeline stages.
|
|
|
|
Args:
|
|
prompt_embeds: Optional serialized prompt embeddings payload
|
|
additional_information: Optional serialized additional information
|
|
dictionary containing tensors or lists
|
|
"""
|
|
|
|
# Optional serialized prompt embeddings
|
|
prompt_embeds: PromptEmbedsPayload | None = None
|
|
# Optional external request ID for tracking
|
|
external_req_id: str | None = None
|
|
# Optional serialized additional information
|
|
additional_information: AdditionalInformationPayload | None = None
|
|
|
|
@classmethod
|
|
def from_request(
|
|
cls,
|
|
request: Request,
|
|
block_ids: tuple[list[int], ...],
|
|
prefill_token_ids: list[int] | None = None,
|
|
) -> "OmniNewRequestData":
|
|
"""Create OmniNewRequestData from a Request object.
|
|
|
|
Args:
|
|
request: Request object to convert
|
|
block_ids: Tuple of block ID lists for KV cache allocation
|
|
|
|
Returns:
|
|
OmniNewRequestData instance with data from the request
|
|
"""
|
|
return cls(
|
|
req_id=request.request_id,
|
|
external_req_id=request.external_req_id,
|
|
prompt_token_ids=request.prompt_token_ids,
|
|
mm_features=request.mm_features,
|
|
sampling_params=request.sampling_params,
|
|
pooling_params=request.pooling_params,
|
|
block_ids=block_ids,
|
|
num_computed_tokens=request.num_computed_tokens,
|
|
lora_request=request.lora_request,
|
|
prompt_embeds=request.prompt_embeds,
|
|
prefill_token_ids=prefill_token_ids,
|
|
additional_information=request.additional_information,
|
|
)
|
|
|
|
|
|
@dataclass
|
|
class OmniCachedRequestData(CachedRequestData):
|
|
"""Cached request data for omni models with embeddings support.
|
|
|
|
Args:
|
|
prompt_token_ids: Mapping from request ID to list of prompt token IDs
|
|
"""
|
|
|
|
prompt_token_ids: dict[str, list[int]]
|
|
|
|
|
|
@dataclass
|
|
class OmniSchedulerOutput(SchedulerOutput):
|
|
"""Scheduler output with omni-specific transfer metadata."""
|
|
|
|
finished_requests_needing_kv_transfer: dict[str, dict] = field(default_factory=dict)
|