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
This commit is contained in:
Dan Povey 2014-03-24 17:31:34 +00:00
Родитель c95880d5ac a39554b0bf
Коммит 22b9cb92a2
3 изменённых файлов: 70 добавлений и 65 удалений

2
.gitignore поставляемый
Просмотреть файл

@ -19,6 +19,8 @@ tools/irstlm/
tools/openfst
tools/openfst-1.3.2.tar.gz
tools/openfst-1.3.2/
tools/openfst-1.3.4.tar.gz
tools/openfst-1.3.4/
tools/pa_stable_v19_20111121.tgz
tools/portaudio/
tools/sctk-2.4.0-20091110-0958.tar.bz2

Просмотреть файл

@ -92,7 +92,7 @@ ext: test_dependencies ext_depend $(SUBDIRS) $(EXT_SUBDIRS)
# delete or comment out the lines below.
OPENFST_VER = $(shell grep 'PACKAGE_VERSION' ../tools/openfst/Makefile | sed -e 's:.*= ::')
test_dependencies:
@[ "$(OPENFST_VER)" == '1.2.10' ] || [ "$(OPENFST_VER)" == '1.3.2' ] || { echo "You now need openfst-1.2.10. Do: cd ../tools; svn update; ./install.sh; cd ../src; make depend; make"; exit 1; };
@[ "$(OPENFST_VER)" == '1.2.10' ] || [ "$(OPENFST_VER)" == '1.3.2' ] || [ "$(OPENFST_VER)" == '1.3.4' ] || { echo "You now need openfst-1.2.10. Do: cd ../tools; svn update; ./install.sh; cd ../src; make depend; make"; exit 1; };
check_portaudio:
@[ -d ../tools/portaudio ] || ( cd ../tools; ./install_portaudio.sh )

Просмотреть файл

