Commit a14728da authored by Dan Povey's avatar Dan Povey
Browse files

trunk: add multi-splice results to Fisher recipe; various minor fixes.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4609 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
parent 3a35faa3
......@@ -14,3 +14,13 @@ for x in exp/*/decode_dev; do grep WER $x/wer_* | utils/best_wer.sh; done
%WER 25.12 [ 9832 / 39141, 1423 ins, 2471 del, 5938 sub ] exp/nnet2_online/nnet_a_gpu_online/decode_dev_utt/wer_11
%WER 23.79 [ 9311 / 39141, 1499 ins, 2277 del, 5535 sub ] exp/nnet2_online/nnet_a_gpu_online/decode_dev/wer_11
# the following is with a multi-splice version of the nnet-online recipe
# This is the best current recipe.
%WER 22.21 [ 8695 / 39141, 1463 ins, 2121 del, 5111 sub ] exp/nnet2_online/nnet_ms_a_online/decode_dev/wer_11
%WER 22.94 [ 8980 / 39141, 1261 ins, 2417 del, 5302 sub ] exp/nnet2_online/nnet_ms_a_online/decode_dev_utt/wer_12
%WER 22.25 [ 8710 / 39141, 1420 ins, 2139 del, 5151 sub ] exp/nnet2_online/nnet_ms_a_online/decode_dev_utt_offline/wer_11
......@@ -176,4 +176,6 @@ steps/train_sat.sh --cmd "$train_cmd" \
# local/run_nnet2.sh
# local/online/run_nnet2.sh
# # local/online/run_nnet2.sh
#
#local/online/run_nnet2_multisplice.sh
......@@ -231,7 +231,7 @@ for lm_suffix in tg fsh_tgpr; do
) &
done
wait
steps/lmrescore.sh --mode 3 --cmd "$mkgraph_cmd" data/lang_sw1_fsh_tgpr data/lang_sw1_fsh_tg data/eval2000 \
steps/lmrescore.sh --mode 3 --cmd "$decode_cmd" data/lang_sw1_fsh_tgpr data/lang_sw1_fsh_tg data/eval2000 \
exp/tri4b/decode_eval2000_sw1_fsh_tgpr exp/tri4b/decode_eval2000_sw1_fsh_tg.3 || exit 1
......
......@@ -562,7 +562,7 @@ if $cleanup; then
echo Removing most of the models
for x in `seq 0 $num_iters`; do
if [ $[$x%100] -ne 0 ] && [ $x -ne $num_iters ]; then
if [ $[$x%100] -ne 0 ] && [ $x -ne $num_iters ] && [ -f $dir/$x.mdl ]; then
# delete all but every 100th model; don't delete the ones which combine to form the final model.
rm $dir/$x.mdl
fi
......
......@@ -8,6 +8,8 @@ OPENFST_LDLIBS =
include ../kaldi.mk
# you can uncomment matrix-lib-speed-test if you want to do the speed tests.
TESTFILES = matrix-lib-test kaldi-gpsr-test #matrix-lib-speed-test
OBJFILES = kaldi-matrix.o kaldi-vector.o packed-matrix.o sp-matrix.o tp-matrix.o \
......
......@@ -49,6 +49,10 @@ class CompressedMatrix {
template<typename Real>
CompressedMatrix(const MatrixBase<Real> &mat): data_(NULL) { CopyFromMat(mat); }
/// Initializer that can be used to select part of an existing
/// CompressedMatrix without un-compressing and re-compressing (note: unlike
/// similar initializers for class Matrix, it doesn't point to the same memory
/// location).
CompressedMatrix(const CompressedMatrix &mat,
const MatrixIndexT row_offset,
const MatrixIndexT num_rows,
......
......@@ -60,8 +60,8 @@ static void UnitTestSvdSpeed() {
sizes.push_back(150);
sizes.push_back(200);
sizes.push_back(300);
sizes.push_back(500);
sizes.push_back(750);
// sizes.push_back(500);
// sizes.push_back(750);
for (size_t i = 0; i < sizes.size(); i++) {
MatrixIndexT size = sizes[i];
{
......@@ -110,7 +110,6 @@ static void UnitTestAddMatMatSpeed() {
std::vector<MatrixIndexT> sizes;
sizes.push_back(512);
sizes.push_back(1024);
sizes.push_back(2048);
for (size_t i = 0; i < sizes.size(); i++) {
MatrixIndexT size = sizes[i];
{
......@@ -123,7 +122,7 @@ static void UnitTestAddMatMatSpeed() {
C.AddMatMat(1.0, A, kTrans, B, kNoTrans, 0.0);
C.AddMatMat(1.0, A, kTrans, B, kTrans, 0.0);
}
KALDI_LOG << "For size " << size << ", AddMatMat (8x) took " << t1.Elapsed()
KALDI_LOG << "For size " << size << ", AddMatMat (2x) took " << t1.Elapsed()
<< " seconds.";
}
}
......
......@@ -4011,8 +4011,8 @@ template<typename Real> static void UnitTestCompressedMatrix() {
//test of getting a submatrix
if(num_rows != 0 && num_cols != 0){
MatrixIndexT sub_row_offset = (num_rows == 1 ? 0 : Rand() % (num_rows-1)),
sub_col_offset = (num_cols == 1 ? 0 : Rand() % (num_cols-1));
MatrixIndexT sub_row_offset = Rand() % num_rows,
sub_col_offset = Rand() % num_cols;
// to make sure we don't mod by zero
MatrixIndexT num_subrows = Rand() % (num_rows-sub_row_offset),
num_subcols = Rand() % (num_cols-sub_col_offset);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment