fix the bug of chooing dataloader, remove the log of downloads lm, change the epoch in tiny

README.md

@@ -9,20 +9,20 @@ English | [简体中文](README_ch.md)
 </p>
 <div align="center">  
 
-  <h3> 
+  <h3>
   <a href="#quick-start"> Quick Start </a>
   | <a href="#tutorials"> Tutorials </a>
-  | <a href="#model-list"> Models List </a> 
+  | <a href="#model-list"> Models List </a>
 </div>
-  
+
 ------------------------------------------------------------------------------------
 ![License](https://img.shields.io/badge/license-Apache%202-red.svg)
 ![python version](https://img.shields.io/badge/python-3.7+-orange.svg)
 ![support os](https://img.shields.io/badge/os-linux-yellow.svg)
 
 <!---
-why they should use your module, 
-how they can install it, 
+why they should use your module,
+how they can install it,
 how they can use it
 -->
 
@@ -31,7 +31,7 @@ how they can use it
 Via the easy-to-use, efficient, flexible and scalable implementation, our vision is to empower both industrial application and academic research, including training, inference & testing modules, and deployment process. To be more specific, this toolkit features at:
 - **Fast and Light-weight**: we provide high-speed and ultra-lightweight models that are convenient for industrial deployment.
 - **Rule-based Chinese frontend**: our frontend contains Text Normalization (TN) and Grapheme-to-Phoneme (G2P, including Polyphone and Tone Sandhi). Moreover, we use self-defined linguistic rules to adapt Chinese context.
-- **Varieties of Functions that Vitalize both Industrial and Academia**: 
+- **Varieties of Functions that Vitalize both Industrial and Academia**:
   - *Implementation of critical audio tasks*: this toolkit contains audio functions like Speech Translation (ST), Automatic Speech Recognition (ASR), Text-To-Speech Synthesis (TTS), Voice Cloning(VC), Punctuation Restoration, etc.
   - *Integration of mainstream models and datasets*: the toolkit implements modules that participate in the whole pipeline of the speech tasks, and uses mainstream datasets like LibriSpeech, LJSpeech, AIShell, CSMSC, etc. See also [model lists](#models-list) for more details.
   - *Cross-domain application*: as an extension of the application of traditional audio tasks, we combine the aforementioned tasks with other fields like NLP.
@@ -70,7 +70,7 @@ If you want to set up PaddleSpeech in other environment, please see the [ASR ins
 ## Quick Start
 > Note: the current links to `English ASR` and `English TTS` are not valid.
 
-Just a quick test of our functions: [English ASR](link/hubdetail?name=deepspeech2_aishell&en_category=AutomaticSpeechRecognition) and [English TTS](link/hubdetail?name=fastspeech2_baker&en_category=TextToSpeech) by typing message or upload your own audio file. 
+Just a quick test of our functions: [English ASR](link/hubdetail?name=deepspeech2_aishell&en_category=AutomaticSpeechRecognition) and [English TTS](link/hubdetail?name=fastspeech2_baker&en_category=TextToSpeech) by typing message or upload your own audio file.
 
 Developers can have a try of our model with only a few lines of code.
 
@@ -87,7 +87,7 @@ bash local/test.sh conf/deepspeech2.yaml ckptfile offline
 ```
 
 For *TTS*, try FastSpeech2 on LJSpeech:
-- Download LJSpeech-1.1 from the [ljspeech official website](https://keithito.com/LJ-Speech-Dataset/), our prepared durations for fastspeech2 [ljspeech_alignment](https://paddlespeech.bj.bcebos.com/MFA/LJSpeech-1.1/ljspeech_alignment.tar.gz). 
+- Download LJSpeech-1.1 from the [ljspeech official website](https://keithito.com/LJ-Speech-Dataset/), our prepared durations for fastspeech2 [ljspeech_alignment](https://paddlespeech.bj.bcebos.com/MFA/LJSpeech-1.1/ljspeech_alignment.tar.gz).
 - The pretrained models are seperated into two parts: [fastspeech2_nosil_ljspeech_ckpt](https://paddlespeech.bj.bcebos.com/Parakeet/fastspeech2_nosil_ljspeech_ckpt_0.5.zip) and [pwg_ljspeech_ckpt](https://paddlespeech.bj.bcebos.com/Parakeet/pwg_ljspeech_ckpt_0.5.zip). Please download then unzip to `./model/fastspeech2` and `./model/pwg` respectively.
 - Assume your path to the dataset is `~/datasets/LJSpeech-1.1` and `./ljspeech_alignment` accordingly, preprocess your data and then use our pretrained model to synthesize:
 ```shell
@@ -106,7 +106,7 @@ PaddleSpeech supports a series of most popular models, summarized in [released m
 ASR module contains *Acoustic Model* and *Language Model*, with the following details:
 
 <!---
-The current hyperlinks redirect to [Previous Parakeet](https://github.com/PaddlePaddle/Parakeet/tree/develop/examples). 
+The current hyperlinks redirect to [Previous Parakeet](https://github.com/PaddlePaddle/Parakeet/tree/develop/examples).
 -->
 
 > Note: The `Link` should be code path rather than download links.

deepspeech/exps/deepspeech2/model.py

@@ -153,8 +153,12 @@ class DeepSpeech2Trainer(Trainer):
     def setup_model(self):
         config = self.config.clone()
         with UpdateConfig(config):
-            config.model.feat_size = self.train_loader.collate_fn.feature_size
-            config.model.dict_size = self.train_loader.collate_fn.vocab_size
+            if self.train:
+                config.model.feat_size = self.train_loader.collate_fn.feature_size
+                config.model.dict_size = self.train_loader.collate_fn.vocab_size
+            else:
+                config.model.feat_size = self.test_loader.collate_fn.feature_size
+                config.model.dict_size = self.test_loader.collate_fn.vocab_size
 
         if self.args.model_type == 'offline':
             model = DeepSpeech2Model.from_config(config.model)
@@ -189,7 +193,6 @@ class DeepSpeech2Trainer(Trainer):
         self.lr_scheduler = lr_scheduler
         logger.info("Setup optimizer/lr_scheduler!")
 
-
     def setup_dataloader(self):
         config = self.config.clone()
         config.defrost()

examples/aishell/s0/local/test.sh

@@ -13,7 +13,7 @@ ckpt_prefix=$2
 model_type=$3
 
 # download language model
-bash local/download_lm_ch.sh
+bash local/download_lm_ch.sh > dev/null 2>&1
 if [ $? -ne 0 ]; then
    exit 1
 fi

examples/aishell/s0/local/test_export.sh

@@ -13,7 +13,7 @@ jit_model_export_path=$2
 model_type=$3
 
 # download language model
-bash local/download_lm_ch.sh
+bash local/download_lm_ch.sh > dev/null 2>&1
 if [ $? -ne 0 ]; then
    exit 1
 fi

examples/librispeech/s0/local/test.sh

@@ -13,7 +13,7 @@ ckpt_prefix=$2
 model_type=$3
 
 # download language model
-bash local/download_lm_en.sh
+bash local/download_lm_en.sh > /dev/null 2>&1
 if [ $? -ne 0 ]; then
    exit 1
 fi

examples/other/1xt2x/aishell/local/test.sh

@@ -13,7 +13,7 @@ ckpt_prefix=$2
 model_type=$3
 
 # download language model
-bash local/download_lm_ch.sh
+bash local/download_lm_ch.sh > /dev/null 2>&1
 if [ $? -ne 0 ]; then
    exit 1
 fi

examples/other/1xt2x/baidu_en8k/local/test.sh

@@ -13,7 +13,7 @@ ckpt_prefix=$2
 model_type=$3
 
 # download language model
-bash local/download_lm_en.sh
+bash local/download_lm_en.sh > /dev/null 2>&1
 if [ $? -ne 0 ]; then
    exit 1
 fi

examples/other/1xt2x/librispeech/local/test.sh

@@ -13,7 +13,7 @@ ckpt_prefix=$2
 model_type=$3
 
 # download language model
-bash local/download_lm_en.sh
+bash local/download_lm_en.sh > /dev/null 2>&1
 if [ $? -ne 0 ]; then
    exit 1
 fi

examples/tiny/s0/conf/deepspeech2.yaml

@@ -45,7 +45,7 @@ model:
   ctc_grad_norm_type: null
 
 training:
-  n_epoch: 10
+  n_epoch: 5
   accum_grad: 1
   lr: 1e-5 
   lr_decay: 0.8 

examples/tiny/s0/conf/deepspeech2_online.yaml

@@ -47,7 +47,7 @@ model:
   ctc_grad_norm_type: null
 
 training:
-  n_epoch: 10
+  n_epoch: 5
   accum_grad: 1
   lr: 1e-5 
   lr_decay: 1.0 

examples/tiny/s0/local/test.sh

@@ -13,7 +13,7 @@ ckpt_prefix=$2
 model_type=$3
 
 # download language model
-bash local/download_lm_en.sh
+bash local/download_lm_en.sh > /dev/null 2>&1
 if [ $? -ne 0 ]; then
    exit 1
 fi

examples/tiny/s1/conf/chunk_confermer.yaml

@@ -83,7 +83,7 @@ model:
 
 
 training:
-  n_epoch: 20
+  n_epoch: 5
   accum_grad: 1
   global_grad_clip: 5.0
   optim: adam

examples/tiny/s1/conf/chunk_transformer.yaml

@@ -76,7 +76,7 @@ model:
 
 
 training:
-  n_epoch: 20
+  n_epoch: 5
   accum_grad: 1
   global_grad_clip: 5.0
   optim: adam

examples/tiny/s1/conf/conformer.yaml

@@ -79,7 +79,7 @@ model:
 
 
 training:
-  n_epoch: 20
+  n_epoch: 5
   accum_grad: 4
   global_grad_clip: 5.0
   optim: adam

examples/tiny/s1/conf/transformer.yaml

@@ -73,7 +73,7 @@ model:
 
 
 training:
-  n_epoch: 21
+  n_epoch: 5
   accum_grad: 1
   global_grad_clip: 5.0
   optim: adam