[BugFix] Fix async scheduling for pooling models (#31584)
Signed-off-by: njhill <nickhill123@gmail.com>
This commit is contained in:
+21
-29
@@ -2,6 +2,7 @@
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
from dataclasses import dataclass
|
||||
|
||||
import numpy as np
|
||||
import torch
|
||||
|
||||
from vllm.pooling_params import PoolingParams
|
||||
@@ -91,36 +92,27 @@ class PoolingMetadata:
|
||||
|
||||
def build_pooling_cursor(
|
||||
self,
|
||||
num_scheduled_tokens: list[int],
|
||||
num_scheduled_tokens_np: np.ndarray,
|
||||
seq_lens_cpu: torch.Tensor,
|
||||
device: torch.device,
|
||||
):
|
||||
self.pooling_cursor = build_pooling_cursor(
|
||||
num_scheduled_tokens, seq_lens_cpu, self.prompt_lens, device
|
||||
n_seq = len(num_scheduled_tokens_np)
|
||||
prompt_lens = self.prompt_lens
|
||||
|
||||
assert len(prompt_lens) == n_seq
|
||||
|
||||
index = list(range(n_seq))
|
||||
num_scheduled_tokens_cpu = torch.from_numpy(num_scheduled_tokens_np)
|
||||
cumsum = torch.zeros(
|
||||
n_seq + 1, dtype=torch.int64, pin_memory=pin_memory, device="cpu"
|
||||
)
|
||||
torch.cumsum(num_scheduled_tokens_cpu, dim=0, out=cumsum[1:])
|
||||
cumsum = cumsum.to(device, non_blocking=True)
|
||||
self.pooling_cursor = PoolingCursor(
|
||||
index=index,
|
||||
first_token_indices_gpu=cumsum[:n_seq],
|
||||
last_token_indices_gpu=cumsum[1:] - 1,
|
||||
prompt_lens_cpu=prompt_lens,
|
||||
seq_lens_cpu=seq_lens_cpu,
|
||||
num_scheduled_tokens_cpu=num_scheduled_tokens_cpu,
|
||||
)
|
||||
|
||||
|
||||
def build_pooling_cursor(
|
||||
num_scheduled_tokens: list[int],
|
||||
seq_lens_cpu: torch.Tensor,
|
||||
prompt_lens: torch.Tensor,
|
||||
device: torch.device,
|
||||
):
|
||||
assert len(prompt_lens) == len(num_scheduled_tokens)
|
||||
|
||||
n_seq = len(num_scheduled_tokens)
|
||||
index = list(range(n_seq))
|
||||
num_scheduled_tokens_cpu = torch.tensor(num_scheduled_tokens, device="cpu")
|
||||
cumsum = torch.zeros(
|
||||
n_seq + 1, dtype=torch.int64, pin_memory=pin_memory, device="cpu"
|
||||
)
|
||||
torch.cumsum(num_scheduled_tokens_cpu, dim=0, out=cumsum[1:])
|
||||
cumsum = cumsum.to(device, non_blocking=True)
|
||||
return PoolingCursor(
|
||||
index=index,
|
||||
first_token_indices_gpu=cumsum[:n_seq],
|
||||
last_token_indices_gpu=cumsum[1:] - 1,
|
||||
prompt_lens_cpu=prompt_lens,
|
||||
seq_lens_cpu=seq_lens_cpu,
|
||||
num_scheduled_tokens_cpu=num_scheduled_tokens_cpu,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user