From c2e4e3c2e9be855277d9f4fa9cd0544892ff829a Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 30 八月 2023 09:57:30 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR add
---
funasr/models/data2vec.py | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/funasr/models/data2vec.py b/funasr/models/data2vec.py
index 380c137..425794d 100644
--- a/funasr/models/data2vec.py
+++ b/funasr/models/data2vec.py
@@ -10,11 +10,14 @@
from typing import Tuple
import torch
-from typeguard import check_argument_types
-from funasr.models.preencoder.abs_preencoder import AbsPreEncoder
-from funasr.torch_utils.device_funcs import force_gatherable
+from funasr.layers.abs_normalize import AbsNormalize
from funasr.models.base_model import FunASRModel
+from funasr.models.encoder.abs_encoder import AbsEncoder
+from funasr.models.frontend.abs_frontend import AbsFrontend
+from funasr.models.preencoder.abs_preencoder import AbsPreEncoder
+from funasr.models.specaug.abs_specaug import AbsSpecAug
+from funasr.torch_utils.device_funcs import force_gatherable
if LooseVersion(torch.__version__) >= LooseVersion("1.6.0"):
from torch.cuda.amp import autocast
@@ -30,13 +33,12 @@
def __init__(
self,
- frontend: Optional[torch.nn.Module],
- specaug: Optional[torch.nn.Module],
- normalize: Optional[torch.nn.Module],
- preencoder: Optional[AbsPreEncoder],
- encoder: torch.nn.Module,
+ frontend: Optional[AbsFrontend],
+ specaug: Optional[AbsSpecAug],
+ normalize: Optional[AbsNormalize],
+ encoder: AbsEncoder,
+ preencoder: Optional[AbsPreEncoder] = None,
):
- assert check_argument_types()
super().__init__()
@@ -53,7 +55,6 @@
speech_lengths: torch.Tensor,
) -> Tuple[torch.Tensor, Dict[str, torch.Tensor], torch.Tensor]:
"""Frontend + Encoder + Calc loss
-
Args:
speech: (Batch, Length, ...)
speech_lengths: (Batch, )
@@ -102,7 +103,6 @@
speech_lengths: torch.Tensor,
):
"""Frontend + Encoder.
-
Args:
speech: (Batch, Length, ...)
speech_lengths: (Batch, )
--
Gitblit v1.9.1