EncoderDecoderASR update

hyperparams.yaml

@@ -105,7 +105,14 @@ asr_model: !new:torch.nn.ModuleList
 
 tokenizer: !new:sentencepiece.SentencePieceProcessor
 
-beam_searcher: !new:speechbrain.decoders.S2SRNNBeamSearcher
+# 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.S2SRNNBeamSearcher
     embedding: !ref <emb>
     decoder: !ref <dec>
     linear: !ref <seq_lin>
@@ -120,12 +127,8 @@ beam_searcher: !new:speechbrain.decoders.S2SRNNBeamSearcher
     temperature: !ref <temperature>
 
 modules:
-    compute_features: !ref <compute_features>
-    normalize: !ref <normalize>
-    asr_model: !ref <asr_model>
-    asr_encoder: !ref <enc>
-    asr_decoder: !ref <dec>
-    beam_searcher: !ref <beam_searcher>
+    encoder: !ref <encoder>
+    decoder: !ref <decoder>
 
 pretrainer: !new:speechbrain.utils.parameter_transfer.Pretrainer
     loadables: