EncoderDecoderASR update

hyperparams.yaml

@@ -139,7 +139,14 @@ lm_model: !new:speechbrain.lobes.models.transformer.TransformerLM.TransformerLM
     activation: !name:torch.nn.GELU
     normalize_before: False
 
-beam_searcher: !new:speechbrain.decoders.S2SRNNBeamSearchTransformerLM
+# We compose the inference (encoder) pipeline.
+encoder: !new:speechbrain.nnet.containers.LengthsCapableSequential
+    input_shape: [null, null, !ref <n_mels>]
+    compute_features: !ref <compute_features>
+    normalize: !ref <normalize>
+    model: !ref <enc>
+
+decoder: !new:speechbrain.decoders.S2SRNNBeamSearchTransformerLM
    embedding: !ref <emb>
    decoder: !ref <dec>
    linear: !ref <seq_lin>
@@ -162,13 +169,9 @@ beam_searcher: !new:speechbrain.decoders.S2SRNNBeamSearchTransformerLM
    temperature_lm: !ref <temperature_lm>
 
 modules:
-   compute_features: !ref <compute_features>
-   asr_encoder: !ref <enc>
-   asr_decoder: !ref <dec>
-   asr_model: !ref <asr_model>
-   normalize: !ref <normalize>
+   encoder: !ref <encoder>
+   decoder: !ref <decoder>
    lm_model: !ref <lm_model>
-   beam_searcher: !ref <beam_searcher>
 
 # The pretrainer allows a mapping between pretrained files and instances that
 # are declared in the yaml.