Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions vllm_spyre/model_executor/model_loader/spyre.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from vllm.config import ModelConfig, VllmConfig
from vllm.forward_context import get_forward_context
from vllm.logger import init_logger
from vllm.model_executor.layers.logits_processor import LogitsProcessor
from vllm.model_executor.model_loader.weight_utils import (
download_weights_from_hf)
from vllm.v1.outputs import SamplerOutput
Expand Down Expand Up @@ -58,9 +57,6 @@ def __init__(
rank: int,
) -> None:
super().__init__()
self.logits_processor = LogitsProcessor(
vllm_config.model_config.hf_config.vocab_size,
logits_as_input=True)

try:
## Temporary backwards compatibility for 0.10.2
Expand Down Expand Up @@ -132,14 +128,6 @@ def forward(

return logits

def compute_logits(
self,
hidden_states: torch.Tensor,
sampling_metadata: SamplingMetadata,
) -> torch.Tensor:
logits = self.logits_processor(None, hidden_states, sampling_metadata)
return logits

def sample(
self,
logits: torch.Tensor,
Expand Down
11 changes: 4 additions & 7 deletions vllm_spyre/v1/worker/spyre_model_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -525,13 +525,10 @@ def execute_model(
# Execute the model
attn_metadata = self.build_attn_metadata(model_input)
with set_forward_context(attn_metadata, self.vllm_config):
hidden_states = self.model(input_ids=model_input.input_tokens,
positions=model_input.input_positions,
masks=model_input.input_masks,
is_prompt=model_input.is_prompt)

# Compute the logits.
logits = self.model.compute_logits(hidden_states, None)
logits = self.model(input_ids=model_input.input_tokens,
positions=model_input.input_positions,
masks=model_input.input_masks,
is_prompt=model_input.is_prompt)

is_prefill = cast(bool, model_input.is_prompt)

Expand Down