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

53 Коммитов

Автор SHA1 Сообщение Дата
Dogan Can 810e979b0d trunk: Add OpenFst-1.4/C++11 support.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4697 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-12-14 00:25:55 +00:00
Minhua Wu 638926a44f trunk: newer version of installing sctk
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4549 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-10-20 20:09:10 +00:00
Dan Povey 540737f495 trunk: another patch to sctk so it will compile on more systems; minor documentation change.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4458 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-09-22 19:47:03 +00:00
Dan Povey e2ab8e33b3 trunk: changes RE sclite compilation: adding patch, adding download link to openslr.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4355 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-08-30 01:22:46 +00:00
Dan Povey 7cc9523942 trunk: merging changes from sandbox/bolt into tools/; change in sctk version (note: does not fix the problem reported on the list.)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4353 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-08-30 00:16:01 +00:00
Dan Povey 773daa8163 trunk: improvements to build process (better way of checking for packages that we depend on)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4331 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-08-21 21:30:09 +00:00
Dan Povey ac22574127 trunk: Makefile fix (for stuff added for AMI recipe)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4279 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-08-08 06:52:54 +00:00
Dan Povey b02ad40bf1 trunk: merging sandbox/pawel to add the AMI recipe.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4276 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-08-07 22:03:57 +00:00
Pawel Swietojanski 618ecf2300 sandbox/pawel: scoring, final beamforming and mdm data prep scripts
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/pawel@4085 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-06-27 07:34:10 +00:00
Pawel Swietojanski af0df729d5 sandbox/pawel: download scripts, beamforming scripts, BeamformIt installation under tools, improved text normalisation
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/pawel@4075 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-06-23 08:19:53 +00:00
Dan Povey 452be3b2f9 trunk: modifying tools/Makefile to use a recent version of IRSTLM and no longer use the patches we were applying. (the old setup was failing for recent gcc due to reallocf issue)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4027 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-05-29 20:14:21 +00:00
Dan Povey 0a07820ee5 trunk: change to tools/Makefile to hopefully get Openfst 1.3.4 compilation in cygwin to not die.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4014 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-05-24 18:28:30 +00:00
Dan Povey 22b9cb92a2 trunk/tools/: Makefile changes, partly merged from sandbox/sail (to update openfst to 1.3.4), partly new. Avoid unnecessary recompilation of OpenFST when we make.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3799 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-24 17:31:34 +00:00
Dogan Can a39554b0bf Update makefiles to install and link against openfst-1.3.4
git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/sail@3797 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-03-24 00:36:44 +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 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
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 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
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
Ondrej Platek f55e8d0f42 fix '-ldl' error specific to gcc-4.6.3, ubuntu 12.04 by changing fst rule in tools/Makefile
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3609 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-02-26 23:10:11 +00:00
Dan Povey 1becbbe04a trunk: Changing openfst failover in tools/Makefile to point to my website (since it was currently failing over to a different alias of the same site)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3496 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-02-11 02:15:03 +00:00
Ho Yin Chan e9b2f60c5f trunk:/tools for download of atlas
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3427 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2014-01-22 23:13:41 +00:00
Ho Yin Chan 1acd167b46 trunk:tools re-patch for multi-thread support of openfst with GCC 4.1 or up
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3288 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-12-10 04:10:02 +00:00
Ho Yin Chan 8fa8a28497 trunk:tools/Makefile description for last updated openfst patch
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3284 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-12-09 17:17:57 +00:00
Ho Yin Chan c92f850e2e trunk:tools support multi-thread for openfst
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3283 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-12-09 13:55:08 +00:00
Dan Povey ea9909ce5b trunk: Replace download server merlin, where used, with www.danielpovey.com (files on merlin disappeared).
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3246 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-12-03 16:02:28 +00:00
Vassil Panayotov 3ddfe724e4 trunk: download sph2pipe from SourceForge if the primary server fails
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3245 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-12-03 13:02:08 +00:00
Eric Riebling 0728f99072 trunk: add dependency on patch
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3145 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-11-08 17:28:09 +00:00
Ho Yin Chan 0e952376c8 trunk:tools/Makefile minor changes for symbolic link handling for openfst
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3130 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-11-02 20:04:50 +00:00
Ho Yin Chan ab84a95dc8 trunk:src openfst-1.3.2 patch for compatibility of c++11 flag compilation; disambiguate variables (begin and end) in interval-set.h which somehow confuse g++ with c++11 compilation flag
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3129 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-11-02 17:44:53 +00:00
Ho Yin Chan 0f7b0c36d2 trunk:tools/Makefile modify for irstlm repository moved permanently to new location
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@2825 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-08-20 09:27:03 +00:00
Ho Yin Chan 37f9a83678 add script for smooth sctk-2.4.0 installation under Cygwin
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@2694 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-07-18 11:18:32 +00:00
Ondrej Platek 817ce77d40 Merge branch 'master' into sandbox-oplatek
Conflicts:
	.gitignore
	INSTALL
	README.txt
	egs/babel/s5/local/generate_proxy_keywords.sh
	egs/wsj/s5/steps/train_nnet_cpu.sh
	egs/wsj/s5/utils/nnet-cpu/make_nnet_config_preconditioned.pl
	src/Makefile
	src/configure
	src/lat/Makefile
	src/makefiles/cygwin.mk
	src/makefiles/darwin_10_5.mk
	src/makefiles/darwin_10_6.mk
	src/makefiles/darwin_10_7.mk
	src/makefiles/darwin_10_8.mk
	src/makefiles/linux_atlas.mk
	src/makefiles/linux_atlas_64bit.mk
	src/makefiles/linux_clapack.mk
	src/makefiles/linux_openblas.mk
	src/nnet-cpu/mixup-nnet.cc
	src/nnet-cpu/nnet-component-test.cc
	src/nnet-cpu/nnet-component.cc
	src/nnet-cpu/nnet-component.h
	src/nnet-cpu/nnet-nnet.cc
	src/nnet-cpu/nnet-nnet.h
	src/nnet-cpu/nnet-update-parallel.cc
	src/nnet-cpu/nnet-update-parallel.h
	src/nnet-cpubin/nnet-train-parallel.cc
	src/nnet/nnet-pdf-prior.h
	src/nnetbin/nnet-forward.cc
	tools/Makefile
	tools/extras/install_portaudio.sh

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/oplatek@2520 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-06-18 10:56:26 +00:00
Dan Povey a15b32066f Small changes: improvement to Makefile in tools/, revert some buffer sizes in online/ to previous values.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@2442 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-05-14 17:23:53 +00:00
Dan Povey 4f78debea6 Improved Makefile in tools/ to check dependencies.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@2441 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-05-14 17:10:22 +00:00
Dan Povey 63259f5fc4 Modifying scripts in tools /directory
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@2427 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-05-08 16:53:14 +00:00
Dan Povey 2f9e49479f Fix to Makefile RE how sclite is patched, to work where default shell is dash
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1983 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-02-06 02:46:33 +00:00
Dan Povey 83d61513ae Committing new version of openfst.patch that is for the current version of OpenFST.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1941 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-01-25 16:05:15 +00:00
Dan Povey 8b09f0bc4f Updates to get src/matrix/ to work with OpenBLAS in the proper way.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1877 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-01-20 22:19:47 +00:00
Dan Povey ff919d6dcc Changes to get Kaldi to work with OpenBLAS; changes to OpenFST patch to get it to work with newer version of OpenFST.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1858 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-01-18 22:02:24 +00:00
Dan Povey 7014c34096 Improvement to Makefile for compiling OpenBLAS.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1847 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-01-18 02:36:24 +00:00
Dan Povey 4c274ea232 Adding changes to tools/Makefile and configure to try to support OpenBLAS.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1830 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-01-16 01:09:56 +00:00
Jan Trmal 111d2f69e3 Added mirror download locations (as in install.sh)
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1804 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2013-01-09 22:23:50 +00:00
Dan Povey 98622f753a Fix to makefile in tools directory
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1692 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2012-12-18 20:28:12 +00:00
Dan Povey 4b39383540 Changing installation from 1.2.10 to 1.3.2 version of OpenFst.
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1681 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2012-12-15 17:07:11 +00:00
Jan Trmal 4365259f1d Ignore the patching errors during make
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@1405 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
2012-09-29 19:15:55 +00:00