[src,scripts] Various minor code cleanups (kaldi-asr#2809)

yzmyyff · Nov 1, 2018 · faa1f3c · faa1f3c
1 parent 0300493
commit faa1f3c
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 21 deletions.
diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1a.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1a.sh
@@ -33,7 +33,6 @@ chunk_width=150
 chunk_left_context=40
 chunk_right_context=0
 xent_regularize=0.025
-self_repair_scale=0.00001
 label_delay=5
 # decode options
 extra_left_context=50

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1b.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1b.sh
@@ -29,7 +29,6 @@ chunk_width=150
 chunk_left_context=40
 chunk_right_context=0
 xent_regularize=0.025
-self_repair_scale=0.00001
 label_delay=5
 # decode options
 extra_left_context=50

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1c.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1c.sh
@@ -36,7 +36,6 @@ chunk_width=150
 chunk_left_context=40
 chunk_right_context=0
 xent_regularize=0.025
-self_repair_scale=0.00001
 label_delay=5
 # decode options
 extra_left_context=50

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1d.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1d.sh
@@ -48,7 +48,6 @@ decode_iter=final
 
 # training options
 xent_regularize=0.025
-self_repair_scale=0.00001
 label_delay=5
 
 chunk_left_context=40

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1e.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1e.sh
@@ -41,7 +41,6 @@ decode_nj=50
 
 # training options
 xent_regularize=0.01
-self_repair_scale=0.00001
 label_delay=5
 
 chunk_left_context=40

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1f.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1f.sh
@@ -60,7 +60,6 @@ decode_iter=final
 
 # training options
 xent_regularize=0.01
-self_repair_scale=0.00001
 label_delay=5
 
 chunk_left_context=40

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1g.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1g.sh
@@ -42,7 +42,6 @@ decode_iter=final
 
 # training options
 xent_regularize=0.01
-self_repair_scale=0.00001
 label_delay=5
 
 chunk_left_context=40

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1h.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1h.sh
@@ -39,7 +39,6 @@ decode_iter=final
 
 # training options
 xent_regularize=0.01
-self_repair_scale=0.00001
 label_delay=5
 
 chunk_left_context=40

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1i.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1i.sh
@@ -60,7 +60,6 @@ decode_iter=final
 
 # training options
 xent_regularize=0.01
-self_repair_scale=0.00001
 label_delay=5
 
 chunk_left_context=40

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1j.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1j.sh
@@ -25,7 +25,6 @@ decode_nj=50
 
 # training options
 xent_regularize=0.01
-self_repair_scale=0.00001
 label_delay=5
 
 chunk_left_context=40

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1k.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1k.sh
@@ -35,7 +35,6 @@ decode_nj=50
 
 # training options
 xent_regularize=0.01
-self_repair_scale=0.00001
 label_delay=5
 
 chunk_left_context=40

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1l.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1l.sh
@@ -34,7 +34,6 @@ chunk_width=150
 chunk_left_context=40
 chunk_right_context=0
 xent_regularize=0.025
-self_repair_scale=0.00001
 label_delay=5
 dropout_schedule='0,[email protected],[email protected],0'
 # decode options

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1m.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1m.sh
@@ -42,7 +42,6 @@ frames_per_chunk_primary=$(echo $frames_per_chunk | cut -d, -f1)
 chunk_left_context=40
 chunk_right_context=0
 xent_regularize=0.025
-self_repair_scale=0.00001
 label_delay=5
 # decode options
 extra_left_context=50

diff --git a/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1n.sh b/egs/swbd/s5c/local/chain/tuning/run_tdnn_lstm_1n.sh
@@ -43,7 +43,6 @@ frames_per_chunk_primary=$(echo $frames_per_chunk | cut -d, -f1)
 chunk_left_context=40
 chunk_right_context=0
 xent_regularize=0.025
-self_repair_scale=0.00001
 label_delay=5
 # decode options
 extra_left_context=50

diff --git a/egs/wsj/s5/utils/format_lm_sri.sh b/egs/wsj/s5/utils/format_lm_sri.sh
@@ -48,8 +48,6 @@ else
  out_dir=$3
 fi
 
-mkdir -p $out_dir
-
 for f in $lm $lang_dir/words.txt; do
  if [ ! -f $f ]; then
  echo "$0: expected input file $f to exist."
@@ -73,7 +71,6 @@ trap 'rm -rf "$tmpdir"' EXIT
 mkdir -p $out_dir
 cp -r $lang_dir/* $out_dir || exit 1;
 
-lm_base=$(basename $lm '.gz')
 awk '{print $1}' $out_dir/words.txt > $tmpdir/voc || exit 1;
 
 # Change the LM vocabulary to be the intersection of the current LM vocabulary

diff --git a/src/cudamatrix/cu-value.h b/src/cudamatrix/cu-value.h
@@ -22,7 +22,7 @@
 #ifndef KALDI_CUDAMATRIX_CU_VALUE_H_
 #define KALDI_CUDAMATRIX_CU_VALUE_H_
 
-#include <cudamatrix/cu-device.h>
+#include "cudamatrix/cu-device.h"
 
 namespace kaldi {
 

diff --git a/src/doc/hmm.dox b/src/doc/hmm.dox
@@ -98,7 +98,7 @@ numbered state of a
 "prototype HMM" has two variables "forward_pdf_class" and "self_loop_pdf_class".
 The "self_loop_pdf_class" is a kind of pdf-class that is associated
 with self-loop transition. It is by default identical to "forward_pdf_class",
-but it can be used to define less-convectional HMM topologies
+but it can be used to define less-conventional HMM topologies
 where the pdfs on the self-loop and forward transitions are different.
 The decision to allow the pdf-class on just the self-loop to be different,
 while not embracing a fully "arc-based" representation where the pdfs on

diff --git a/src/nnet3/decodable-online-looped.cc b/src/nnet3/decodable-online-looped.cc
@@ -17,7 +17,7 @@
 // See the Apache 2 License for the specific language governing permissions and
 // limitations under the License.
 
-#include <nnet3/decodable-online-looped.h>
+#include "nnet3/decodable-online-looped.h"
 #include "nnet3/nnet-utils.h"
 
 namespace kaldi {

diff --git a/src/tree/tree-renderer.cc b/src/tree/tree-renderer.cc
@@ -17,7 +17,7 @@
 // See the Apache 2 License for the specific language governing permissions and
 // limitations under the License.
 
-#include <tree/tree-renderer.h>
+#include "tree/tree-renderer.h"
 
 namespace kaldi {
 const int32 TreeRenderer::kEdgeWidth = 1;