EncoderDecoderASR update

hyperparams.yaml

@@ -73,7 +73,7 @@ seq_lin: !new:speechbrain.nnet.linear.Linear
     input_size: !ref <d_model>
     n_neurons: !ref <output_neurons>
 
-beam_searcher: !new:speechbrain.decoders.S2STransformerBeamSearch
+decoder: !new:speechbrain.decoders.S2STransformerBeamSearch
     modules: [!ref <Transformer>, !ref <seq_lin>, !ref <ctc_lin>]
     bos_index: !ref <bos_index>
     eos_index: !ref <eos_index>
@@ -118,9 +118,15 @@ lm_model: !new:speechbrain.lobes.models.transformer.TransformerLM.TransformerLM
 
 tokenizer: !new:sentencepiece.SentencePieceProcessor
 
-asr_encoder: !new:speechbrain.utils.callchains.LengthsCapableChain
-    - !ref <CNN>
-    - !ref <Transformer.encode>
+Tencoder: !new:speechbrain.lobes.models.transformer.TransformerASR.EncoderWrapper
+    transformer: !ref <Transformer>
+
+encoder: !new:speechbrain.nnet.containers.LengthsCapableSequential
+    input_shape: [null, null, !ref <n_mels>]
+    compute_features: !ref <compute_features>
+    normalize: !ref <normalize>
+    cnn: !ref <CNN>
+    transformer_encoder: !ref <Tencoder>
 
 # Models
 asr_model: !new:torch.nn.ModuleList
@@ -133,7 +139,8 @@ modules:
    asr_model: !ref <asr_model>
    normalize: !ref <normalize>
    lm_model: !ref <lm_model>
-   beam_searcher: !ref <beam_searcher>
+   encoder: !ref <encoder>
+   decoder: !ref <decoder>
 
 # The pretrainer allows a mapping between pretrained files and instances that
 # are declared in the yaml.