Skip to content

Commit 2a69516

Browse files
desh2608danpovey
authored andcommitted
Merged 'master' branch (#3127)
* [src] Change warp-synchronous to cub::BlockReduce (safer but slower) (#3080) * [src] Fix && and || uses where & and | intended, and other weird errors (#3087) * [build] Some fixes to Makefiles (#3088) clang is unhappy with '-rdynamic' in compile-only step, and the switch is really unnecessary. Also, the default location for MKL 64-bit libraries is intel64/. The em64t/ was explained already obsolete by an Intel rep in 2010: https://software.intel.com/en-us/forums/intel-math-kernel-library/topic/285973 * [src] Fixed -Wreordered warnings in feat (#3090) * [egs] Replace bc with perl -e (#3093) * [scripts] Fix python3 compatibility issue in data-perturbing script (#3084) * [doc] fix some typos in doc. (#3097) * [build] Make sure expf() speed probe times sensibly (#3089) * [scripts] Make sure merge_targets.py works in python3 (#3094) * [src] ifdef to fix compilation failure on CUDA 8 and earlier (#3103) * [doc] fix typos and broken links in doc. (#3102) * [scripts] Fix frame_shift bug in egs/swbd/s5c/local/score_sclite_conf.sh (#3104) * [src] Fix wrong assertion failure in nnet3-am-compute (#3106) * [src] Cosmetic changes to natural-gradient code (#3108) * [src,scripts] Python2 compatibility fixes and code cleanup for nnet1 (#3113) * [doc] Small documentation fixes; update on Kaldi history (#3031) * [src] Various mostly-cosmetic changes (copying from another branch) (#3109) * [scripts] Simplify text encoding in RNNLM scripts (now only support utf-8) (#3065) * [egs] Add "formosa_speech" recipe (Taiwanese Mandarin ASR) (#2474) * [egs] python3 compatibility in csj example script (#3123) * [egs] python3 compatibility in example scripts (#3126) * [scripts] Bug-fix for removing deleted words (#3116) The type of --max-deleted-words-kept-when-merging in segment_ctm_edits.py was a string, which prevented the mechanism from working altogether.
1 parent f93749a commit 2a69516

File tree

295 files changed

+2009
-316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+2009
-316
lines changed

egs/aishell/s5/local/chain/tuning/run_tdnn_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ if [ $stage -le 10 ]; then
9090
echo "$0: creating neural net configs using the xconfig parser";
9191

9292
num_targets=$(tree-info $treedir/tree |grep num-pdfs|awk '{print $2}')
93-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
93+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
9494

9595
mkdir -p $dir/configs
9696
cat <<EOF > $dir/configs/network.xconfig

egs/aishell/s5/local/chain/tuning/run_tdnn_2a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ if [ $stage -le 10 ]; then
9292
echo "$0: creating neural net configs using the xconfig parser";
9393

9494
num_targets=$(tree-info $treedir/tree |grep num-pdfs|awk '{print $2}')
95-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
95+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
9696

9797
mkdir -p $dir/configs
9898
cat <<EOF > $dir/configs/network.xconfig

egs/aishell2/s5/local/chain/tuning/run_tdnn_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fi
103103
if [ $stage -le 10 ]; then
104104
echo "$0: creating neural net configs using the xconfig parser";
105105
num_targets=$(tree-info $treedir/tree | grep num-pdfs | awk '{print $2}')
106-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
106+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
107107
opts="l2-regularize=0.002"
108108
linear_opts="orthonormal-constraint=1.0"
109109
output_opts="l2-regularize=0.0005 bottleneck-dim=256"

egs/aishell2/s5/local/chain/tuning/run_tdnn_1b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ if [ $stage -le 10 ]; then
150150
echo "$0: creating neural net configs using the xconfig parser";
151151
feat_dim=$(feat-to-dim scp:data/${train_set}_hires/feats.scp -)
152152
num_targets=$(tree-info $treedir/tree | grep num-pdfs | awk '{print $2}')
153-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
153+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
154154
opts="l2-regularize=0.002"
155155
linear_opts="orthonormal-constraint=1.0"
156156
output_opts="l2-regularize=0.0005 bottleneck-dim=256"

egs/ami/s5b/local/chain/multi_condition/tuning/run_tdnn_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ if [ $stage -le 15 ]; then
220220
echo "$0: creating neural net configs using the xconfig parser";
221221

222222
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
223-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
223+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
224224
affine_opts="l2-regularize=0.01 dropout-proportion=0.0 dropout-per-dim=true dropout-per-dim-continuous=true"
225225
tdnnf_opts="l2-regularize=0.01 dropout-proportion=0.0 bypass-scale=0.66"
226226
linear_opts="l2-regularize=0.01 orthonormal-constraint=-1.0"

egs/ami/s5b/local/chain/multi_condition/tuning/run_tdnn_lstm_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ if [ $stage -le 15 ]; then
211211
echo "$0: creating neural net configs using the xconfig parser";
212212

213213
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
214-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
214+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
215215

216216
mkdir -p $dir/configs
217217
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/multi_condition/tuning/run_tdnn_lstm_1b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ if [ $stage -le 15 ]; then
235235
echo "$0: creating neural net configs using the xconfig parser";
236236

237237
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
238-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
238+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
239239
tdnn_opts="l2-regularize=0.006"
240240
lstm_opts="l2-regularize=0.0025 decay-time=20 dropout-proportion=0.0"
241241
output_opts="l2-regularize=0.001"

egs/ami/s5b/local/chain/tuning/run_cnn_tdnn_lstm_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ if [ $stage -le 15 ]; then
184184
echo "$0: creating neural net configs using the xconfig parser";
185185

186186
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
187-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
187+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
188188

189189
lstm_opts="decay-time=20"
190190

egs/ami/s5b/local/chain/tuning/run_cnn_tdnn_lstm_1b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ if [ $stage -le 15 ]; then
176176
echo "$0: creating neural net configs using the xconfig parser";
177177

178178
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
179-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
179+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
180180

181181
lstm_opts="decay-time=20 dropout-proportion=0"
182182

egs/ami/s5b/local/chain/tuning/run_cnn_tdnn_lstm_1c.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ if [ $stage -le 15 ]; then
185185
echo "$0: creating neural net configs using the xconfig parser";
186186

187187
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
188-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
188+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
189189

190190
lstm_opts="decay-time=40"
191191

egs/ami/s5b/local/chain/tuning/run_tdnn_1b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ if [ $stage -le 15 ]; then
164164
echo "$0: creating neural net configs using the xconfig parser";
165165

166166
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
167-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
167+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
168168

169169
mkdir -p $dir/configs
170170
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_1c.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ if [ $stage -le 15 ]; then
151151
echo "$0: creating neural net configs using the xconfig parser";
152152

153153
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
154-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
154+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
155155

156156
mkdir -p $dir/configs
157157
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_1d.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ if [ $stage -le 15 ]; then
163163
echo "$0: creating neural net configs using the xconfig parser";
164164

165165
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
166-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
166+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
167167

168168
mkdir -p $dir/configs
169169
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_1e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ if [ $stage -le 15 ]; then
161161
echo "$0: creating neural net configs using the xconfig parser";
162162

163163
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
164-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
164+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
165165

166166
mkdir -p $dir/configs
167167
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_1f.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ if [ $stage -le 15 ]; then
165165
echo "$0: creating neural net configs using the xconfig parser";
166166

167167
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
168-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
168+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
169169

170170
mkdir -p $dir/configs
171171
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_1g.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ if [ $stage -le 15 ]; then
166166
echo "$0: creating neural net configs using the xconfig parser";
167167

168168
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
169-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
169+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
170170

171171
mkdir -p $dir/configs
172172
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_1h.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ if [ $stage -le 15 ]; then
167167
echo "$0: creating neural net configs using the xconfig parser";
168168

169169
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
170-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
170+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
171171

172172
mkdir -p $dir/configs
173173
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_1i.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ if [ $stage -le 15 ]; then
168168
echo "$0: creating neural net configs using the xconfig parser";
169169

170170
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
171-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
171+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
172172
opts="l2-regularize=0.02"
173173
output_opts="l2-regularize=0.004"
174174

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ if [ $stage -le 15 ]; then
171171
echo "$0: creating neural net configs using the xconfig parser";
172172

173173
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
174-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
174+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
175175

176176
mkdir -p $dir/configs
177177
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ if [ $stage -le 15 ]; then
173173
echo "$0: creating neural net configs using the xconfig parser";
174174

175175
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
176-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
176+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
177177

178178
mkdir -p $dir/configs
179179
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1c.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ if [ $stage -le 15 ]; then
172172
echo "$0: creating neural net configs using the xconfig parser";
173173

174174
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
175-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
175+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
176176

177177
mkdir -p $dir/configs
178178
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1d.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ if [ $stage -le 15 ]; then
172172
echo "$0: creating neural net configs using the xconfig parser";
173173

174174
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
175-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
175+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
176176

177177
mkdir -p $dir/configs
178178
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ if [ $stage -le 15 ]; then
174174
echo "$0: creating neural net configs using the xconfig parser";
175175

176176
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
177-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
177+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
178178

179179
mkdir -p $dir/configs
180180
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1f.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ if [ $stage -le 15 ]; then
173173
echo "$0: creating neural net configs using the xconfig parser";
174174

175175
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
176-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
176+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
177177

178178
mkdir -p $dir/configs
179179
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1g.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ if [ $stage -le 15 ]; then
174174
echo "$0: creating neural net configs using the xconfig parser";
175175

176176
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
177-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
177+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
178178

179179
mkdir -p $dir/configs
180180
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1h.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ if [ $stage -le 15 ]; then
171171
echo "$0: creating neural net configs using the xconfig parser";
172172

173173
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
174-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
174+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
175175

176176
mkdir -p $dir/configs
177177
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1i.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ if [ $stage -le 15 ]; then
174174
echo "$0: creating neural net configs using the xconfig parser";
175175

176176
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
177-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
177+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
178178

179179
mkdir -p $dir/configs
180180
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1j.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ if [ $stage -le 15 ]; then
181181
echo "$0: creating neural net configs using the xconfig parser";
182182

183183
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
184-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
184+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
185185

186186
lstm_opts="decay-time=20"
187187

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1k.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ if [ $stage -le 15 ]; then
177177
echo "$0: creating neural net configs using the xconfig parser";
178178

179179
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
180-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
180+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
181181

182182
lstm_opts="decay-time=20"
183183

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1l.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ if [ $stage -le 15 ]; then
224224
echo "$0: creating neural net configs using the xconfig parser";
225225

226226
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
227-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
227+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
228228

229229
mkdir -p $dir/configs
230230
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1m.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ if [ $stage -le 15 ]; then
226226
echo "$0: creating neural net configs using the xconfig parser";
227227

228228
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
229-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
229+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
230230

231231
lstm_opts="decay-time=20 dropout-proportion=0.0"
232232

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1n.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ if [ $stage -le 15 ]; then
178178
echo "$0: creating neural net configs using the xconfig parser";
179179

180180
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
181-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
181+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
182182

183183
mkdir -p $dir/configs
184184
cat <<EOF > $dir/configs/network.xconfig

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_1o.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ if [ $stage -le 15 ]; then
182182
echo "$0: creating neural net configs using the xconfig parser";
183183

184184
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
185-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
185+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
186186
tdnn_opts="l2-regularize=0.025"
187187
lstm_opts="l2-regularize=0.01"
188188
output_opts="l2-regularize=0.004"

egs/ami/s5b/local/chain/tuning/run_tdnn_lstm_bs_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ if [ $stage -le 15 ]; then
180180
echo "$0: creating neural net configs using the xconfig parser";
181181

182182
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
183-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
183+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
184184
tdnn_opts="l2-regularize=0.003"
185185
lstm_opts="l2-regularize=0.005"
186186
output_opts="l2-regularize=0.001"

egs/ami/s5b/local/chain/tuning/run_tdnn_opgru_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ if [ $stage -le 15 ]; then
178178
echo "$0: creating neural net configs using the xconfig parser";
179179

180180
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
181-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
181+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
182182
gru_opts="dropout-per-frame=true dropout-proportion=0.0"
183183

184184
mkdir -p $dir/configs

egs/ami/s5b/local/chain/tuning/run_tdnn_opgru_1b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ if [ $stage -le 15 ]; then
177177
echo "$0: creating neural net configs using the xconfig parser";
178178

179179
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
180-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
180+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
181181
gru_opts="dropout-per-frame=true dropout-proportion=0.0"
182182

183183
mkdir -p $dir/configs

egs/ami/s5b/local/chain/tuning/run_tdnn_opgru_1c.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ if [ $stage -le 15 ]; then
176176
echo "$0: creating neural net configs using the xconfig parser";
177177

178178
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
179-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
179+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
180180
gru_opts="dropout-per-frame=true dropout-proportion=0.0"
181181

182182
mkdir -p $dir/configs

egs/aspire/s5/local/chain/tuning/run_blstm_7b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ if [ $stage -le 11 ]; then
138138

139139
num_targets=$(tree-info $treedir/tree | grep num-pdfs | awk '{print $2}')
140140
[ -z $num_targets ] && { echo "$0: error getting num-targets"; exit 1; }
141-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
141+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
142142

143143
lstm_opts="decay-time=20"
144144

egs/aspire/s5/local/chain/tuning/run_tdnn_7b.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ if [ $stage -le 11 ]; then
136136
echo "$0: creating neural net configs using the xconfig parser";
137137

138138
num_targets=$(tree-info $treedir/tree |grep num-pdfs|awk '{print $2}')
139-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
139+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
140140

141141
mkdir -p $dir/configs
142142
cat <<EOF > $dir/configs/network.xconfig

egs/aspire/s5/local/chain/tuning/run_tdnn_lstm_1a.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ if [ $stage -le 12 ]; then
151151
echo "$0: creating neural net configs using the xconfig parser";
152152

153153
num_targets=$(tree-info $treedir/tree |grep num-pdfs|awk '{print $2}')
154-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
154+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
155155

156156
lstm_opts="decay-time=40"
157157

egs/babel/s5d/local/chain/tuning/run_tdnn.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ if [ $stage -le 17 ]; then
128128

129129
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
130130
[ -z $num_targets ] && { echo "$0: error getting num-targets"; exit 1; }
131-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
131+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
132132

133133
mkdir -p $dir/configs
134134
cat <<EOF > $dir/configs/network.xconfig

egs/babel/s5d/local/chain/tuning/run_tdnn_lstm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ if [ $stage -le 17 ]; then
129129

130130
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
131131
[ -z $num_targets ] && { echo "$0: error getting num-targets"; exit 1; }
132-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
132+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
133133
lstm_opts="decay-time=20"
134134
label_delay=5
135135

egs/babel/s5d/local/chain/tuning/run_tdnn_lstm_bab1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ if [ $stage -le 17 ]; then
127127

128128
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
129129
[ -z $num_targets ] && { echo "$0: error getting num-targets"; exit 1; }
130-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
130+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
131131
lstm_opts="decay-time=20"
132132
label_delay=5
133133

egs/babel/s5d/local/chain/tuning/run_tdnn_lstm_bab2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ if [ $stage -le 17 ]; then
127127

128128
num_targets=$(tree-info $tree_dir/tree |grep num-pdfs|awk '{print $2}')
129129
[ -z $num_targets ] && { echo "$0: error getting num-targets"; exit 1; }
130-
learning_rate_factor=$(echo "print 0.5/$xent_regularize" | python)
130+
learning_rate_factor=$(echo "print (0.5/$xent_regularize)" | python)
131131
lstm_opts="decay-time=20"
132132
label_delay=5
133133

0 commit comments

Comments
 (0)