From cdd3c3a05c30dfe36a7adbdcaa53d73ea94c5be2 Mon Sep 17 00:00:00 2001
From: Yang Nie <flytocc@outlook.com>
Date: Wed, 19 Apr 2023 12:19:10 +0800
Subject: [PATCH] clear type hint

---
 ppcls/arch/backbone/model_zoo/mobilevit_v2.py | 68 ++++++++-----------
 1 file changed, 29 insertions(+), 39 deletions(-)

diff --git a/ppcls/arch/backbone/model_zoo/mobilevit_v2.py b/ppcls/arch/backbone/model_zoo/mobilevit_v2.py
index 2555500d..d2a362f7 100644
--- a/ppcls/arch/backbone/model_zoo/mobilevit_v2.py
+++ b/ppcls/arch/backbone/model_zoo/mobilevit_v2.py
@@ -52,12 +52,12 @@ class InvertedResidual(nn.Layer):
     """
 
     def __init__(self,
-                 in_channels: int,
-                 out_channels: int,
-                 stride: int,
-                 expand_ratio: Union[int, float],
-                 dilation: int=1,
-                 skip_connection: Optional[bool]=True) -> None:
+                 in_channels,
+                 out_channels,
+                 stride,
+                 expand_ratio,
+                 dilation=1,
+                 skip_connection=True):
         super().__init__()
         assert stride in [1, 2]
         self.stride = stride
@@ -148,12 +148,12 @@ class LinearSelfAttention(nn.Layer):
 
 class LinearAttnFFN(nn.Layer):
     def __init__(self,
-                 embed_dim: int,
-                 ffn_latent_dim: int,
-                 attn_dropout: Optional[float]=0.0,
-                 dropout: Optional[float]=0.1,
-                 ffn_dropout: Optional[float]=0.0,
-                 norm_layer: Optional[str]=layer_norm_2d) -> None:
+                 embed_dim,
+                 ffn_latent_dim,
+                 attn_dropout=0.0,
+                 dropout=0.1,
+                 ffn_dropout=0.0,
+                 norm_layer=layer_norm_2d) -> None:
         super().__init__()
         attn_unit = LinearSelfAttention(
             embed_dim=embed_dim, attn_dropout=attn_dropout, bias=True)
@@ -185,18 +185,18 @@ class MobileViTV2Block(nn.Layer):
     """
 
     def __init__(self,
-                 in_channels: int,
-                 attn_unit_dim: int,
-                 ffn_multiplier: float=2.0,
-                 n_attn_blocks: Optional[int]=2,
-                 attn_dropout: Optional[float]=0.0,
-                 dropout: Optional[float]=0.0,
-                 ffn_dropout: Optional[float]=0.0,
-                 patch_h: Optional[int]=8,
-                 patch_w: Optional[int]=8,
-                 conv_ksize: Optional[int]=3,
-                 dilation: Optional[int]=1,
-                 attn_norm_layer: Optional[str]=layer_norm_2d):
+                 in_channels,
+                 attn_unit_dim,
+                 ffn_multiplier=2.0,
+                 n_attn_blocks=2,
+                 attn_dropout=0.0,
+                 dropout=0.0,
+                 ffn_dropout=0.0,
+                 patch_h=8,
+                 patch_w=8,
+                 conv_ksize=3,
+                 dilation=1,
+                 attn_norm_layer=layer_norm_2d):
         super().__init__()
         cnn_out_dim = attn_unit_dim
         padding = (conv_ksize - 1) // 2 * dilation
@@ -232,15 +232,8 @@ class MobileViTV2Block(nn.Layer):
         self.patch_h = patch_h
         self.patch_w = patch_w
 
-    def _build_attn_layer(self,
-                          d_model: int,
-                          ffn_mult: float,
-                          n_layers: int,
-                          attn_dropout: float,
-                          dropout: float,
-                          ffn_dropout: float,
-                          attn_norm_layer: nn.Layer):
-
+    def _build_attn_layer(self, d_model, ffn_mult, n_layers, attn_dropout,
+                          dropout, ffn_dropout, attn_norm_layer):
         # ensure that dims are multiple of 16
         ffn_dims = [ffn_mult * d_model // 16 * 16] * n_layers
 
@@ -271,7 +264,7 @@ class MobileViTV2Block(nn.Layer):
 
         return patches, (img_h, img_w)
 
-    def folding(self, patches, output_size: Tuple[int, int]):
+    def folding(self, patches, output_size):
         batch_size, in_dim, patch_size, n_patches = patches.shape
 
         # [B, C, P, N]
@@ -306,10 +299,7 @@ class MobileViTV2(nn.Layer):
         MobileViTV2
     """
 
-    def __init__(self,
-                 mobilevit_config: Dict,
-                 class_num=1000,
-                 output_stride=None):
+    def __init__(self, mobilevit_config, class_num=1000, output_stride=None):
         super().__init__()
         self.round_nearest = 8
         self.dilation = 1
@@ -475,7 +465,7 @@ def _load_pretrained(pretrained, model, model_url, use_ssld=False):
         )
 
 
-def get_configuration(width_multiplier) -> Dict:
+def get_configuration(width_multiplier):
     ffn_multiplier = 2
     mv2_exp_mult = 2  # max(1.0, min(2.0, 2.0 * width_multiplier))
 
-- 
GitLab