Convert formatting to use ruff instead of yapf + isort (#26247)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
Harry Mellor
2025-10-05 07:06:22 -07:00
committed by GitHub
parent 17edd8a807
commit d6953beb91
1508 changed files with 115205 additions and 94107 deletions
+51 -39
View File
@@ -42,18 +42,27 @@ from vllm.distributed.parallel_state import get_tensor_model_parallel_rank
from vllm.distributed.utils import split_tensor_along_last_dim
from vllm.model_executor.layers.activation import SiluAndMul
from vllm.model_executor.layers.layernorm import RMSNorm
from vllm.model_executor.layers.linear import (MergedColumnParallelLinear,
QKVParallelLinear,
RowParallelLinear)
from vllm.model_executor.layers.linear import (
MergedColumnParallelLinear,
QKVParallelLinear,
RowParallelLinear,
)
from vllm.model_executor.layers.logits_processor import LogitsProcessor
from vllm.model_executor.layers.rotary_embedding import get_rope
from vllm.model_executor.layers.vocab_parallel_embedding import (
ParallelLMHead, VocabParallelEmbedding)
ParallelLMHead,
VocabParallelEmbedding,
)
from vllm.model_executor.model_loader.weight_utils import default_weight_loader
from vllm.model_executor.models.interfaces import SupportsLoRA, SupportsPP
from vllm.model_executor.models.utils import (
AutoWeightsLoader, extract_layer_index, is_pp_missing_parameter,
make_empty_intermediate_tensors_factory, make_layers, maybe_prefix)
AutoWeightsLoader,
extract_layer_index,
is_pp_missing_parameter,
make_empty_intermediate_tensors_factory,
make_layers,
maybe_prefix,
)
from vllm.sequence import IntermediateTensors
from vllm.transformers_utils.configs import Olmo3Config
@@ -78,8 +87,9 @@ class Olmo2Attention(nn.Module):
assert self.total_num_heads % self.tp_size == 0
self.num_heads = self.total_num_heads // self.tp_size
self.total_num_kv_heads = (self.config.num_key_value_heads
or self.total_num_heads)
self.total_num_kv_heads = (
self.config.num_key_value_heads or self.total_num_heads
)
if self.total_num_kv_heads >= self.tp_size:
assert self.total_num_kv_heads % self.tp_size == 0
else:
@@ -108,15 +118,15 @@ class Olmo2Attention(nn.Module):
self.total_num_kv_heads * self.head_dim,
eps=self.config.rms_norm_eps,
)
self.q_norm = RMSNorm(self.config.hidden_size,
eps=self.config.rms_norm_eps)
self.q_norm = RMSNorm(self.config.hidden_size, eps=self.config.rms_norm_eps)
self.scaling = self.head_dim**-0.5
layer_idx = extract_layer_index(prefix)
sliding_window = None
if ((layer_types := getattr(self.config, "layer_types", None))
is not None and layer_types[layer_idx] == "sliding_attention"):
if (
layer_types := getattr(self.config, "layer_types", None)
) is not None and layer_types[layer_idx] == "sliding_attention":
sliding_window = self.config.sliding_window
self.attn = Attention(
@@ -132,8 +142,7 @@ class Olmo2Attention(nn.Module):
# Rotary embeddings. Rope scaling is only applied on full attention
# layers.
self.rope_scaling = (self.config.rope_scaling
if sliding_window is None else None)
self.rope_scaling = self.config.rope_scaling if sliding_window is None else None
self.rotary_emb = get_rope(
self.head_dim,
rotary_dim=self.head_dim,
@@ -151,16 +160,16 @@ class Olmo2Attention(nn.Module):
prefix=f"{prefix}.o_proj",
)
def _apply_qk_norm(self, q: torch.Tensor,
k: torch.Tensor) -> tuple[torch.Tensor, torch.Tensor]:
def _apply_qk_norm(
self, q: torch.Tensor, k: torch.Tensor
) -> tuple[torch.Tensor, torch.Tensor]:
if self.tp_size > 1:
q = tensor_model_parallel_all_gather(q.contiguous())
k = tensor_model_parallel_all_gather(k.contiguous())
q = self.q_norm(q)
k = self.k_norm(k)
if self.tp_size > 1:
splitter = partial(split_tensor_along_last_dim,
num_partitions=self.tp_size)
splitter = partial(split_tensor_along_last_dim, num_partitions=self.tp_size)
q = splitter(q)[self.tp_rank]
k = splitter(k)[self.tp_rank]
return q, k
@@ -236,18 +245,21 @@ class Olmo2DecoderLayer(nn.Module):
config = vllm_config.model_config.hf_config
assert isinstance(config, (Olmo2Config, Olmo3Config))
# Attention block.
self.self_attn = Olmo2Attention(vllm_config=vllm_config,
prefix=f"{prefix}.self_attn")
self.self_attn = Olmo2Attention(
vllm_config=vllm_config, prefix=f"{prefix}.self_attn"
)
# MLP block.
self.mlp = Olmo2MLP(vllm_config=vllm_config, prefix=f"{prefix}.mlp")
# LayerNorm
self.post_attention_layernorm = RMSNorm(config.hidden_size,
eps=config.rms_norm_eps)
self.post_attention_layernorm = RMSNorm(
config.hidden_size, eps=config.rms_norm_eps
)
self.post_feedforward_layernorm = RMSNorm(config.hidden_size,
eps=config.rms_norm_eps)
self.post_feedforward_layernorm = RMSNorm(
config.hidden_size, eps=config.rms_norm_eps
)
def forward(
self,
@@ -270,7 +282,6 @@ class Olmo2DecoderLayer(nn.Module):
@support_torch_compile
class Olmo2Model(nn.Module):
def __init__(self, *, vllm_config: VllmConfig, prefix: str = ""):
super().__init__()
self.config = vllm_config.model_config.hf_config
@@ -283,17 +294,16 @@ class Olmo2Model(nn.Module):
)
self.start_layer, self.end_layer, self.layers = make_layers(
self.config.num_hidden_layers,
lambda prefix: Olmo2DecoderLayer(vllm_config=vllm_config,
prefix=prefix),
lambda prefix: Olmo2DecoderLayer(vllm_config=vllm_config, prefix=prefix),
prefix=f"{prefix}.layers",
)
self.norm = RMSNorm(
self.config.hidden_size,
eps=self.config.rms_norm_eps,
)
self.make_empty_intermediate_tensors = (
make_empty_intermediate_tensors_factory(["hidden_states"],
self.config.hidden_size))
self.make_empty_intermediate_tensors = make_empty_intermediate_tensors_factory(
["hidden_states"], self.config.hidden_size
)
def get_input_embeddings(self, input_ids: torch.Tensor) -> torch.Tensor:
return self.embed_tokens(input_ids)
@@ -334,8 +344,7 @@ class Olmo2Model(nn.Module):
hidden_states = self.norm(hidden_states)
return hidden_states
def load_weights(self, weights: Iterable[tuple[str,
torch.Tensor]]) -> set[str]:
def load_weights(self, weights: Iterable[tuple[str, torch.Tensor]]) -> set[str]:
stacked_params_mapping = [
# (param_name, shard_name, shard_id)
("qkv_proj", "q_proj", "q"),
@@ -366,8 +375,7 @@ class Olmo2Model(nn.Module):
if name.endswith(".bias") and name not in params_dict:
continue
param = params_dict[name]
weight_loader = getattr(param, "weight_loader",
default_weight_loader)
weight_loader = getattr(param, "weight_loader", default_weight_loader)
weight_loader(param, loaded_weight)
loaded_params.add(name)
return loaded_params
@@ -377,6 +385,7 @@ class Olmo2ForCausalLM(nn.Module, SupportsPP, SupportsLoRA):
"""
Extremely barebones HF model wrapper.
"""
packed_modules_mapping = {
"qkv_proj": [
"q_proj",
@@ -394,8 +403,9 @@ class Olmo2ForCausalLM(nn.Module, SupportsPP, SupportsLoRA):
config = vllm_config.model_config.hf_config
assert isinstance(config, (Olmo2Config, Olmo3Config))
self.config = config
self.model = Olmo2Model(vllm_config=vllm_config,
prefix=maybe_prefix(prefix, "model"))
self.model = Olmo2Model(
vllm_config=vllm_config, prefix=maybe_prefix(prefix, "model")
)
if config.tie_word_embeddings:
self.lm_head = self.model.embed_tokens
else:
@@ -409,7 +419,8 @@ class Olmo2ForCausalLM(nn.Module, SupportsPP, SupportsLoRA):
)
self.logits_processor = LogitsProcessor(config.vocab_size)
self.make_empty_intermediate_tensors = (
self.model.make_empty_intermediate_tensors)
self.model.make_empty_intermediate_tensors
)
def get_input_embeddings(self, input_ids: torch.Tensor) -> torch.Tensor:
return self.model.get_input_embeddings(input_ids)
@@ -439,7 +450,8 @@ class Olmo2ForCausalLM(nn.Module, SupportsPP, SupportsLoRA):
def load_weights(self, weights: Iterable[tuple[str, torch.Tensor]]):
loader = AutoWeightsLoader(
self,
skip_prefixes=(["lm_head.weight"]
if self.config.tie_word_embeddings else None),
skip_prefixes=(
["lm_head.weight"] if self.config.tie_word_embeddings else None
),
)
return loader.load_weights(weights)