diff --git a/egs/ami/s5/path.sh b/egs/ami/s5/path.sh index d401e773c..ad2c93b30 100644 --- a/egs/ami/s5/path.sh +++ b/egs/ami/s5/path.sh @@ -1,8 +1,8 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C LMBIN=$KALDI_ROOT/tools/irstlm/bin diff --git a/egs/aspire/s5/path.sh b/egs/aspire/s5/path.sh index e8c2b01b0..1a6fb5f89 100755 --- a/egs/aspire/s5/path.sh +++ b/egs/aspire/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/aurora4/s5/path.sh b/egs/aurora4/s5/path.sh index 3f50635df..2d17b17a8 100755 --- a/egs/aurora4/s5/path.sh +++ b/egs/aurora4/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/bn_music_speech/v1/path.sh b/egs/bn_music_speech/v1/path.sh index 66560e36b..e50f57c52 100755 --- a/egs/bn_music_speech/v1/path.sh +++ b/egs/bn_music_speech/v1/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/sph2pipe_v2.5:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/callhome_egyptian/s5/path.sh b/egs/callhome_egyptian/s5/path.sh index e8c2b01b0..1a6fb5f89 100755 --- a/egs/callhome_egyptian/s5/path.sh +++ b/egs/callhome_egyptian/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/chime1/s5/path.sh b/egs/chime1/s5/path.sh index e8c2b01b0..1a6fb5f89 100755 --- a/egs/chime1/s5/path.sh +++ b/egs/chime1/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/chime2/s5/path.sh b/egs/chime2/s5/path.sh index 3f50635df..2d17b17a8 100755 --- a/egs/chime2/s5/path.sh +++ b/egs/chime2/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/chime3/s5/path.sh b/egs/chime3/s5/path.sh index 335d400c0..fab227a8a 100755 --- a/egs/chime3/s5/path.sh +++ b/egs/chime3/s5/path.sh @@ -1,8 +1,8 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/irstlm/bin/:$KALDI_ROOT/tools/kaldi_lm/:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C BEAMFORMIT=$KALDI_ROOT/tools/BeamformIt-3.51 diff --git a/egs/csj/s5/path.sh b/egs/csj/s5/path.sh index db6a2eafe..8a4c29be4 100644 --- a/egs/csj/s5/path.sh +++ b/egs/csj/s5/path.sh @@ -1,8 +1,8 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export PATH=$PATH:/usr/local/cuda/bin export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib:/usr/local/lib64:/usr/local/cuda/bin/nvcc diff --git a/egs/farsdat/s5/path.sh b/egs/farsdat/s5/path.sh index 8ff4ca4ce..62794699b 100755 --- a/egs/farsdat/s5/path.sh +++ b/egs/farsdat/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/irstlm/bin/:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/fisher_callhome_spanish/s5/path.sh b/egs/fisher_callhome_spanish/s5/path.sh index e8c2b01b0..1a6fb5f89 100755 --- a/egs/fisher_callhome_spanish/s5/path.sh +++ b/egs/fisher_callhome_spanish/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/fisher_english/s5/path.sh b/egs/fisher_english/s5/path.sh index e8c2b01b0..1a6fb5f89 100755 --- a/egs/fisher_english/s5/path.sh +++ b/egs/fisher_english/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/fisher_swbd/s5/path.sh b/egs/fisher_swbd/s5/path.sh index e8d8f9c62..e14c6074f 100755 --- a/egs/fisher_swbd/s5/path.sh +++ b/egs/fisher_swbd/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../../ export PWD=`pwd` export PATH=$KALDI_ROOT/src/ivectorbin:$PWD/stanford-utils:$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$KALDI_ROOT/tools/kaldi_lm:$KALDI_ROOT/tools/srilm/bin:$KALDI_ROOT/tools/srilm/bin/i686-m64:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/gale_arabic/s5/path.sh b/egs/gale_arabic/s5/path.sh index e47d4940c..be11b34cb 100755 --- a/egs/gale_arabic/s5/path.sh +++ b/egs/gale_arabic/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=$(pwd)/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/gale_mandarin/s5/path.sh b/egs/gale_mandarin/s5/path.sh index e47d4940c..be11b34cb 100755 --- a/egs/gale_mandarin/s5/path.sh +++ b/egs/gale_mandarin/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=$(pwd)/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/hkust/s5/path.sh b/egs/hkust/s5/path.sh index 87c501ce5..5adfbeec7 100755 --- a/egs/hkust/s5/path.sh +++ b/egs/hkust/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. #export KALDI_ROOT=/home/dpovey/kaldi-trunk-test export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/librispeech/s5/path.sh b/egs/librispeech/s5/path.sh index eab6a3625..03df6dd9f 100755 --- a/egs/librispeech/s5/path.sh +++ b/egs/librispeech/s5/path.sh @@ -1,7 +1,7 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C # we use this both in the (optional) LM training and the G2P-related scripts diff --git a/egs/lre/v1/path.sh b/egs/lre/v1/path.sh index 66560e36b..e50f57c52 100755 --- a/egs/lre/v1/path.sh +++ b/egs/lre/v1/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/sph2pipe_v2.5:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/lre07/v1/path.sh b/egs/lre07/v1/path.sh index 66560e36b..e50f57c52 100755 --- a/egs/lre07/v1/path.sh +++ b/egs/lre07/v1/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/sph2pipe_v2.5:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/reverb/s5/path.sh b/egs/reverb/s5/path.sh index e8c2b01b0..1a6fb5f89 100644 --- a/egs/reverb/s5/path.sh +++ b/egs/reverb/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/rm/s5/path.sh b/egs/rm/s5/path.sh index e8c2b01b0..1a6fb5f89 100755 --- a/egs/rm/s5/path.sh +++ b/egs/rm/s5/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/sprakbanken/s5/path.sh b/egs/sprakbanken/s5/path.sh index 3f50635df..2d17b17a8 100755 --- a/egs/sprakbanken/s5/path.sh +++ b/egs/sprakbanken/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/sre08/v1/path.sh b/egs/sre08/v1/path.sh index 66560e36b..e50f57c52 100755 --- a/egs/sre08/v1/path.sh +++ b/egs/sre08/v1/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/sph2pipe_v2.5:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/sre10/v1/path.sh b/egs/sre10/v1/path.sh index 66560e36b..e50f57c52 100755 --- a/egs/sre10/v1/path.sh +++ b/egs/sre10/v1/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/sph2pipe_v2.5:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/sre10/v2/path.sh b/egs/sre10/v2/path.sh index 66560e36b..e50f57c52 100755 --- a/egs/sre10/v2/path.sh +++ b/egs/sre10/v2/path.sh @@ -1,5 +1,5 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/sph2pipe_v2.5:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/swahili/s5/path.sh b/egs/swahili/s5/path.sh index fedef4517..8b61dce67 100755 --- a/egs/swahili/s5/path.sh +++ b/egs/swahili/s5/path.sh @@ -3,8 +3,8 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH #export PATH=$PWD/utils/:$PWD/steps/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C DATA_DIR=$PWD/data diff --git a/egs/swbd/s5/path.sh b/egs/swbd/s5/path.sh index d127b54fc..50eedcbb1 100755 --- a/egs/swbd/s5/path.sh +++ b/egs/swbd/s5/path.sh @@ -2,7 +2,7 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh #export KALDI_ROOT=/home/dpovey/kaldi-trunk-test export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C export MKL_NUM_THREADS=16 diff --git a/egs/swbd/s5b/path.sh b/egs/swbd/s5b/path.sh index 3f50635df..2d17b17a8 100755 --- a/egs/swbd/s5b/path.sh +++ b/egs/swbd/s5b/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/swbd/s5c/path.sh b/egs/swbd/s5c/path.sh index 955962c60..1bea0e697 100755 --- a/egs/swbd/s5c/path.sh +++ b/egs/swbd/s5c/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/tedlium/s5/path.sh b/egs/tedlium/s5/path.sh index c3203f90b..16d5314b9 100755 --- a/egs/tedlium/s5/path.sh +++ b/egs/tedlium/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH:$KALDI_ROOT/tools/sph2pipe_v2.5 -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/thchs30/s5/path.sh b/egs/thchs30/s5/path.sh index 61999be08..fb1c04893 100755 --- a/egs/thchs30/s5/path.sh +++ b/egs/thchs30/s5/path.sh @@ -1,7 +1,7 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/tidigits/s5/path.sh b/egs/tidigits/s5/path.sh index 3f50635df..2d17b17a8 100755 --- a/egs/tidigits/s5/path.sh +++ b/egs/tidigits/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/timit/s5/path.sh b/egs/timit/s5/path.sh index 8ff4ca4ce..62794699b 100755 --- a/egs/timit/s5/path.sh +++ b/egs/timit/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/irstlm/bin/:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/voxforge/s5/path.sh b/egs/voxforge/s5/path.sh index 7234dfbf5..d5ee6268b 100755 --- a/egs/voxforge/s5/path.sh +++ b/egs/voxforge/s5/path.sh @@ -1,8 +1,8 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh # VoxForge data will be stored in: export DATA_ROOT="/home/dpovey/kaldi-clean/egs/voxforge/s5/voxforge" # e.g. something like /media/secondary/voxforge diff --git a/egs/vystadial_cz/s5/path.sh b/egs/vystadial_cz/s5/path.sh index 20db6f37d..4fa5bb910 100755 --- a/egs/vystadial_cz/s5/path.sh +++ b/egs/vystadial_cz/s5/path.sh @@ -2,8 +2,8 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils:$PWD/steps:$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/irstlm/bin/:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C # adding Kaldi binaries to path diff --git a/egs/vystadial_en/s5/path.sh b/egs/vystadial_en/s5/path.sh index 70953bfd8..d86430562 100755 --- a/egs/vystadial_en/s5/path.sh +++ b/egs/vystadial_en/s5/path.sh @@ -1,8 +1,8 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$KALDI_ROOT/tools/openfst/bin:$KALDI_ROOT/tools/irstlm/bin/:$PWD:$PWD/utils:$PWD/steps:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/wsj/s5/path.sh b/egs/wsj/s5/path.sh index 3f50635df..2d17b17a8 100755 --- a/egs/wsj/s5/path.sh +++ b/egs/wsj/s5/path.sh @@ -1,6 +1,6 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/egs/yesno/s5/path.sh b/egs/yesno/s5/path.sh index c01898056..21bfd1440 100644 --- a/egs/yesno/s5/path.sh +++ b/egs/yesno/s5/path.sh @@ -1,8 +1,8 @@ export KALDI_ROOT=`pwd`/../../.. [ -f $KALDI_ROOT/tools/env.sh ] && . $KALDI_ROOT/tools/env.sh export PATH=$PWD/utils/:$KALDI_ROOT/tools/openfst/bin:$PWD:$PATH -[ ! -f $KALDI_ROOT/src/path.sh ] && echo >&2 "The standard file $KALDI_ROOT/src/path.sh is not present -> Exit!" && exit 1 -. $KALDI_ROOT/src/path.sh +[ ! -f $KALDI_ROOT/tools/config/common_path.sh ] && echo >&2 "The standard file $KALDI_ROOT/tools/config/common_path.sh is not present -> Exit!" && exit 1 +. $KALDI_ROOT/tools/config/common_path.sh export LC_ALL=C diff --git a/src/path.sh b/src/path.sh deleted file mode 100644 index 0d16ba77f..000000000 --- a/src/path.sh +++ /dev/null @@ -1,25 +0,0 @@ -# we are using BASH_SOURCE[0], because its set correctly even when the file -# is sourced. -# The formatting of the path export command is intentionally weird, because -# this allows for easy diff'ing -this_script_path=$(readlink -f "${BASH_SOURCE[0]}") -my_kaldi_src=$(dirname $this_script_path) -export PATH=\ -$my_kaldi_src/bin:\ -$my_kaldi_src/chainbin:\ -$my_kaldi_src/featbin:\ -$my_kaldi_src/fgmmbin:\ -$my_kaldi_src/fstbin:\ -$my_kaldi_src/gmmbin:\ -$my_kaldi_src/ivectorbin:\ -$my_kaldi_src/kwsbin:\ -$my_kaldi_src/latbin:\ -$my_kaldi_src/lmbin:\ -$my_kaldi_src/nnet2bin:\ -$my_kaldi_src/nnet3bin:\ -$my_kaldi_src/nnetbin:\ -$my_kaldi_src/online2bin:\ -$my_kaldi_src/onlinebin:\ -$my_kaldi_src/sgmm2bin:\ -$my_kaldi_src/sgmmbin:\ -$PATH diff --git a/tools/config/common_path.sh b/tools/config/common_path.sh new file mode 100644 index 000000000..3e2ea50d6 --- /dev/null +++ b/tools/config/common_path.sh @@ -0,0 +1,23 @@ +# we assume KALDI_ROOT is already defined +[ -z "$KALDI_ROOT" ] && echo "The variable KALDI_ROOT must be already defined" && exit 1 +# The formatting of the path export command is intentionally weird, because +# this allows for easy diff'ing +export PATH=\ +${KALDI_ROOT}/src/bin:\ +${KALDI_ROOT}/src/chainbin:\ +${KALDI_ROOT}/src/featbin:\ +${KALDI_ROOT}/src/fgmmbin:\ +${KALDI_ROOT}/src/fstbin:\ +${KALDI_ROOT}/src/gmmbin:\ +${KALDI_ROOT}/src/ivectorbin:\ +${KALDI_ROOT}/src/kwsbin:\ +${KALDI_ROOT}/src/latbin:\ +${KALDI_ROOT}/src/lmbin:\ +${KALDI_ROOT}/src/nnet2bin:\ +${KALDI_ROOT}/src/nnet3bin:\ +${KALDI_ROOT}/src/nnetbin:\ +${KALDI_ROOT}/src/online2bin:\ +${KALDI_ROOT}/src/onlinebin:\ +${KALDI_ROOT}/src/sgmm2bin:\ +${KALDI_ROOT}/src/sgmmbin:\ +$PATH