Граф коммитов

2950 Коммитов

Автор SHA1 Сообщение Дата
Dogan Can f0c3872fa4 sandbox/sail: Changed sed invocation in portaudio installation script to make it BSD friendly.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3729 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-07 11:21:58 +00:00
Dogan Can bfa786efe1 sandbox/sail: Small change on tools/Makefile to sync with trunk.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3728 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-07 00:31:27 +00:00
Dan Povey 5010fb43e4 sandbox/sail: merging trunk
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3721 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 20:54:48 +00:00
Dan Povey 6396239ea7 merge Makefile changes from ^/sandbox/sail; fix to ApplyExp() in cudamatrix [thanks to Vijayaditya Peddinti]
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3720 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 20:50:57 +00:00
Ho Yin Chan 9d820e4b81 src/fstext: include kaldi-error.h for KALDI_WARN
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3719 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 17:27:50 +00:00
Dogan Can 18fe8a230d sandbox/sail: Hard coded the make call in irstlm target to not use parallel jobs.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3718 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 12:16:14 +00:00
Dogan Can 637ea131e2 sandbox/sail: Reverted the conditional variable assignments in tools/Makefile since make was implicitly picking up builtin variables.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3717 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 12:10:18 +00:00
Dan Povey 013da2b063 recreating sail sandbox as fresh copy of trunk.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3716 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 03:58:46 +00:00
Dan Povey 4b0adeb0d1 trunk: Merging changes from sail sandbox (mostly things to enable compilation to also work with C++11).
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3713 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 03:55:19 +00:00
Dan Povey b4a8ee200a ^/sandbox/sail: updated version of Makefile RE IRSTLM.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3712 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 03:42:00 +00:00
Dogan Can fc2ca6e133 Reverted the rename of configure.in.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3711 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 03:17:48 +00:00
Guoguo Chen 349956c5c5 Fixes to kws indexing to avoid blowup in the determinization stage.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3709 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 03:03:09 +00:00
Dogan Can 0edf34b9b6 sandbox/sail: Updated .gitignore.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3706 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:52:11 +00:00
Dogan Can 32179c2566 sandbox/sail: Replaces instance of std::make_pair with std::pair.
This is a problem with c++11. See the explanation at the following address.
http://stackoverflow.com/questions/9641960/c11-make-pair-with-specified-template-parameters-doesnt-compile

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3705 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:52:06 +00:00
Dogan Can adc6acba82 sandbox/sail: Fixes the missing constructor error.
Fixes how the po object is constructed @ util/parse-options.h:240:16.

util/parse-options.h:240:16: error: no matching constructor for
initialization of 'kaldi::ParseOptions'
  ParseOptions po;

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3704 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:52:01 +00:00
Dogan Can 5a6ea10c1b sandbox/sail: Fixes the use of __restrict__ type qualifier.
The way these type qualifiers were used causing problems with clang. This
commit fixes their usage.

See http://gcc.gnu.org/onlinedocs/gcc/Restricted-Pointers.html

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3703 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:51:56 +00:00
Dogan Can c8941228de sandbox/sail: Updated configure to support Mac OS 10.9.
This commit adds support for Mac OS 10.9 by adding a platform specific
makefile and updating configure. It also changes the way Mac OS version is
extracted from sw_vers output to make it more robust. Older script failed
to deduce the correct OS version when the version string included two fields
instead of three for instance when sw_vers returns 10.9 instead of 10.9.0.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3702 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:51:50 +00:00
Dogan Can abed3bef56 sandbox/sail: Updated portaudio installation script.
This patch changes the way src/common/pa_ringbuffer.o file is added to the
portaudio library. Original script added this file to the COMMON_OBJS list. However, on some platforms this file is automatically added to the OTHER_OBJS
list and as a result pa_ringbuffer.o object is added twice to the portaudio
library. Linking against portaudio library from a piece of code using the
pa_ringbuffer results in linker errors.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3701 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:51:45 +00:00
Dogan Can 948d675b6c sandbox/sail: Updated tools/Makefile to support clang on Mac OS 10.9.
On Mac OS 10.9, g++ is actually clang in disguise which by default uses the
new c++ standard library libc++. Since openfst uses stuff from the tr1
namespace, we need to tell clang to use libstdc++ instead. This patch adds a
check to the Makefile to see if we are using clang and adds the appropriate
flag if so.

With this patch, it is also possible to pass CXX, CXXFLAGS and LDFLAGS to make
while building the tools, e.g.

kaldi/tools ~ make CXX=g++-4.8 CXXFLAGS="-std=c++11" LDFLAGS="..."

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3700 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:51:37 +00:00
Dogan Can 6d356c8ed6 sandbox/sail: Added irstlm patch. Renamed configure.in to configure.ac.
There are a few places in irstlm code where variable length arrays of non-POD
types are causing errors with recent standards compliant c++ compilers.

mdiadapt.cpp:1115:16: error: variable length array of non-POD element type
'streampos' (aka 'fpos<mbstate_t>')
  streampos pos[lmsize()+1];
...

This use is not part of the c++ standard. Some compilers like gcc support this
through an extension while others like clang do not. This patch replaces all
VLAs of non-POD types with std::vector.

Also, configure.in is renamed to configure.ac to make recent automake
distributions happy.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3699 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:51:33 +00:00
Dogan Can ebd9e66c38 sandbox/sail: Added sctk patch.
This patch adds -ffreestanding flag to the compile flags for rfilter1 to
silence the following error thrown by recent c++ compilers.

