resolved conflicts

egs/heroico/s5/RESULTS

@@ -1,25 +1,48 @@
 # for dir in $(echo exp/tri*/decode* | grep -v 'si/'); do grep WER $dir/wer* | utils/best_wer.sh; done
 
-%WER 17.44 [ 1334 / 7650, 215 ins, 245 del, 874 sub ] exp/tri1/decode_devtest/wer_14_0.5
-%WER 10.16 [ 762 / 7498, 68 ins, 126 del, 568 sub ] exp/tri1/decode_native/wer_16_0.5
-%WER 16.60 [ 1530 / 9215, 175 ins, 222 del, 1133 sub ] exp/tri1/decode_nonnative/wer_15_0.5
-%WER 13.74 [ 2297 / 16713, 248 ins, 344 del, 1705 sub ] exp/tri1/decode_test/wer_15_0.5
-%WER 17.53 [ 1341 / 7650, 243 ins, 224 del, 874 sub ] exp/tri2b/decode_devtest/wer_16_0.0
-%WER 9.23 [ 692 / 7498, 58 ins, 108 del, 526 sub ] exp/tri2b/decode_native/wer_17_0.5
-%WER 17.19 [ 1584 / 9215, 200 ins, 205 del, 1179 sub ] exp/tri2b/decode_nonnative/wer_17_0.5
-%WER 13.67 [ 2284 / 16713, 258 ins, 312 del, 1714 sub ] exp/tri2b/decode_test/wer_17_0.5
-%WER 15.74 [ 1204 / 7650, 224 ins, 193 del, 787 sub ] exp/tri3b/decode_devtest/wer_17_0.0
-%WER 20.14 [ 1541 / 7650, 287 ins, 234 del, 1020 sub ] exp/tri3b/decode_devtest.si/wer_16_0.0
-%WER 6.80 [ 510 / 7498, 48 ins, 57 del, 405 sub ] exp/tri3b/decode_native/wer_17_0.0
-%WER 11.20 [ 840 / 7498, 110 ins, 114 del, 616 sub ] exp/tri3b/decode_native.si/wer_17_1.0
-%WER 14.22 [ 1310 / 9215, 150 ins, 164 del, 996 sub ] exp/tri3b/decode_nonnative/wer_17_1.0
-%WER 22.43 [ 2067 / 9215, 322 ins, 234 del, 1511 sub ] exp/tri3b/decode_nonnative.si/wer_17_1.0
-%WER 11.00 [ 1838 / 16713, 183 ins, 249 del, 1406 sub ] exp/tri3b/decode_test/wer_17_1.0
-%WER 17.47 [ 2919 / 16713, 437 ins, 352 del, 2130 sub ] exp/tri3b/decode_test.si/wer_17_1.0
+# old results before adding Movie subtitles text corpus in LM training:
+# %WER 67.01 [ 5126 / 7650, 837 ins, 575 del, 3714 sub ] exp/tri1/decode_devtest/wer_14_1.0
+# %WER 62.39 [ 4678 / 7498, 768 ins, 397 del, 3513 sub ] exp/tri1/decode_native/wer_13_1.0
+# %WER 67.05 [ 6179 / 9215, 895 ins, 606 del, 4678 sub ] exp/tri1/decode_nonnative/wer_13_1.0
+# %WER 64.97 [ 10859 / 16713, 1678 ins, 999 del, 8182 sub ] exp/tri1/decode_test/wer_13_1.0
+# %WER 65.90 [ 5041 / 7650, 1016 ins, 416 del, 3609 sub ] exp/tri2b/decode_devtest/wer_12_1.0
+# %WER 61.26 [ 4593 / 7498, 908 ins, 300 del, 3385 sub ] exp/tri2b/decode_native/wer_14_1.0
+# %WER 67.51 [ 6221 / 9215, 1085 ins, 524 del, 4612 sub ] exp/tri2b/decode_nonnative/wer_14_1.0
+# %WER 64.87 [ 10842 / 16713, 2004 ins, 838 del, 8000 sub ] exp/tri2b/decode_test/wer_14_1.0
+# %WER 66.09 [ 5056 / 7650, 1078 ins, 402 del, 3576 sub ] exp/tri3b/decode_devtest/wer_16_1.0
+# %WER 74.88 [ 5728 / 7650, 1210 ins, 426 del, 4092 sub ] exp/tri3b/decode_devtest.si/wer_15_1.0
+# %WER 61.19 [ 4588 / 7498, 1038 ins, 255 del, 3295 sub ] exp/tri3b/decode_native/wer_14_1.0
+# %WER 70.99 [ 5323 / 7498, 1185 ins, 301 del, 3837 sub ] exp/tri3b/decode_native.si/wer_16_1.0
+# %WER 66.35 [ 6114 / 9215, 1186 ins, 421 del, 4507 sub ] exp/tri3b/decode_nonnative/wer_17_1.0
+# %WER 76.36 [ 7037 / 9215, 1420 ins, 467 del, 5150 sub ] exp/tri3b/decode_nonnative.si/wer_16_1.0
+# %WER 64.06 [ 10706 / 16713, 2245 ins, 657 del, 7804 sub ] exp/tri3b/decode_test/wer_15_1.0
+# %WER 73.97 [ 12362 / 16713, 2608 ins, 766 del, 8988 sub ] exp/tri3b/decode_test.si/wer_16_1.0
+# %WER 53.07 [ 4060 / 7650, 744 ins, 376 del, 2940 sub ] exp/chain/tdnn1e_sp/decode_devtest/wer_7_1.0
+# %WER 54.47 [ 4084 / 7498, 536 ins, 475 del, 3073 sub ] exp/chain/tdnn1e_sp/decode_native/wer_7_1.0
+# %WER 63.01 [ 5806 / 9215, 685 ins, 784 del, 4337 sub ] exp/chain/tdnn1e_sp/decode_nonnative/wer_7_1.0
+# %WER 59.25 [ 9903 / 16713, 1226 ins, 1259 del, 7418 sub ] exp/chain/tdnn1e_sp/decode_test/wer_7_1.0
 
