Merge pull request #949 from Jackwaterveg/develop

fix the bug of chooing dataloader, remove the log of downloads lm, ch…

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)

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