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
+17 -20
View File
@@ -6,7 +6,6 @@
# but implemented by the Phi-Speech team
#!/usr/bin/env python3
import math
from typing import Optional, Union
import torch
import torch.nn.functional as F
@@ -917,7 +916,7 @@ class CausalConv1D(nn.Conv1d):
out_channels: int,
kernel_size: int,
stride: int = 1,
padding: Union[str, int] = 0,
padding: str | int = 0,
dilation: int = 1,
groups: int = 1,
bias: bool = True,
@@ -962,8 +961,8 @@ class CausalConv1D(nn.Conv1d):
)
def update_cache(
self, x: Tensor, cache: Optional[Tensor] = None
) -> tuple[Tensor, Optional[Tensor]]:
self, x: Tensor, cache: Tensor | None = None
) -> tuple[Tensor, Tensor | None]:
if cache is None:
new_x = F.pad(x, pad=(self._left_padding, self._right_padding))
next_cache = cache
@@ -978,8 +977,8 @@ class CausalConv1D(nn.Conv1d):
return new_x, next_cache
def forward(
self, x: Tensor, cache: Optional[Tensor] = None
) -> Union[Tensor, tuple[Tensor, Optional[Tensor]]]:
self, x: Tensor, cache: Tensor | None = None
) -> Tensor | tuple[Tensor, Tensor | None]:
x, cache = self.update_cache(x, cache=cache)
x = super().forward(x)
if cache is None:
@@ -1002,7 +1001,7 @@ class CausalConv2D(nn.Conv2d):
out_channels: int,
kernel_size: int,
stride: int = 1,
padding: Union[str, int] = 0,
padding: str | int = 0,
dilation: int = 1,
groups: int = 1,
bias: bool = True,
@@ -1371,9 +1370,7 @@ class NemoConvSubsampling(torch.nn.Module):
def get_streaming_cache_size(self) -> list[int]:
return [0, self.subsampling_factor + 1]
def forward(
self, x: Tensor, mask: Optional[Tensor]
) -> tuple[Tensor, Optional[Tensor]]:
def forward(self, x: Tensor, mask: Tensor | None) -> tuple[Tensor, Tensor | None]:
"""
Forward method for NeMo subsampling.
@@ -1615,10 +1612,10 @@ class AttModule(nn.Module):
def forward(
self,
x: Tensor,
memory: Optional[Tensor] = None,
pos_emb: Optional[Tensor] = None,
att_mask: Optional[Tensor] = None,
) -> tuple[Tensor, Tensor, Optional[Tensor], Optional[Tensor]]:
memory: Tensor | None = None,
pos_emb: Tensor | None = None,
att_mask: Tensor | None = None,
) -> tuple[Tensor, Tensor, Tensor | None, Tensor | None]:
"""AttModule forward
Args:
@@ -1640,7 +1637,7 @@ class AttBlock(BlockBase, AttModule):
def masked_softmax(
scores: Tensor,
mask: Optional[Tensor],
mask: Tensor | None,
) -> Tensor:
if mask is not None:
mask = mask.unsqueeze(1).eq(0) # (batch, 1, time1, time2)
@@ -1720,7 +1717,7 @@ class MultiHeadedAttention(nn.Module):
self.linear_v = nn.Linear(n_value, attention_inner_dim // group_size)
self.linear_out = nn.Linear(attention_inner_dim // group_size, n_value)
self.attn = torch.jit.Attribute(None, Optional[Tensor])
self.attn = torch.jit.Attribute(None, Tensor | None)
self.dropout = nn.Dropout(p=dropout_rate)
self.dropout_rate = dropout_rate
self.use_pt_scaled_dot_product_attention = use_pt_scaled_dot_product_attention
@@ -1741,10 +1738,10 @@ class MultiHeadedAttention(nn.Module):
query: Tensor,
key: Tensor,
value: Tensor,
pos_k: Optional[Tensor],
pos_v: Optional[Tensor],
mask: Optional[Tensor],
relative_attention_bias: Optional[Tensor] = None,
pos_k: Tensor | None,
pos_v: Tensor | None,
mask: Tensor | None,
relative_attention_bias: Tensor | None = None,
) -> Tensor:
"""Compute 'Scaled Dot Product Attention'.