-# chain model results:
+# new results:
+%WER 18.27 [ 1398 / 7650, 213 ins, 253 del, 932 sub ] exp/tri1/decode_devtest/wer_15_0.5
+%WER 9.95 [ 746 / 7498, 74 ins, 108 del, 564 sub ] exp/tri1/decode_native/wer_13_0.5
+%WER 16.63 [ 1532 / 9215, 197 ins, 183 del, 1152 sub ] exp/tri1/decode_nonnative/wer_17_0.0
+%WER 13.68 [ 2287 / 16713, 207 ins, 360 del, 1720 sub ] exp/tri1/decode_test/wer_17_0.5
+%WER 17.19 [ 1315 / 7650, 227 ins, 231 del, 857 sub ] exp/tri2b/decode_devtest/wer_17_0.5
+%WER 9.23 [ 692 / 7498, 60 ins, 103 del, 529 sub ] exp/tri2b/decode_native/wer_16_0.5
+%WER 17.16 [ 1581 / 9215, 184 ins, 216 del, 1181 sub ] exp/tri2b/decode_nonnative/wer_17_0.5
+%WER 13.64 [ 2279 / 16713, 241 ins, 326 del, 1712 sub ] exp/tri2b/decode_test/wer_17_0.5
+%WER 15.36 [ 1175 / 7650, 212 ins, 210 del, 753 sub ] exp/tri3b/decode_devtest/wer_17_0.5
+%WER 20.27 [ 1551 / 7650, 269 ins, 257 del, 1025 sub ] exp/tri3b/decode_devtest.si/wer_14_1.0
+%WER 6.40 [ 480 / 7498, 50 ins, 58 del, 372 sub ] exp/tri3b/decode_native/wer_16_0.0
+%WER 10.91 [ 818 / 7498, 100 ins, 112 del, 606 sub ] exp/tri3b/decode_native.si/wer_16_1.0
+%WER 14.30 [ 1318 / 9215, 206 ins, 134 del, 978 sub ] exp/tri3b/decode_nonnative/wer_17_0.0
+%WER 21.62 [ 1992 / 9215, 286 ins, 224 del, 1482 sub ] exp/tri3b/decode_nonnative.si/wer_16_1.0
+%WER 10.78 [ 1802 / 16713, 247 ins, 195 del, 1360 sub ] exp/tri3b/decode_test/wer_17_0.0
+%WER 16.81 [ 2809 / 16713, 374 ins, 338 del, 2097 sub ] exp/tri3b/decode_test.si/wer_16_1.0
 