@ -11,7 +11,7 @@ ifeq ($(findstring clang,$(COMPILER)),clang)
LDFLAGS += -stdlib=libstdc++
endif
all: check_required_programs sph2pipe atlas irstlm_tgt sclite_tgt openfst_tgt
all: check_required_programs sph2pipe atlas irstlm_tgt sclite openfst
check_required_programs:
@ -23,132 +23,135 @@ check_required_programs:
which gcc
which $(CXX)
which patch
which tar
clean: openfst_cleaned sclite_cleaned irstlm_cleaned
openfst_cleaned:
$(MAKE) -C openfst-1.3.2 clean
$(MAKE) -C openfst-1.3.4 clean
irstlm_cleaned:
$(MAKE) -C irstlm clean
$(MAKE) -C irstlm clean
sclite_cleaned:
$(MAKE) -C sctk-2.4.0 clean
$(MAKE) -C sctk-2.4.0 clean
distclean:
rm -rf openfst-1.3.2/
rm -rf sctk-2.4.0/
rm -rf ATLAS/
rm -rf irstlm/
rm -rf sph2pipe_v2.5/
rm -rf sph2pipe_v2.5.tar.gz
rm -rf atlas3.8.3.tar.gz
rm -rf sctk-2.4.0-20091110-0958.tar.bz2
rm -rf openfst-1.3.2.tar.gz
rm -f openfst
rm -rf openfst-1.3.4/
rm -rf sctk-2.4.0/
rm -rf ATLAS/
rm -rf irstlm/
rm -rf sph2pipe_v2.5/
rm -rf sph2pipe_v2.5.tar.gz
rm -rf atlas3.8.3.tar.gz
rm -rf sctk-2.4.0-20091110-0958.tar.bz2
rm -rf openfst-1.3.4.tar.gz
rm -f openfst
openfst_tgt: openfst_compiled openfst/lib
.PHONY: openfst # so target will be made even though "openfst" exists.
openfst: openfst_compiled openfst-1.3.4/lib
.PHONY: openfst_compiled
openfst_compiled: openfst-1.3.2/Makefile
cd openfst-1.3.2/ && \
openfst_compiled: openfst-1.3.4/Makefile
cd openfst-1.3.4/ && \
$(MAKE) install
openfst/lib:
-cd openfst && [ -d lib64 ] && [ ! -d lib ] && ln -s lib64 lib
openfst-1.3.4/lib: | openfst-1.3.4/Makefile
-cd openfst-1.3.4 && [ -d lib64 ] && [ ! -d lib ] && ln -s lib64 lib
openfst-1.3.2/Makefile: openfst-1.3.2/.patched
cd openfst-1.3.2/; \
./configure --prefix=`pwd` --enable-static --enable-shared --enable-far --enable-ngram-fsts CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="-ldl"
openfst-1.3.4/Makefile: openfst-1.3.4/.patched
cd openfst-1.3.4/; \
./configure --prefix=`pwd` --enable-static --enable-shared --enable-far --enable-ngram-fsts CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="-ldl"
# patches for openfst. openfst_gcc41up.patch is a patch for openfst to \
# support multi-threads when compile with g++ (gcc) version above 4.1
.PHONY: openfst-1.3.2/.patched
openfst-1.3.2/.patched: | openfst-1.3.2_tgt
-cd openfst-1.3.2/src/include/fst; \
patch -p0 -N < ../../../../openfst.patch;
$(CXX) -dumpversion | awk '{if(NR==1 && $$1>"4.1") print "cd openfst-1.3.2/src/include/fst; patch -p0 -N < ../../../../extras/openfst_gcc41up.patch"}' | sh -
touch $@
openfst-1.3.4/.patched: | openfst-1.3.4
-cd openfst-1.3.4/src/include/fst; \
patch -p0 -N < ../../../../openfst.patch;
$(CXX) -dumpversion | awk '{if(NR==1 && $$1>"4.1") print "cd openfst-1.3.4/src/include/fst; patch -p0 -N < ../../../../extras/openfst_gcc41up.patch"}' | sh -
touch $@
openfst-1.3.2_tgt: openfst-1.3.2.tar.gz
tar xozf openfst-1.3.2.tar.gz
-rm openfst
-ln -s openfst-1.3.2 openfst
openfst-1.3.4: openfst-1.3.4.tar.gz
tar xozf openfst-1.3.4.tar.gz
-rm openfst
-ln -s openfst-1.3.4 openfst
openfst-1.3.2.tar.gz:
wget http://openfst.cs.nyu.edu/twiki/pub/FST/FstDownload/openfst-1.3.2.tar.gz || \
wget -T 10 -t 3 --no-check-certificate http://www.danielpovey.com/files/data/openfst-1.3.2.tar.gz
openfst-1.3.4.tar.gz:
wget http://openfst.cs.nyu.edu/twiki/pub/FST/FstDownload/openfst-1.3.4.tar.gz || \
wget -T 10 -t 3 http://www.openslr.org/resources/2/openfst-1.3.4.tar.gz
sclite_tgt: sclite_compiled
sclite: sclite_compiled
.PHONY: sclite_compiled
sclite_compiled: sctk_patched
cd sctk-2.4.0; \
patch -p0 -N < ../sctk.patch; \
{ . ../extras/install_sctk_patched.sh; } && $(MAKE) config && $(MAKE) all && $(MAKE) install && $(MAKE) doc
cd sctk-2.4.0; \
patch -p0 -N < ../sctk.patch; \
{ . ../extras/install_sctk_patched.sh; } && $(MAKE) config && $(MAKE) all && $(MAKE) install && $(MAKE) doc
.PHONY: sctk_patched
sctk_patched: | sctk-2.4.0
cd sctk-2.4.0/; \
for x in src/asclite/core/recording.h src/asclite/core/recording.cpp; do \
sed 's/Filter::Filter/::Filter/' $$x > tmpf; mv tmpf $$x; \
done;
cd sctk-2.4.0/; \
for x in src/asclite/core/recording.h src/asclite/core/recording.cpp; do \
sed 's/Filter::Filter/::Filter/' $$x > tmpf; mv tmpf $$x; \
done;
sctk-2.4.0: sctk-2.4.0-20091110-0958.tar.bz2
tar xojf sctk-2.4.0-20091110-0958.tar.bz2
tar xojf sctk-2.4.0-20091110-0958.tar.bz2
sctk-2.4.0-20091110-0958.tar.bz2:
wget -T 10 -t 3 ftp://jaguar.ncsl.nist.gov/pub/sctk-2.4.0-20091110-0958.tar.bz2 || \
wget --no-check-certificate -T 10 https://sourceforge.net/projects/kaldi/files/sctk-2.4.0-20091110-0958.tar.bz2
wget -T 10 -t 3 ftp://jaguar.ncsl.nist.gov/pub/sctk-2.4.0-20091110-0958.tar.bz2 || \
wget --no-check-certificate -T 10 http://www.openslr.org/resources/4/sctk-2.4.0-20091110-0958.tar.bz2
irstlm_tgt: irstlm_compiled
.PHONY: irstlm_compiled
irstlm_compiled: irstlm/Makefile
cd irstlm/; \
make; $(MAKE) install
cd irstlm/; \
make; $(MAKE) install
irstlm/Makefile: irstlm/.patched
cd irstlm; \
cd irstlm; \
automake --version | grep 1.13.1 >/dev/null && \
sed s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS: <configure.in >configure.ac; \
(./regenerate-makefiles.sh || ./regenerate-makefiles.sh) && \
./configure --prefix `pwd`
(./regenerate-makefiles.sh || ./regenerate-makefiles.sh) && \
./configure --prefix `pwd`
irstlm/.patched: | irstlm
-cd irstlm;\
patch --verbose -N -p0 < ../interpolatedwrite-5.60.02.patch; \
patch --verbose -N -p0 < ../irstlm.patch; \
touch .patched
-cd irstlm;\
patch --verbose -N -p0 < ../interpolatedwrite-5.60.02.patch; \
patch --verbose -N -p0 < ../irstlm.patch; \
touch .patched
irstlm:
svn -r 398 co --non-interactive --trust-server-cert https://svn.code.sf.net/p/irstlm/code/trunk irstlm
svn -r 398 co --non-interactive --trust-server-cert https://svn.code.sf.net/p/irstlm/code/trunk irstlm
atlas: ATLAS/include/cblas.h
ATLAS/include/cblas.h: | atlas3.8.3.tar.gz
tar xozf atlas3.8.3.tar.gz ATLAS/include
tar xozf atlas3.8.3.tar.gz ATLAS/include
atlas3.8.3.tar.gz:
wget -T 10 http://sourceforge.net/projects/math-atlas/files/Stable/3.8.3/atlas3.8.3.tar.gz || \
wget --no-check-certificate -T 10 -t 3 http://www.danielpovey.com/files/kaldi/atlas3.8.3.tar.gz
wget -T 10 http://sourceforge.net/projects/math-atlas/files/Stable/3.8.3/atlas3.8.3.tar.gz || \
wget --no-check-certificate -T 10 -t 3 http://www.danielpovey.com/files/kaldi/atlas3.8.3.tar.gz
sph2pipe: sph2pipe_compiled
sph2pipe_compiled: sph2pipe_v2.5/sph2pipe
sph2pipe_v2.5/sph2pipe: | sph2pipe_v2.5
cd sph2pipe_v2.5/; \
$(CC) -o sph2pipe *.c -lm
cd sph2pipe_v2.5/; \
$(CC) -o sph2pipe *.c -lm
sph2pipe_v2.5: sph2pipe_v2.5.tar.gz
tar xzf sph2pipe_v2.5.tar.gz
tar xzf sph2pipe_v2.5.tar.gz
sph2pipe_v2.5.tar.gz:
wget --no-check-certificate -T 10 https://sourceforge.net/projects/kaldi/files/sph2pipe_v2.5.tar.gz || \
wget -T 10 -t 3 http://www.danielpovey.com/files/kaldi/sph2pipe_v2.5.tar.gz
wget --no-check-certificate -T 10 https://sourceforge.net/projects/kaldi/files/sph2pipe_v2.5.tar.gz || \
wget -T 10 -t 3 http://www.openslr.org/resources/3/sph2pipe_v2.5.tar.gz
openblas: openblas_compiled