Skip to content

Commit 6666682

Browse files
KarelVesely84danpovey
KarelVesely84
authored and
danpovey
committed
[egs,scripts] Updates to BUT-specific cmd.sh settings (affects only Brno team); changes RE verbose level in nnet1 scripts.
1 parent 8cbb74c commit 6666682

File tree

16 files changed

+81
-132
lines changed

16 files changed

+81
-132
lines changed

‎egs/ami/s5/cmd.sh‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,19 @@
1212

1313
export train_cmd="queue.pl --mem 1G"
1414
export decode_cmd="queue.pl --mem 2G"
15-
# the use of cuda_cmd is deprecated but it is sometimes still used in nnet1
16-
# scripts.
15+
# the use of cuda_cmd is deprecated, used only in 'nnet1',
1716
export cuda_cmd="queue.pl --gpu 1 --mem 20G"
1817

19-
# the rest of this file is present for historical reasons.
20-
# In general it's best to rely on conf/queue.conf for cluster-specific
21-
# configuration.
18+
if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
19+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
20+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
21+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
22+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
23+
fi
2224

2325
# On Eddie use:
2426
#export train_cmd="queue.pl -P inf_hcrc_cstr_nst -l h_rt=08:00:00"
2527
#export decode_cmd="queue.pl -P inf_hcrc_cstr_nst -l h_rt=05:00:00 -pe memory-2G 4"
2628
#export highmem_cmd="queue.pl -P inf_hcrc_cstr_nst -l h_rt=05:00:00 -pe memory-2G 4"
2729
#export scoring_cmd="queue.pl -P inf_hcrc_cstr_nst -l h_rt=00:20:00"
2830

29-
if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
30-
# BUT cluster:
31-
queue="all.q@@blade,all.q@@speech"
32-
storage="matylda5"
33-
export train_cmd="queue.pl -q $queue -l ram_free=1.5G,mem_free=1.5G,${storage}=1"
34-
export decode_cmd="queue.pl -q $queue -l ram_free=2.5G,mem_free=2.5G,${storage}=0.5"
35-
export cuda_cmd="queue.pl -q long.q -l gpu=1"
36-
fi
37-

‎egs/ami/s5b/cmd.sh‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,17 @@
1212

1313
export train_cmd="queue.pl --mem 1G"
1414
export decode_cmd="queue.pl --mem 2G"
15-
# the use of cuda_cmd is deprecated but it is sometimes still used in nnet1
16-
# scripts.
15+
# the use of cuda_cmd is deprecated, used only in 'nnet1',
1716
export cuda_cmd="queue.pl --gpu 1 --mem 20G"
1817

19-
# the rest of this file is present for historical reasons.
20-
# In general it's best to rely on conf/queue.conf for cluster-specific
21-
# configuration.
18+
if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
19+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
20+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
21+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
22+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
23+
fi
2224

2325
# On Eddie use:
2426
#export train_cmd="queue.pl -P inf_hcrc_cstr_nst -l h_rt=08:00:00"
2527
#export decode_cmd="queue.pl -P inf_hcrc_cstr_nst -l h_rt=05:00:00 -pe memory-2G 4"
2628

27-
if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
28-
# BUT cluster:
29-
queue="all.q@@blade,all.q@@speech"
30-
gpu_queue="long.q@@gpu"
31-
storage="matylda5"
32-
export train_cmd="queue.pl -q $queue -l ram_free=1.5G,mem_free=1.5G,${storage}=1"
33-
export decode_cmd="queue.pl -q $queue -l ram_free=2.5G,mem_free=2.5G,${storage}=0.5"
34-
export cuda_cmd="queue.pl -q $gpu_queue -l gpu=1"
35-
fi
36-

‎egs/an4/s5/cmd.sh‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,12 @@
1212

1313
export train_cmd=queue.pl
1414
export decode_cmd=queue.pl
15-
export mkgraph_cmd=queue.pl
15+
# the use of cuda_cmd is deprecated, used only in 'nnet1',
1616
export cuda_cmd="queue.pl --gpu 1"
1717

