Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
13 changes: 13 additions & 0 deletions vllm/model_executor/layers/rotary_embedding.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import math
from typing import Any, Optional, Union

import numpy as np
import torch
import torch.nn as nn
from transformers import PretrainedConfig
Expand Down Expand Up @@ -1468,6 +1469,18 @@ def get_next_input_positions_tensor(
mrope_position_delta + seq_len,
).expand(3, -1)

# Faster version of `get_next_input_positions_tensor`
@staticmethod
def mrope_assign_next_input_positions(out: np.ndarray, out_offset: int,
Comment thread
WoosukKwon marked this conversation as resolved.
Outdated
mrope_position_delta: int,
context_len: int,
num_new_tokens: int):

values = np.arange(mrope_position_delta + context_len,
mrope_position_delta + context_len + num_new_tokens,
dtype=out.dtype)
out[:, out_offset:out_offset + num_new_tokens] = values

@classmethod
def omni_get_updates_use_audio_in_video(
cls,
Expand Down
17 changes: 8 additions & 9 deletions vllm/v1/worker/gpu_model_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ def __init__(
dtype=torch.int64,
device="cpu",
pin_memory=self.pin_memory)
self.mrope_positions_np = self.mrope_positions_cpu.numpy()

# Only relevant for models using ALiBi (e.g, MPT)
self.use_alibi = check_use_alibi(model_config)
Expand Down Expand Up @@ -888,15 +889,13 @@ def _calc_mrope_positions(self, scheduler_output: "SchedulerOutput"):
dst_start = mrope_pos_ptr
dst_end = mrope_pos_ptr + completion_part_len

self.mrope_positions_cpu[:, dst_start:dst_end] = \
MRotaryEmbedding.get_next_input_positions_tensor(
req.mrope_position_delta,
context_len=num_computed_tokens +
prompt_part_len,
seq_len=num_computed_tokens +
prompt_part_len +
completion_part_len,
)
MRotaryEmbedding.mrope_assign_next_input_positions(
out=self.mrope_positions_np,
out_offset=dst_start,
mrope_position_delta=req.mrope_position_delta,
context_len=num_computed_tokens + prompt_part_len,
num_new_tokens=completion_part_len,
)

mrope_pos_ptr += completion_part_len

Expand Down