From 019ae4b35c2f713e17e69f2f8a8bd6b199642b0e Mon Sep 17 00:00:00 2001
From: Hui Zhang <zhtclz@foxmail.com>
Date: Fri, 25 Jun 2021 03:13:40 +0000
Subject: [PATCH] fix conf for ds2

---
 examples/aishell/s0/conf/deepspeech2.yaml     |  3 +--
 examples/aishell/s0/run.sh                    |  4 ++--
 examples/librispeech/s0/README.md             | 10 +++++-----
 examples/librispeech/s0/conf/deepspeech2.yaml | 13 +++++++++----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/examples/aishell/s0/conf/deepspeech2.yaml b/examples/aishell/s0/conf/deepspeech2.yaml
index 8cc4c4c9..1004fde0 100644
--- a/examples/aishell/s0/conf/deepspeech2.yaml
+++ b/examples/aishell/s0/conf/deepspeech2.yaml
@@ -10,8 +10,8 @@ data:
   min_output_input_ratio: 0.00
   max_output_input_ratio: .inf
 
-
 collator:
+  batch_size: 64 # one gpu
   mean_std_filepath: data/mean_std.json
   unit_type: char
   vocab_filepath: data/vocab.txt 
@@ -33,7 +33,6 @@ collator:
   sortagrad: True
   shuffle_method: batch_shuffle
   num_workers: 0
-  batch_size: 64 # one gpu
 
 model:
   num_conv_layers: 2
diff --git a/examples/aishell/s0/run.sh b/examples/aishell/s0/run.sh
index 05829136..c9708dcc 100755
--- a/examples/aishell/s0/run.sh
+++ b/examples/aishell/s0/run.sh
@@ -31,10 +31,10 @@ fi
 
 if [ ${stage} -le 3 ] && [ ${stop_stage} -ge 3 ]; then
     # test ckpt avg_n
-    CUDA_VISIBLE_DEVICES=${gpus} ./local/test.sh ${conf_path} exp/${ckpt}/checkpoints/${avg_ckpt} || exit -1
+    CUDA_VISIBLE_DEVICES=0 ./local/test.sh ${conf_path} exp/${ckpt}/checkpoints/${avg_ckpt} || exit -1
 fi
 
 if [ ${stage} -le 4 ] && [ ${stop_stage} -ge 4 ]; then
     # export ckpt avg_n
-    CUDA_VISIBLE_DEVICES=${gpus} ./local/export.sh ${conf_path} exp/${ckpt}/checkpoints/${avg_ckpt} exp/${ckpt}/checkpoints/${avg_ckpt}.jit
+    CUDA_VISIBLE_DEVICES=0 ./local/export.sh ${conf_path} exp/${ckpt}/checkpoints/${avg_ckpt} exp/${ckpt}/checkpoints/${avg_ckpt}.jit
 fi
diff --git a/examples/librispeech/s0/README.md b/examples/librispeech/s0/README.md
index 393dd457..dde288bd 100644
--- a/examples/librispeech/s0/README.md
+++ b/examples/librispeech/s0/README.md
@@ -2,8 +2,8 @@
 
 ## Deepspeech2
 
-| Model | release |  Config | Test set | Loss | WER |  
-| --- | --- |  --- | --- | --- | --- |  
-| DeepSpeech2 | 2.1.0 | conf/deepspeech2.yaml | 15.184467315673828 | test-clean | 0.072154 |  
-| DeepSpeech2 | 2.0.0 | conf/deepspeech2.yaml | - | test-clean | 0.073973 |  
-| DeepSpeech2 | 1.8.5 | - | test-clean | - | 0.074939 |  
+| Model | Params |  Release |  Config | Test set | Loss | WER |  
+| --- | --- | --- |  --- | --- | --- | --- |  
+| DeepSpeech2 | 42.96M |  2.1.0 | conf/deepspeech2.yaml | 15.184467315673828 | test-clean | 0.072154 |  
+| DeepSpeech2 | 42.96M |  2.0.0 | conf/deepspeech2.yaml | - | test-clean | 0.073973 |  
+| DeepSpeech2 | 42.96M |  1.8.5 | - | test-clean | - | 0.074939 |  
diff --git a/examples/librispeech/s0/conf/deepspeech2.yaml b/examples/librispeech/s0/conf/deepspeech2.yaml
index d1746bff..b419cbe2 100644
--- a/examples/librispeech/s0/conf/deepspeech2.yaml
+++ b/examples/librispeech/s0/conf/deepspeech2.yaml
@@ -3,16 +3,21 @@ data:
   train_manifest: data/manifest.train
   dev_manifest: data/manifest.dev-clean
   test_manifest: data/manifest.test-clean
-  mean_std_filepath: data/mean_std.json
-  vocab_filepath: data/vocab.txt 
-  augmentation_config: conf/augmentation.json
-  batch_size: 20
   min_input_len: 0.0
   max_input_len: 27.0 # second
   min_output_len: 0.0
   max_output_len: .inf
   min_output_input_ratio: 0.00
   max_output_input_ratio: .inf
+
+collator:
+  batch_size: 20
+  mean_std_filepath: data/mean_std.json
+  unit_type: char
+  vocab_filepath: data/vocab.txt 
+  augmentation_config: conf/augmentation.json
+  random_seed: 0
+  spm_model_prefix: 
   specgram_type: linear
   target_sample_rate: 16000
   max_freq: None