Update Optional[x] -> x | None and Union[x, y] to x | y (#26633)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
Harry Mellor
2025-10-12 09:51:31 -07:00
committed by GitHub
parent 9bb38130cb
commit 8fcaaf6a16
944 changed files with 9490 additions and 10121 deletions
+13 -14
View File
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
from collections.abc import Iterable, Set
from typing import Optional, Union
import torch
from torch import nn
@@ -50,7 +49,7 @@ class ModernBertEmbeddings(nn.Module):
def forward(
self,
input_ids: torch.Tensor,
inputs_embeds: Optional[torch.Tensor] = None,
inputs_embeds: torch.Tensor | None = None,
) -> torch.Tensor:
if inputs_embeds is not None:
return self.norm(inputs_embeds)
@@ -74,7 +73,7 @@ class ModernBertRotaryEmbedding(RotaryEmbedding):
class ModernBertAttention(nn.Module):
def __init__(self, config: ModernBertConfig, layer_id: Optional[int] = None):
def __init__(self, config: ModernBertConfig, layer_id: int | None = None):
super().__init__()
self.config = config
self.hidden_size = config.hidden_size
@@ -151,7 +150,7 @@ class ModernBertMLP(nn.Module):
class ModernBertLayer(nn.Module):
def __init__(
self, config: ModernBertConfig, prefix: str = "", layer_id: Optional[int] = None
self, config: ModernBertConfig, prefix: str = "", layer_id: int | None = None
):
super().__init__()
self.config = config
@@ -243,8 +242,8 @@ class ModernBertModel(nn.Module):
self,
input_ids: torch.Tensor,
positions: torch.Tensor,
intermediate_tensors: Optional[IntermediateTensors] = None,
inputs_embeds: Optional[torch.Tensor] = None,
intermediate_tensors: IntermediateTensors | None = None,
inputs_embeds: torch.Tensor | None = None,
) -> torch.Tensor:
if inputs_embeds is not None:
hidden_states = inputs_embeds
@@ -287,9 +286,9 @@ class ModernBertPooler(Pooler):
def forward(
self,
hidden_states: Union[torch.Tensor, list[torch.Tensor]],
hidden_states: torch.Tensor | list[torch.Tensor],
pooling_metadata: PoolingMetadata,
) -> Union[torch.Tensor, list[torch.Tensor]]:
) -> torch.Tensor | list[torch.Tensor]:
pooled_output = self.pooling(hidden_states, pooling_metadata)
if isinstance(pooled_output, list):
@@ -370,10 +369,10 @@ class ModernBertForSequenceClassification(nn.Module, SupportsCrossEncoding):
def forward(
self,
input_ids: Optional[torch.LongTensor],
input_ids: torch.LongTensor | None,
positions: torch.Tensor,
intermediate_tensors: Optional[IntermediateTensors] = None,
inputs_embeds: Optional[torch.Tensor] = None,
intermediate_tensors: IntermediateTensors | None = None,
inputs_embeds: torch.Tensor | None = None,
) -> torch.Tensor:
return self.model(
input_ids=input_ids,
@@ -436,10 +435,10 @@ class ModernBertForTokenClassification(nn.Module):
def forward(
self,
input_ids: Optional[torch.Tensor],
input_ids: torch.Tensor | None,
positions: torch.Tensor,
intermediate_tensors: Optional[IntermediateTensors] = None,
inputs_embeds: Optional[torch.Tensor] = None,
intermediate_tensors: IntermediateTensors | None = None,
inputs_embeds: torch.Tensor | None = None,
) -> torch.Tensor:
hidden_states = self.model(
input_ids=input_ids,