-12.84 [ 982 / 7650, 187 ins, 165 del, 630 sub ] exp/chain/tdnn1b_sp/decode_devtest/wer_10_0.5
-12.13 [ 1118 / 9215, 99 ins, 161 del, 858 sub ] exp/chain/tdnn1b_sp/decode_nonnative/wer_13_0.0
-9.47 [ 1582 / 16713, 119 ins, 254 del, 1209 sub ] exp/chain/tdnn1b_sp/decode_test/wer_11_0.5
-5.87 [ 440 / 7498, 28 ins, 79 del, 333 sub ] exp/chain/tdnn1b_sp/decode_native/wer_11_0.5
+# chain model results:
+# for dir in $(echo exp/chain/tdnn1b_sp/decode* | grep -v 'si/'); do grep WER $dir/wer* | utils/best_wer.sh; done
+%WER 12.99 [ 994 / 7650, 192 ins, 163 del, 639 sub ] exp/chain/tdnn1b_sp/decode_devtest/wer_10_1.0
+%WER 12.47 [ 1149 / 9215, 119 ins, 174 del, 856 sub ] exp/chain/tdnn1b_sp/decode_nonnative/wer_12_0.0
+%WER 9.64 [ 1611 / 16713, 169 ins, 240 del, 1202 sub ] exp/chain/tdnn1b_sp/decode_test/wer_12_0.0
+%WER 6.13 [ 460 / 7498, 52 ins, 55 del, 353 sub ] exp/chain/tdnn1b_sp/decode_native/wer_10_0.0

egs/heroico/s5/local/prepare_data.sh

@@ -14,7 +14,6 @@ set -e
 set -o pipefail
 
 tmpdir=data/local/tmp
-datadir=$(pwd)/LDC2006S37
 
 # acoustic models are trained on the heroico corpus
 # testing is done on the usma corpus

egs/heroico/s5/run.sh

@@ -21,19 +21,11 @@ set -e
 set -o pipefail
 set -u
 
-# the location of the LDC corpus; this location works for the CLSP grid.
-#datadir=/export/corpora5/LDC/LDC2006S37
-# The corpus and lexicon are on openslr.org
-speech="https://www.openslr.org/resources/39/LDC2006S37.tar.gz"
-lexicon="https://www.openslr.org/resources/34/santiago.tar.gz"
-
-# Location of the Movie subtitles text corpus
-subs_src="https://opus.lingfil.uu.se/download.php?f=OpenSubtitles2018/en-es.txt.zip"
 
 # don't change tmpdir, the location is used explicitly in scripts in local/.
 tmpdir=data/local/tmp
 
-if [ $stage -le -1 ]; then
+if [ $stage -le 0 ]; then
  # download the corpus from openslr
  local/heroico_download.sh $speech $lexicon
  # Get data for lm training
@@ -42,7 +34,7 @@ fi
 
 if [ $stage -le 1 ]; then
  echo "Makin lists for building models."
- local/prepare_data.sh
+ local/prepare_data.sh $datadir
 fi
 
 if [ $stage -le 2 ]; then