18-
19-
# The rest of this file is here for historical reasons. For cluster-specific
20-
# configuration it's generally better to use conf/queue.conf, see
21-
# http://kaldi-asr.org/doc/queue.html.
22-
23-
# BUT cluster:
2418
if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
25-
queue="all.q@@blade,all.q@@speech"
26-
gpu_queue="long.q@@gpu"
27-
storage="matylda5"
28-
export train_cmd="queue.pl -q $queue -l ram_free=1500M,mem_free=1500M,${storage}=1"
29-
export decode_cmd="queue.pl -q $queue -l ram_free=2500M,mem_free=2500M,${storage}=0.5"
30-
export cuda_cmd="queue.pl -q $gpu_queue -l gpu=1"
19+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
20+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
21+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
22+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
3123
fi

‎egs/aurora4/s5/RESULTS‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
for x in exp/{mono,tri,sgmm,nnet}*/decode*; do [ -d $x ] && grep WER $x/wer_* | utils/best_wer.sh; done
1+
for x in exp/{mono,tri,sgmm,nnet,dnn}*/decode*; do [ -d $x ] && grep WER $x/wer_* | utils/best_wer.sh; done
22

33
%WER 19.61 [ 14698 / 74942, 1233 ins, 3759 del, 9706 sub ] exp/tri2b_multi/decode_tgpr_5k_eval92/wer_13
44
%WER 13.93 [ 10437 / 74942, 732 ins, 2695 del, 7010 sub ] exp/tri3a_dnn/decode_tgpr_5k_eval92/wer_10
55
%WER 13.61 [ 10202 / 74942, 660 ins, 2987 del, 6555 sub ] exp/tri4a_dnn/decode_tgpr_5k_eval92/wer_11
6+
7+
8+
for x in /mnt/matylda3/qmallidi/Karels_New-Parametric-ReLU/kaldi/egs/aurora4/s5_PReLU/exp/{mono,tri,sgmm,nnet,dnn}*/decode*; do [ -d $x ] && grep WER $x/wer_* | /mnt/matylda5/iveselyk/DEVEL/kaldi-official/egs/aurora4/s5/utils/best_wer.sh; done

‎egs/rm/s5/cmd.sh‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,12 @@
1212

1313
export train_cmd=queue.pl
1414
export decode_cmd=queue.pl
15-
export mkgraph_cmd=queue.pl
15+
# the use of cuda_cmd is deprecated, used only in 'nnet1',
1616
export cuda_cmd="queue.pl --gpu 1"
1717

18-
19-
# The rest of this file is here for historical reasons. For cluster-specific
20-
# configuration it's generally better to use conf/queue.conf, see
21-
# http://kaldi-asr.org/doc/queue.html.
22-
23-
# BUT cluster:
2418
if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
25-
queue="all.q@@blade,all.q@@speech"
26-
storage="matylda5"
27-
export train_cmd="queue.pl -q $queue -l ram_free=1500M,mem_free=1500M,${storage}=1"
28-
export decode_cmd="queue.pl -q $queue -l ram_free=2500M,mem_free=2500M,${storage}=0.5"
29-
export cuda_cmd="queue.pl -q long.q -l gpu=1"
19+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
20+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
21+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
22+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
3023
fi

‎egs/swbd/s5c/cmd.sh‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,13 @@
1212

1313
export train_cmd="queue.pl"
1414
export decode_cmd="queue.pl --mem 4G"
15-
export mkgraph_cmd="queue.pl --mem 8G"
15+
# the use of cuda_cmd is deprecated, used only in 'nnet1',
1616
export cuda_cmd="queue.pl --gpu 1"
1717

18-
19-
# the rest of this file is present for historical reasons. it's better to
20-
# create and edit conf/queue.conf for cluster-specific configuration.
2118
if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
22-
# BUT cluster:
23-
queue="all.q@@blade,all.q@@speech"
24-
storage="matylda5"
25-
export train_cmd="queue.pl -q $queue -l ram_free=1.5G,mem_free=1.5G,${storage}=0.25"
26-
export decode_cmd="queue.pl -q $queue -l ram_free=2.5G,mem_free=2.5G,${storage}=0.1"
27-
export cuda_cmd="queue.pl -q long.q -l gpu=1"
28-
fi
19+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
20+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
21+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
22+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
23+
fi
2924

‎egs/tedlium/s5/cmd.sh‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@
1313
# JHU cluster:
1414
export train_cmd="queue.pl"
1515
export decode_cmd="queue.pl --mem 4G"
16+
# the use of cuda_cmd is deprecated, used only in 'nnet1',
1617
export cuda_cmd="queue.pl --gpu 1"
1718

