Use int64 as indices for set_kv_buffer (#3039)
This commit is contained in:
@@ -24,7 +24,7 @@ import tqdm
|
||||
from vllm.model_executor.custom_op import CustomOp
|
||||
|
||||
from sglang.srt.distributed import get_tensor_model_parallel_rank
|
||||
from sglang.srt.distributed.parallel_state import graph_capture
|
||||
from sglang.srt.distributed.parallel_state import GroupCoordinator, graph_capture
|
||||
from sglang.srt.layers.logits_processor import LogitsProcessorOutput
|
||||
from sglang.srt.layers.moe.fused_moe_native import fused_moe_forward_native
|
||||
from sglang.srt.layers.torchao_utils import save_gemlite_cache
|
||||
@@ -63,7 +63,7 @@ def patch_model(
|
||||
model: torch.nn.Module,
|
||||
enable_compile: bool,
|
||||
batch_size: int,
|
||||
tp_group: "GroupCoordinator",
|
||||
tp_group: GroupCoordinator,
|
||||
):
|
||||
"""Patch the model to make it compatible with with torch.compile"""
|
||||
backup_ca_comm = None
|
||||
@@ -149,9 +149,18 @@ class CudaGraphRunner:
|
||||
and bs <= model_runner.server_args.cuda_graph_max_bs
|
||||
]
|
||||
|
||||
self.compile_bs = (
|
||||
[
|
||||
bs
|
||||
for bs in self.capture_bs
|
||||
if bs <= self.model_runner.server_args.torch_compile_max_bs
|
||||
]
|
||||
if self.use_torch_compile
|
||||
else []
|
||||
)
|
||||
|
||||
self.capture_forward_mode = ForwardMode.DECODE
|
||||
self.num_tokens_per_bs = 1
|
||||
|
||||
if model_runner.spec_algorithm.is_eagle():
|
||||
if self.model_runner.is_draft_worker:
|
||||
self.num_tokens_per_bs = (
|
||||
@@ -163,16 +172,6 @@ class CudaGraphRunner:
|
||||
self.model_runner.server_args.speculative_num_draft_tokens
|
||||
)
|
||||
|
||||
self.compile_bs = (
|
||||
[
|
||||
bs
|
||||
for bs in self.capture_bs
|
||||
if bs <= self.model_runner.server_args.torch_compile_max_bs
|
||||
]
|
||||
if self.use_torch_compile
|
||||
else []
|
||||
)
|
||||
|
||||
# Attention backend
|
||||
self.max_bs = max(self.capture_bs)
|
||||
self.max_num_token = self.max_bs * self.num_tokens_per_bs
|
||||
@@ -180,7 +179,6 @@ class CudaGraphRunner:
|
||||
self.seq_len_fill_value = (
|
||||
self.model_runner.attn_backend.get_cuda_graph_seq_len_fill_value()
|
||||
)
|
||||
|
||||
# FIXME(lsyin): leave it here for now, I don't know whether it is necessary
|
||||
self.encoder_len_fill_value = 0
|
||||
|
||||
@@ -189,14 +187,14 @@ class CudaGraphRunner:
|
||||
|
||||
# Common inputs
|
||||
with torch.device("cuda"):
|
||||
self.input_ids = torch.zeros((self.max_num_token,), dtype=torch.int32)
|
||||
self.input_ids = torch.zeros((self.max_num_token,), dtype=torch.int64)
|
||||
self.req_pool_indices = torch.zeros((self.max_bs,), dtype=torch.int32)
|
||||
self.seq_lens = torch.full(
|
||||
(self.max_bs,), self.seq_len_fill_value, dtype=torch.int32
|
||||
)
|
||||
self.out_cache_loc = torch.zeros((self.max_num_token,), dtype=torch.int32)
|
||||
self.out_cache_loc = torch.zeros((self.max_num_token,), dtype=torch.int64)
|
||||
self.positions = torch.zeros((self.max_num_token,), dtype=torch.int64)
|
||||
self.mrope_positions = torch.zeros((3, self.max_bs), dtype=torch.int32)
|
||||
self.mrope_positions = torch.zeros((3, self.max_bs), dtype=torch.int64)
|
||||
|
||||
# Speculative_inference
|
||||
if model_runner.spec_algorithm.is_eagle():
|
||||
|
||||
Reference in New Issue
Block a user