[Bugfix][V1/V2] Fix prompt_logprobs to respect logprobs_mode (#47680)
Signed-off-by: Wojciech Wais <wojciech.wais@gmail.com> Signed-off-by: Federico Kamelhar <209537060+fede-kamel@users.noreply.github.com> Signed-off-by: Allen Shen <aoshen@inferact.ai> Co-authored-by: Wojciech Wais <wojciech.wais@gmail.com> Co-authored-by: Federico Kamelhar <209537060+fede-kamel@users.noreply.github.com>
This commit is contained in:
co-authored by
Wojciech Wais
Federico Kamelhar
parent
088c0be268
commit
41ea2dd44a
@@ -53,7 +53,7 @@ from vllm.v1.worker.gpu.attn_utils import build_attn_metadata
|
||||
from vllm.v1.worker.gpu.buffer_utils import UvaBackedTensor, async_copy_to_gpu
|
||||
from vllm.v1.worker.gpu.input_batch import InputBatch
|
||||
from vllm.v1.worker.gpu.model_states.interface import ModelState
|
||||
from vllm.v1.worker.gpu.sample.logprob import compute_topk_logprobs
|
||||
from vllm.v1.worker.gpu.sample.logprob import compute_topk_scores
|
||||
from vllm.v1.worker.gpu.sample.output import SamplerOutput
|
||||
from vllm.v1.worker.gpu.sample.penalties import use_penalty
|
||||
from vllm.v1.worker.gpu.states import RequestState
|
||||
@@ -1064,6 +1064,7 @@ class DiffusionSampler:
|
||||
):
|
||||
self.sampling_states = sampler.sampling_states
|
||||
self.req_states = sampler.req_states
|
||||
self.logits_mode = sampler.logprobs_mode in ("raw_logits", "processed_logits")
|
||||
# Self-conditioning soft embed = probs @ embed_weight * normalizer,
|
||||
# computed in the sampler (see _compiled_sample_step). ``embed_weight``
|
||||
# is the vocab-parallel shard; [sc_vocab_start, sc_vocab_end) is this
|
||||
@@ -1359,10 +1360,11 @@ class DiffusionSampler:
|
||||
# positions are never emitted.
|
||||
k_i = int(valid_canvas_len_np[start_req + li])
|
||||
pos = li * CL
|
||||
self._pending_logprobs[slot.item()] = compute_topk_logprobs(
|
||||
self._pending_logprobs[slot.item()] = compute_topk_scores(
|
||||
flat_logits[pos : pos + k_i],
|
||||
max_num_logprobs,
|
||||
argmax_tokens[local_idx][:k_i],
|
||||
logits_mode=self.logits_mode,
|
||||
)
|
||||
|
||||
# Commit steps: is_committing was True at entry. Reassemble previously
|
||||
|
||||
Reference in New Issue
Block a user