1819
host=$(hostname -f)
1920
if [ ${host#*.} == "fit.vutbr.cz" ]; then
20-
# BUT cluster:
21-
queue="all.q@@blade,all.q@@speech"
22-
gpu_queue="long.q@@gpu"
23-
storage="matylda5"
24-
export train_cmd="queue.pl -q $queue -l ram_free=1500M,mem_free=1500M,${storage}=1"
25-
export decode_cmd="queue.pl -q $queue -l ram_free=2500M,mem_free=2500M,${storage}=0.5"
26-
export cuda_cmd="queue.pl -q $gpu_queue -l gpu=1"
21+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
22+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
23+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
24+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
2725
elif [ ${host#*.} == "cm.cluster" ]; then
2826
# MARCC bluecrab cluster:
2927
export train_cmd="slurm.pl --time 4:00:00 "

‎egs/tedlium/s5_r2/cmd.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ export decode_cmd="queue.pl --mem 4G"
1616

1717
host=$(hostname -f)
1818
if [ ${host#*.} == "fit.vutbr.cz" ]; then
19-
# BUT cluster:
20-
queue="all.q@@blade,all.q@@speech"
21-
gpu_queue="long.q@@gpu"
22-
storage="matylda5"
23-
export train_cmd="queue.pl -q $queue -l ram_free=1500M,mem_free=1500M,${storage}=1"
24-
export decode_cmd="queue.pl -q $queue -l ram_free=2500M,mem_free=2500M,${storage}=0.5"
19+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
20+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
21+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
22+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
2523
elif [ ${host#*.} == "cm.cluster" ]; then
2624
# MARCC bluecrab cluster:
2725
export train_cmd="slurm.pl --time 4:00:00 "

‎egs/tedlium/s5_r2_wsj/cmd.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ export decode_cmd="queue.pl --mem 4G"
1616

1717
host=$(hostname -f)
1818
if [ ${host#*.} == "fit.vutbr.cz" ]; then
19-
# BUT cluster:
20-
queue="all.q@@blade,all.q@@speech"
21-
gpu_queue="long.q@@gpu"
22-
storage="matylda5"
23-
export train_cmd="queue.pl -q $queue -l ram_free=1500M,mem_free=1500M,${storage}=1"
24-
export decode_cmd="queue.pl -q $queue -l ram_free=2500M,mem_free=2500M,${storage}=0.5"
19+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
20+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
21+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
22+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
2523
elif [ ${host#*.} == "cm.cluster" ]; then
2624
# MARCC bluecrab cluster:
2725
export train_cmd="slurm.pl --time 4:00:00 "

‎egs/timit/s5/cmd.sh‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,13 @@
1212

1313
export train_cmd="queue.pl --mem 4G"
1414
export decode_cmd="queue.pl --mem 4G"
15-
export mkgraph_cmd="queue.pl --mem 8G"
16-
# the use of cuda_cmd is deprecated but it's still sometimes used in nnet1
17-
# example scripts.
15+
# the use of cuda_cmd is deprecated, used only in 'nnet1',
1816
export cuda_cmd="queue.pl --gpu 1"
1917

20-
# the rest of this file is present for historical reasons.
21-
# for cluster-specific configuration it's better to rely on conf/queue.conf.
2218
if [ "$(hostname -d)" == "fit.vutbr.cz" ]; then
23-
#b) BUT cluster options
24-
queue="all.q@@blade,all.q@@speech"
25-
gpu_queue="long.q@@gpu"
26-
storage="matylda5"
27-
export train_cmd="queue.pl -q $queue -l ram_free=1.5G,mem_free=1.5G,${storage}=0.5"
28-
export decode_cmd="queue.pl -q $queue -l ram_free=2.5G,mem_free=2.5G,${storage}=0.1"
29-
export cuda_cmd="queue.pl -q $gpu_queue -l gpu=1"
19+
queue_conf=$HOME/queue_conf/default.conf # see example /homes/kazi/iveselyk/queue_conf/default.conf,
20+
export train_cmd="queue.pl --config $queue_conf --mem 2G --matylda 0.2"
21+
export decode_cmd="queue.pl --config $queue_conf --mem 3G --matylda 0.1"
22+
export cuda_cmd="queue.pl --config $queue_conf --gpu 1 --mem 10G --tmp 40G"
3023
fi
3124

0 commit comments

Comments
 (0)