### What this PR does / why we need it?
Add a control to enable the exponential distribution operator
overlapping with model executing (default is OFF due to this feature
might not perform well on MOE models, i.e. For Qwen3-30B).
Enable async exponential overlapping will provides performance
improvement.
Also, overlapping the exponential operator with module execution can
cover the performance drop introduced by AICPU-version's exponential
operator.
**UPDATE**: (12/12)
Now our overlap will use the same stream that introduced in this pr:
#4908 .
We move the `do_async_exponential` from `model_runner_v1.py` to
`sampler.py`.
Now we are using `additional_config` to enable async exponential:
Add `"enable_async_exponential": 1` in `addition_config`.
Now we **ONLY** support default exponential/AI-CPU exponential, the old
`"enable_async_exponential": 2` option has been aborted to keep
consistency.
### Does this PR introduce _any_ user-facing change?
**YES**, added a new `additional_config` : `"enable_async_exponential":
1`.
When `enable_async_exponential` is set to 1, we enable the async
exponential and overlap with model runner.
When `enable_async_exponential` is set to 0 (default is 0), we disable
the async exponential, but exponential will still running on a different
stream using stream introduced in #4908.
- vLLM version: v0.12.0
- vLLM main:
ad32e3e19c
---------
Signed-off-by: YuhanBai <yuhan.bai0830@gmail.com>
Signed-off-by: YuhanBai yuhan.bai0830@gmail.com
133 lines
5.3 KiB
Python
133 lines
5.3 KiB
Python
import torch
|
|
import torch_npu
|
|
from vllm.v1.sample.ops.topk_topp_sampler import TopKTopPSampler
|
|
from vllm.v1.sample.sampler import Sampler
|
|
|
|
from vllm_ascend.ascend_config import get_ascend_config
|
|
from vllm_ascend.utils import (AscendDeviceType, get_ascend_device_type,
|
|
global_stream, npu_stream_switch)
|
|
|
|
DEFAULT_LOGPROBS_MODE = "raw_logprobs"
|
|
|
|
|
|
def random_sample(
|
|
probs: torch.Tensor,
|
|
generators: dict[int, torch.Generator],
|
|
) -> torch.Tensor:
|
|
"""Randomly sample from the probabilities.
|
|
|
|
We use this function instead of torch.multinomial because torch.multinomial
|
|
causes CPU-NPU synchronization.
|
|
"""
|
|
# NOTE(woosuk): To batch-process the requests without their own seeds,
|
|
# which is the common case, we first assume that every request does
|
|
# not have its own seed. Then, we overwrite the values for the requests
|
|
# that have their own seeds.
|
|
with npu_stream_switch(global_stream()):
|
|
q = torch.empty_like(probs)
|
|
if len(generators) != probs.shape[0]:
|
|
q.exponential_()
|
|
if generators:
|
|
# TODO(woosuk): This can be slow because we handle each request
|
|
# one by one. Optimize this.
|
|
for i, generator in generators.items():
|
|
q[i].exponential_(generator=generator)
|
|
torch.npu.current_stream().wait_stream(global_stream())
|
|
return probs.div_(q).argmax(dim=-1).view(-1)
|
|
|
|
|
|
class AscendSampler(Sampler):
|
|
|
|
def __init__(self, logprobs_mode=DEFAULT_LOGPROBS_MODE):
|
|
# TODO: support logprobs_mode in vllm-ascend
|
|
super().__init__(logprobs_mode=logprobs_mode)
|
|
self.topk_topp_sampler = AscendTopKTopPSampler()
|
|
self.async_exponential_event = torch.npu.Event()
|
|
|
|
def set_q_event(self, q, event):
|
|
self.topk_topp_sampler.set_q_event(q, event)
|
|
|
|
def do_async_exponential(self, b_s, head_dim, generators):
|
|
# Calculating exponential randoms in a different stream
|
|
# and overlapping with model executing.
|
|
with torch.npu.stream(global_stream()):
|
|
global_stream().wait_stream(torch.npu.current_stream())
|
|
q = torch.empty((b_s, head_dim), device="npu", dtype=torch.float32)
|
|
# Goes to async exponential with AI-CPU exponential or default exponential.
|
|
if len(generators) != q.shape[0]:
|
|
q.exponential_()
|
|
if generators:
|
|
for i, generator in generators.items():
|
|
q[i].exponential_(generator=generator)
|
|
self.async_exponential_event.record()
|
|
self.set_q_event(q, self.async_exponential_event)
|
|
|
|
|
|
class AscendTopKTopPSampler(TopKTopPSampler):
|
|
|
|
def set_q_event(self, q, event):
|
|
# Pass in async exponential results.
|
|
# Also pass in event to prevent synchronize errors.
|
|
self.q = q
|
|
self.async_event = event
|
|
|
|
def _apply_top_k_top_p(
|
|
self,
|
|
logits: torch.Tensor,
|
|
k: torch.Tensor,
|
|
p: torch.Tensor,
|
|
) -> torch.Tensor:
|
|
# npu_top_k_top_p uses the operator aclnnApplyTopKTopP, but aclnnApplyTopKTopP currently does not support 310P
|
|
if get_ascend_device_type(
|
|
) != AscendDeviceType._310P and p is not None and k is not None and 1 <= int(
|
|
k.max()) <= 1024:
|
|
# npu_top_k_top_p's parameter order is (logits, p, k), not (logits, k, p)
|
|
return torch_npu.npu_top_k_top_p(logits, p, k)
|
|
|
|
if p is None and k is None:
|
|
return logits
|
|
|
|
probs = logits.softmax(dim=-1)
|
|
probs_sort, _ = probs.sort(dim=-1, descending=False)
|
|
|
|
if k is not None:
|
|
top_k_count = probs_sort.size(1) - k.to(
|
|
torch.long) # shape: (batch, )
|
|
top_k_count = top_k_count.unsqueeze(dim=1)
|
|
top_k_cutoff = probs_sort.gather(-1, top_k_count)
|
|
|
|
# Make sure the no top-k rows are no-op.
|
|
no_top_k_mask = (k == logits.shape[1]).unsqueeze(dim=1)
|
|
top_k_cutoff.masked_fill_(no_top_k_mask, -float("inf"))
|
|
|
|
elements_to_discard = probs < top_k_cutoff
|
|
logits.masked_fill_(elements_to_discard, -float("inf"))
|
|
|
|
if p is not None:
|
|
cumprob = torch.cumsum(probs_sort, dim=-1)
|
|
top_p_mask = cumprob <= 1 - p.unsqueeze(dim=1)
|
|
top_p_mask[:, -1] = False # at least one
|
|
|
|
top_p_count = top_p_mask.sum(dim=-1).unsqueeze(1)
|
|
top_p_cutoff = probs_sort.gather(-1, top_p_count)
|
|
elements_to_discard = probs < top_p_cutoff
|
|
logits.masked_fill_(elements_to_discard, -float("inf"))
|
|
|
|
return logits
|
|
|
|
def forward_native(self, logits, generators, k, p):
|
|
"""Override pytorch native implementation to torch_npu"""
|
|
logits = self._apply_top_k_top_p(logits, k, p)
|
|
logits_to_return = None
|
|
if self.logprobs_mode == "processed_logits":
|
|
logits_to_return = logits
|
|
elif self.logprobs_mode == "processed_logprobs":
|
|
logits_to_return = logits.log_softmax(dim=-1, dtype=torch.float32)
|
|
|
|
probs = logits.softmax(dim=-1, dtype=torch.float32)
|
|
if get_ascend_config().enable_async_exponential == 1:
|
|
# Add synchronize to prevent synchronize error.
|
|
self.async_event.synchronize()
|
|
return probs.div_(self.q).argmax(dim=-1).view(-1), logits_to_return
|
|
return random_sample(probs, generators), logits_to_return
|