Commit 02da14a9 authored by Dan Povey's avatar Dan Povey
Browse files

trunk: some minor bug-fixes.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@5000 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
parent 4a04f908
......@@ -287,7 +287,7 @@ struct MultiSinusoidDetectorConfig {
"must have relative to total energy of frame");
po->Register("min-freq", &min_freq, "Minimum frequency of sinusoid that "
"will be detected");
po->Register("max-freq", &min_freq, "Maximum frequency of sinusoid that "
po->Register("max-freq", &max_freq, "Maximum frequency of sinusoid that "
"will be detected");
po->Register("subsample-freq", &subsample_freq, "Frequency at which "
"we subsample the signal");
......
......@@ -758,7 +758,7 @@ bool ConvertAlignment(const TransitionModel &old_trans_model,
int32 hmm_state = old_trans_model.TransitionIdToHmmState(old_tid);
int32 trans_idx = old_trans_model.TransitionIdToTransitionIndex(old_tid);
if (static_cast<size_t>(pdf_class) >= state_seq.size())
KALDI_ERR << "ConvertAlignment: error converting alingment, possibly different topologies?";
KALDI_ERR << "ConvertAlignment: error converting alignment, possibly different topologies?";
int32 new_pdf = state_seq[pdf_class];
int32 new_trans_state =
new_trans_model.TripleToTransitionState(phone, hmm_state, new_pdf);
......
......@@ -162,15 +162,14 @@ openblas: openblas_compiled
fortran_opt = $(shell gcc -v 2>&1 | perl -e '$$x = join(" ", <STDIN>); if($$x =~ m/target=\S+64\S+/) { print "BINARY=64"; }')
# note: you can remove the USE_THREAD=0 option below if you want OpenBLAS to use multiple threads.
# then you could set, for example, OPENBLAS_NUM_THREADS=2 in your path.sh so that the runtime knows
# how many threads to use.
# the option FCOMMON_OPT=-frecursive is required if you are using gcc so that
# the Lapack components of OpenBlas do not crash in multi-threaded code
# (otherwise it will not be thread safe).
# note: you can change the USE_THREAD=0 option below to USE_THREAD=1
# if you want Open Blas to use multiple threads. then you could set,
# for example, OPENBLAS_NUM_THREADS=2 in your path.sh so that the
# runtime knows how many threads to use.
openblas_compiled:
-git clone git://github.com/xianyi/OpenBLAS
$(MAKE) PREFIX=`pwd`/OpenBLAS/install FC=gfortran $(fortran_opt) FCOMMON_OPT:=-frecursive DEBUG=1 USE_THREAD=0 -C OpenBLAS all install
cd OpenBLAS; sed 's:# FCOMMON_OPT = -frecursive:FCOMMON_OPT = -frecursive:' < Makefile.rule >tmp && mv tmp Makefile.rule
$(MAKE) PREFIX=`pwd`/OpenBLAS/install FC=gfortran $(fortran_opt) DEBUG=1 USE_THREAD=1 -C OpenBLAS all install
beamformit: beamformit-3.51
......
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