update

speech_asr

2023-04-11 71613122710d4d955913649cc7995c6c90f110ae

update

 funasr/layers/abs_normalize.py

File was deleted

 funasr/layers/global_mvn.py

@@ -7,11 +7,8 @@
from typeguard import check_argument_types

from funasr.modules.nets_utils import make_pad_mask
from funasr.layers.abs_normalize import AbsNormalize
from funasr.layers.inversible_interface import InversibleInterface


class GlobalMVN(AbsNormalize, InversibleInterface):
class GlobalMVN(torch.nn.Module):
    """Apply global mean and variance normalization

    TODO(kamo): Make this class portable somehow

 funasr/layers/inversible_interface.py

File was deleted

 funasr/models/data2vec.py

@@ -13,12 +13,9 @@
from typeguard import check_argument_types

from funasr.layers.abs_normalize import AbsNormalize
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
from funasr.train.abs_espnet_model import AbsESPnetModel
from funasr.models.base_model import FunASRModel

if LooseVersion(torch.__version__) >= LooseVersion("1.6.0"):
    from torch.cuda.amp import autocast
@@ -29,16 +26,16 @@
        yield


class Data2VecPretrainModel(AbsESPnetModel):
class Data2VecPretrainModel(FunASRModel):
    """Data2Vec Pretrain model"""

    def __init__(
            self,
            frontend: Optional[AbsFrontend],
            specaug: Optional[AbsSpecAug],
            frontend: Optional[torch.nn.Module],
            specaug: Optional[torch.nn.Module],
            normalize: Optional[AbsNormalize],
            preencoder: Optional[AbsPreEncoder],
            encoder: AbsEncoder,
            encoder: torch.nn.Module,
    ):
        assert check_argument_types()