Skip to content

Commit f736399

Browse files
danpoveydanpovey
committed
sandbox/dan2: merge changes from trunk
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/dan2@3250 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2 parents 7830d4c + d65f58d commit f736399

55 files changed

Lines changed: 1337 additions & 125 deletions

Some content is hidden

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

‎egs/babel/s5/local/prepare_kaldi_lm_from_training_text.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export PATH=$PATH:/export/babel/sanjeev/kaldi-trunk/tools/kaldi_lm
4747
else
4848
echo Downloading and installing the kaldi_lm tools
4949
if [ ! -f kaldi_lm.tar.gz ]; then
50-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
50+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
5151
fi
5252
tar -xvzf kaldi_lm.tar.gz || exit 1;
5353
cd kaldi_lm

‎egs/babel/s5/local/wsj_train_lms.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export PATH=$KALDI_ROOT/tools/kaldi_lm:$PATH
2020
else
2121
echo Downloading and installing the kaldi_lm tools
2222
if [ ! -f kaldi_lm.tar.gz ]; then
23-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
23+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
2424
fi
2525
tar -xvzf kaldi_lm.tar.gz || exit 1;
2626
cd kaldi_lm

‎egs/fisher_english/s5/local/fisher_train_lms.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export PATH=$PATH:`pwd`/../../../tools/kaldi_lm
2929
else
3030
echo Downloading and installing the kaldi_lm tools
3131
if [ ! -f kaldi_lm.tar.gz ]; then
32-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
32+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
3333
fi
3434
tar -xvzf kaldi_lm.tar.gz || exit 1;
3535
cd kaldi_lm

‎egs/hkust/s5/local/hkust_train_lms.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export PATH=$PATH:`pwd`/../../../tools/kaldi_lm
2828
else
2929
echo Downloading and installing the kaldi_lm tools
3030
if [ ! -f kaldi_lm.tar.gz ]; then
31-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
31+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
3232
fi
3333
tar -xvzf kaldi_lm.tar.gz || exit 1;
3434
cd kaldi_lm

‎egs/swbd/s3/local/swbd_p1_train_lms.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export PATH=$PATH:`pwd`/../../../tools/kaldi_lm
2020
else
2121
echo Downloading and installing the kaldi_lm tools
2222
if [ ! -f kaldi_lm.tar.gz ]; then
23-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
23+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
2424
fi
2525
tar -xvzf kaldi_lm.tar.gz || exit 1;
2626
cd kaldi_lm

‎egs/swbd/s5/local/swbd_p1_train_lms.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export PATH=$PATH:`pwd`/../../../tools/kaldi_lm
2828
else
2929
echo Downloading and installing the kaldi_lm tools
3030
if [ ! -f kaldi_lm.tar.gz ]; then
31-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
31+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
3232
fi
3333
tar -xvzf kaldi_lm.tar.gz || exit 1;
3434
cd kaldi_lm

‎egs/timit/s3/local/timit_train_lms.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export PATH=$PATH:`pwd`/../../../tools/kaldi_lm
5353
else
5454
echo Downloading and installing the kaldi_lm tools
5555
if [ ! -f kaldi_lm.tar.gz ]; then
56-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
56+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
5757
fi
5858
tar -xvzf kaldi_lm.tar.gz || exit 1;
5959
cd kaldi_lm
@@ -87,7 +87,7 @@ cat $trans_file | awk -v wmap=$dir/word_map 'BEGIN{while((getline<wmap)>0)map[$1
8787
! merge_ngrams </dev/null >&/dev/null && \
8888
echo merge_ngrams not found in kaldi_lm. You need to have kaldi_lm on your path OR && \
8989
echo You can do the following: && \
90-
echo 1. Install the latest version from http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz && \
90+
echo 1. Install the latest version from http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz && \
9191
echo 2. you delete kaldi_lm, and kaldi_lm.tar.gz in the tools folder. This script will automatically install it. && \
9292
exit 1;
9393

‎egs/wsj/s2/local/wsj_train_lms.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export PATH=$PATH:`pwd`/../../../tools/kaldi_lm
2020
else
2121
echo Downloading and installing the kaldi_lm tools
2222
if [ ! -f kaldi_lm.tar.gz ]; then
23-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
23+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
2424
fi
2525
tar -xvzf kaldi_lm.tar.gz || exit 1;
2626
cd kaldi_lm

‎egs/wsj/s3/local/wsj_train_lms.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export PATH=$PATH:`pwd`/../../../tools/kaldi_lm
2020
else
2121
echo Downloading and installing the kaldi_lm tools
2222
if [ ! -f kaldi_lm.tar.gz ]; then
23-
wget http://merlin.fit.vutbr.cz/kaldi/kaldi_lm.tar.gz || exit 1;
23+
wget http://www.danielpovey.com/files/kaldi/kaldi_lm.tar.gz || exit 1;
2424
fi
2525
tar -xvzf kaldi_lm.tar.gz || exit 1;
2626
cd kaldi_lm

‎egs/wsj/s5/cmd.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
export train_cmd="queue.pl -l arch=*64"
1010
export decode_cmd="queue.pl -l arch=*64,mem_free=2G,ram_free=2G"
1111
export mkgraph_cmd="queue.pl -l arch=*64,ram_free=4G,mem_free=4G"
12+
export big_memory_cmd="queue.pl -l arch=*64,ram_free=8G,mem_free=8G"
13+
export cuda_cmd="queue.pl -l gpu=1"
1214

13-
#export cuda_cmd="..."
1415

1516

1617
#b) BUT cluster options

0 commit comments

Comments
 (0)