rfilter1.c:29:5:
error: second parameter of 'main' (argument array) must be of type 'char **'
int main(int argc, char **argv)
    ^

There is a nasty typedef @ tools/sctk-2.4.0/src/rfilter1/include/stdcenvp.h:27
which maps char to unsigned char. This is supposed to be a hack for parsing
mandarin and japanese correctly. However, that typedef causes all chars in all
files including that header file to be mapped to unsigned char. While most
such mappings are benign, we have one problematic case which results in the
compiler error given above.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3698 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-06 01:51:24 +00:00
Pegah Ghahremani 0f722a1d83 trunk: semisupervised BNF+sgmm_mmi decoding script
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3694 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-05 20:43:25 +00:00
Pegah Ghahremani 77456f307b trunk: BNF+sgmm_mmi training script
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3693 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-05 20:42:14 +00:00
Pegah Ghahremani aec71942d8 trunk: semisupervised BNF training script
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3692 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-05 20:40:56 +00:00
Karel Vesely cc0b6d7619 trunk: updating DNN results on wsj, minor fix of recipe
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3691 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-05 13:54:15 +00:00
Dan Povey d87c4c2964 trunk: removing InformationBottleneckComponent (not used; and tests were sometimes failing)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3678 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-04 20:59:50 +00:00
Dan Povey 3645e79b72 trunk: minor: various minor code fixes and clarifications.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3677 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-04 06:28:52 +00:00
Guoguo Chen b9b7829319 Fixes to proxy keywords generation to avoid taking too much memory and also to speed up.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3676 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-04 05:15:06 +00:00
Dogan Can c9eb82013d sandbox/sail: Added files ignored by svn to .gitignore.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3673 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-04 01:46:54 +00:00
Jan Trmal 4dab69e7e8 (trunk/babel/s5b) Changing the segmentation database links
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3671 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-03 23:25:45 +00:00
Karel Vesely 8365677973 trunk: redirecting append_feats.sh to paste_feats.sh, which is more general.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3666 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-03 17:26:32 +00:00
Karel Vesely d8c69d97db trunk,nnet: various minor changes to nnet training scripts,
* steps/paste_feats.sh : this script wraps paste-feats, which allows to combine more than 2 features streams.


git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3665 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-03 17:03:59 +00:00
Karel Vesely a33a9b6bbe trunk: updating rm DNN results (Karel's DNN)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3664 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-03 14:51:57 +00:00
Pegah Ghahremani a54b200d1e trunk: removing nonlinearity on top of BNF layer
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3659 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-03 02:25:05 +00:00
Jan Trmal 7083a00b34 (trunk/babel/s5b) Removing one more old BNF script
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3656 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-03 00:38:09 +00:00
Jan Trmal fbc7c13d55 (trunk/babel/s5b) Adding a new semi-supervised training script and removing old BNF scripts
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3655 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-03 00:37:09 +00:00
Jan Trmal 5c63969966 (trunk/babel/s5b) Lots of fixes around the files. Removed the old script for semisupervised training, as we already have a new one
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3653 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-02 22:36:48 +00:00
Vimal Manohar 1bc6f3821d trunk/egs/babel/s5b: Modified conf file for semi-supervised training of DNN
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3652 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-02 16:26:59 +00:00
Vimal Manohar c1ace00d33 trunk/egs/babel/s5b: Minor modifications of commands in script run-6-semisupervised-seg.sh
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3651 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-02 15:47:16 +00:00
Jan Trmal 3ec5bf91ca (trunk/babel/s5b) Changing configs to contain link to the RADICAL UEM segmentation
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3648 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-02 03:28:18 +00:00
Dan Povey dae25f7041 trunk: BABEL script: removing some old, unused scripts.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3647 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-02 00:09:21 +00:00
Guoguo Chen 390127bbb3 Small fix to proxy keywords generation to avoid blowup.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3643 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-01 05:17:34 +00:00
Dan Povey 4842dc041a Creating sandbox for SAIL online-decoding stuff (BARISTA)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3642 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-01 04:40:53 +00:00
Jan Trmal 4b2173c845 (trunk/babel/s5b) Fixes in the Hatian eval descriptions
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3640 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-01 00:01:36 +00:00
Jan Trmal 6b75ec4806 (trunk/babel/s5b) Adding configs for eval and shadow datasets.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3637 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-02-28 22:07:07 +00:00
Chao Weng bf746bd057 fixing chime run.sh after nnet scripts moved
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3636 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-02-28 21:47:32 +00:00
Chao Weng 004b22be57 fixing aurora run.sh after nnet scripts moved
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3635 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-02-28 21:38:30 +00:00
Karel Vesely 0a2102e2b9 trunk,nnet: removing svn:mime_type property
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3631 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-02-28 17:58:59 +00:00
Guoguo Chen 2c50f1d052 Adding minimization to phone determinization, which will speed up the downstream operations on the determinized lattices.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3630 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-02-28 17:57:30 +00:00
Karel Vesely 50517c2f19 trunk,nnet: WARNING! MOVING KARELS NN SCRIPTS! THIS CAN BREAK YOUR CUSTOM RECIPES!
* moving scripts related to Karel's DNN recipe to from steps/* to steps/nnet/*,
* updating the DNN recipes (rm,wsj,swbd), new features:
** can be resumed by --stage,
** renaming experiments to exp/dnn*,
** using scripts at its new location,

We are syncing the script directory structure to be same as in Dan's recipe,
if you encounter any difficulties, please let me know.



git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3629 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-02-28 17:56:03 +00:00