Commit a759eb55 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'update_kaldi_version' into 'master'

Update kaldi version

See merge request bob/bob.conda!416
parents cb58f359 4100d9cf
Pipeline #32320 passed with stage
in 69 minutes and 5 seconds
diff --git src/configure src/configure
index 277ab2e1c..a2f1c5bcd 100755
--- src/configure
+++ src/configure
@@ -1223,7 +1223,7 @@ elif [ "`uname`" == "Linux" ]; then
echo "Using Intel MKL as the linear algebra library."
(
cd probe; rm -f mkl-test;
- g++ mkl-test.cc -o mkl-test $MKL_COMPILE_LINE $MKL_LINK_LINE $THREADING_LINE $EXTRA_LIBS || exit 1
+ $CXX mkl-test.cc -o mkl-test $MKL_COMPILE_LINE $MKL_LINK_LINE $THREADING_LINE $EXTRA_LIBS || exit 1
test -f ./mkl-test || exit 1
./mkl-test || exit 1
cd ..
......@@ -2,8 +2,8 @@
pushd src
# ./configure --shared --mathlib=OPENBLAS --openblas-root=${PREFIX} --fst-root=${PREFIX} --fst-version=1.6.1 --speex-root=${PREFIX} --use-cuda=no
./configure --shared --mathlib=MKL --mkl-root=${PREFIX} --mkl-libdir=${PREFIX}/lib --fst-root=${PREFIX} --fst-version=1.6.1 --speex-root=${PREFIX} --use-cuda=no
# ./configure --shared --mathlib=OPENBLAS --openblas-root=${PREFIX} --fst-root=${PREFIX} --fst-version=${openfst} --speex-root=${PREFIX} --use-cuda=no
./configure --shared --mathlib=MKL --mkl-root=${PREFIX} --mkl-libdir=${PREFIX}/lib --fst-root=${PREFIX} --fst-version=${openfst} --speex-root=${PREFIX} --use-cuda=no
make -j ${CPU_COUNT}
# Move binaries
......
From f669d99fa7382edd76e7f42245309d68f66f1339 Mon Sep 17 00:00:00 2001
From: Milos Cernak <milos.cernak@idiap.ch>
Date: Wed, 15 Mar 2017 11:32:17 +0100
Subject: [PATCH] Patched makefiles for conda build
---
src/Makefile | 10 +--
src/configure | 2 +-
src/gmmbin/Makefile | 3 +-
src/gmmbin/global-gmm-adapt-map.cc | 95 ++++++++++++++++++++
src/gmmbin/gmm-compute-likes-gmmubm.cc | 156 +++++++++++++++++++++++++++++++++
src/makefiles/default_rules.mk | 2 +-
6 files changed, 260 insertions(+), 8 deletions(-)
create mode 100755 src/gmmbin/global-gmm-adapt-map.cc
create mode 100755 src/gmmbin/gmm-compute-likes-gmmubm.cc
diff --git a/src/Makefile b/src/Makefile
index 52b2326..2757699 100644
index 1b37ebce7..ce8958c71 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,14 +8,14 @@ SHELL := /bin/bash
SUBDIRS = base matrix util feat tree thread gmm transform \
SUBDIRS = base matrix util feat tree gmm transform \
fstext hmm lm decoder lat kws cudamatrix nnet \
bin fstbin gmmbin fgmmbin featbin \
- nnetbin latbin sgmm2 sgmm2bin nnet2 nnet3 chain nnet3bin nnet2bin kwsbin \
- ivector ivectorbin online2 online2bin lmbin chainbin
+ nnetbin latbin sgmm2 sgmm2bin nnet2 nnet3 chain nnet2bin kwsbin \
- nnetbin latbin sgmm2 sgmm2bin nnet2 nnet3 rnnlm chain nnet3bin nnet2bin kwsbin \
- ivector ivectorbin online2 online2bin lmbin chainbin rnnlmbin
+ nnetbin latbin sgmm2 sgmm2bin nnet2 nnet3 rnnlm chain nnet2bin kwsbin \
+ ivector ivectorbin online2 lmbin chainbin
MEMTESTDIRS = base matrix util feat tree thread gmm transform \
MEMTESTDIRS = base matrix util feat tree gmm transform \
fstext hmm lm decoder lat nnet kws chain \
bin fstbin gmmbin fgmmbin featbin \
- nnetbin latbin sgmm2 nnet2 nnet3 nnet2bin nnet3bin sgmm2bin kwsbin \
- nnetbin latbin sgmm2 nnet2 nnet3 rnnlm nnet2bin nnet3bin sgmm2bin kwsbin \
- ivector ivectorbin online2 online2bin lmbin
+ nnetbin latbin sgmm2 nnet2 nnet3 nnet2bin sgmm2bin kwsbin \
+ nnetbin latbin sgmm2 nnet2 nnet3 rnnlm nnet2bin sgmm2bin kwsbin \
+ ivector ivectorbin online2 lmbin
CUDAMEMTESTDIR = cudamatrix
@@ -150,7 +150,7 @@ $(EXT_SUBDIRS) : mklibdir ext_depend
### Dependency list ###
# this is necessary for correct parallel compilation
#1)The tools depend on all the libraries
-bin fstbin gmmbin fgmmbin sgmm2bin featbin nnetbin nnet2bin nnet3bin chainbin latbin ivectorbin lmbin kwsbin online2bin: \
-bin fstbin gmmbin fgmmbin sgmm2bin featbin nnetbin nnet2bin nnet3bin chainbin latbin ivectorbin lmbin kwsbin online2bin rnnlmbin: \
+bin fstbin gmmbin fgmmbin sgmm2bin featbin nnetbin nnet2bin chainbin latbin ivectorbin lmbin kwsbin: \
base matrix util feat tree thread gmm transform sgmm2 fstext hmm \
lm decoder lat cudamatrix nnet nnet2 nnet3 ivector chain kws online2
base matrix util feat tree gmm transform sgmm2 fstext hmm \
lm decoder lat cudamatrix nnet nnet2 nnet3 ivector chain kws online2 rnnlm
diff --git a/src/configure b/src/configure
index a4f3ce1..277ab2e 100755
index b94731da9..e7dc9dbb3 100755
--- a/src/configure
+++ b/src/configure
@@ -1031,7 +1031,7 @@ check_compiler $CXX
@@ -424,7 +424,7 @@ function configure_cuda {
;;
esac
if [ $GCC_VER_NUM -ge $MIN_UNSUPPORTED_GCC_VER_NUM ]; then
- failure "CUDA $CUDA_VERSION does not support $CXX (g++-$GCC_VER).
+ echo "CUDA $CUDA_VERSION does not support $CXX (g++-$GCC_VER).
You need g++ < $MIN_UNSUPPORTED_GCC_VER."
fi
fi
@@ -1022,7 +1022,7 @@ check_compiler $CXX
echo "# Base configuration" >> kaldi.mk
echo >> kaldi.mk
if $dynamic_kaldi ; then
......@@ -59,23 +52,32 @@ index a4f3ce1..277ab2e 100755
echo "KALDI_FLAVOR := dynamic" >> kaldi.mk
echo "KALDILIBDIR := $KALDILIBDIR" >> kaldi.mk
fi
@@ -1209,7 +1209,7 @@ elif [ "`uname`" == "Linux" ]; then
echo "Using Intel MKL as the linear algebra library."
(
cd probe; rm -f mkl-test;
- g++ mkl-test.cc -o mkl-test $MKL_COMPILE_LINE $MKL_LINK_LINE $THREADING_LINE $EXTRA_LIBS || exit 1
+ $CXX mkl-test.cc -o mkl-test $MKL_COMPILE_LINE $MKL_LINK_LINE $THREADING_LINE $EXTRA_LIBS || exit 1
test -f ./mkl-test || exit 1
./mkl-test || exit 1
cd ..
diff --git a/src/gmmbin/Makefile b/src/gmmbin/Makefile
index 7adb8bd..b2a9ea4 100644
index 82d10abe9..004c0eef3 100644
--- a/src/gmmbin/Makefile
+++ b/src/gmmbin/Makefile
@@ -28,7 +28,8 @@ BINFILES = gmm-init-mono gmm-est gmm-acc-stats-ali gmm-align \
@@ -26,7 +26,8 @@ BINFILES = gmm-init-mono gmm-est gmm-acc-stats-ali gmm-align \
gmm-est-fmllr-raw gmm-est-fmllr-raw-gpost gmm-global-init-from-feats \
gmm-global-info gmm-latgen-faster-regtree-fmllr gmm-est-fmllr-global \
gmm-acc-mllt-global gmm-transform-means-global gmm-global-get-post \
- gmm-global-gselect-to-post gmm-global-est-lvtln-trans
+ gmm-global-gselect-to-post gmm-global-est-lvtln-trans \
- gmm-global-gselect-to-post gmm-global-est-lvtln-trans gmm-init-biphone
+ gmm-global-gselect-to-post gmm-global-est-lvtln-trans gmm-init-biphone \
+ global-gmm-adapt-map gmm-compute-likes-gmmubm
OBJFILES =
diff --git a/src/gmmbin/global-gmm-adapt-map.cc b/src/gmmbin/global-gmm-adapt-map.cc
new file mode 100755
index 0000000..8344d82
new file mode 100644
index 000000000..c670b1d3e
--- /dev/null
+++ b/src/gmmbin/global-gmm-adapt-map.cc
@@ -0,0 +1,95 @@
......@@ -174,9 +176,10 @@ index 0000000..8344d82
+ return -1;
+ }
+}
\ No newline at end of file
diff --git a/src/gmmbin/gmm-compute-likes-gmmubm.cc b/src/gmmbin/gmm-compute-likes-gmmubm.cc
new file mode 100755
index 0000000..593f325
new file mode 100644
index 000000000..593f325d6
--- /dev/null
+++ b/src/gmmbin/gmm-compute-likes-gmmubm.cc
@@ -0,0 +1,156 @@
......@@ -337,18 +340,15 @@ index 0000000..593f325
+ }
+}
diff --git a/src/makefiles/default_rules.mk b/src/makefiles/default_rules.mk
index 34abd90..0f0d980 100644
index 7af6497ab..dac42bcd5 100644
--- a/src/makefiles/default_rules.mk
+++ b/src/makefiles/default_rules.mk
@@ -36,7 +36,7 @@ ifeq ($(shell uname), Darwin)
else ifeq ($(shell uname), Linux)
# Building shared library from static (static was compiled with -fPIC)
@@ -43,7 +43,7 @@ $(LIBFILE): $(LIBNAME).a
else ifeq ($(shell uname), Linux)
# Building shared library from static (static was compiled with -fPIC)
$(CXX) -shared -o $@ -Wl,--no-undefined -Wl,--as-needed -Wl,-soname=$@,--whole-archive $(LIBNAME).a -Wl,--no-whole-archive $(LDFLAGS) $(LDLIBS)
- rm -f $(KALDILIBDIR)/$@; ln -s $(shell pwd)/$@ $(KALDILIBDIR)/$@
+ rm -f $(KALDILIBDIR)/$@; cp -f $(shell pwd)/$@ $(KALDILIBDIR)/$@
else # Platform not supported
- ln -sf $(shell pwd)/$@ $(KALDILIBDIR)/$@
+ cp $(shell pwd)/$@ $(KALDILIBDIR)/$@
else # Platform not supported
$(error Dynamic libraries not supported on this platform. Run configure with --static flag.)
endif
--
2.1.4
endif
{% set name = "kaldi" %}
{% set version = "2017.03.13" %}
{% set git_rev = "1a4dbf6be118e4967cf4efd510811ef72cdfee3d" %}
{% set version = "1!5.5.164" %}
{% set git_rev = "ca32c4e2bd77544c4ad4aa0bba25f0b812ea1a61" %}
package:
name: {{ name }}
......@@ -11,15 +11,14 @@ source:
git_rev: {{ git_rev }}
patches:
- conda-kaldi.patch
- 0001-mkl-cxx.patch
build:
number: 3
number: 0
skip: True # [not linux]
requires_features:
blas: {{ blas_impl }}
run_exports:
- {{ pin_subpackage(name, max_pin='x.x.x') }}
- {{ pin_subpackage(name, max_pin='x.x') }}
requirements:
build:
......
......@@ -41,7 +41,6 @@ compute-cmvn-stats-two-channel --help
compute-eer --help
compute-fbank-feats --help
compute-kaldi-pitch-feats --help
compute-mce-scale --help
compute-mfcc-feats --help
compute-plp-feats --help
compute-spectrogram-feats --help
......@@ -56,32 +55,25 @@ copy-feats-to-htk --help
copy-feats-to-sphinx --help
copy-gselect --help
copy-int-vector --help
copy-int-vector-vector --help
copy-matrix --help
copy-post --help
copy-transition-model --help
copy-tree --help
copy-vector --help
create-split-from-vad --help
decode-faster --help
decode-faster-mapped --help
dot-weights --help
draw-tree --help
duplicate-matrix --help
est-lda --help
est-mllt --help
est-pca --help
extend-transform-dim --help
extract-ctx --help
extract-feature-segments --help
extract-rows --help
extract-segments --help
feat-to-dim --help
feat-to-len --help
feat-to-post --help
fgmm-global-acc-stats --help
fgmm-global-acc-stats-post --help
fgmm-global-acc-stats-twofeats --help
fgmm-global-copy --help
fgmm-global-est --help
fgmm-global-get-frame-likes --help
......@@ -89,13 +81,11 @@ fgmm-global-gselect-to-post --help
fgmm-global-info --help
fgmm-global-init-from-accs --help
fgmm-global-merge --help
fgmm-global-mixdown --help
fgmm-global-sum-accs --help
fgmm-global-to-gmm --help
fgmm-gselect --help
fmpe-acc-stats --help
fmpe-apply-transform --help
fmpe-copy --help
fmpe-est --help
fmpe-init --help
fmpe-sum-accs --help
......@@ -105,16 +95,13 @@ fstcomposecontext --help
fstcopy --help
fstdeterminizelog --help
fstdeterminizestar --help
fstfactor --help
fstisstochastic --help
fstmakecontextfst --help
fstmakecontextsyms --help
fstminimizeencoded --help
fstphicompose --help
fstpropfinal --help
fstpushspecial --help
fstrand --help
fstrhocompose --help
fstrmepslocal --help
fstrmsymbols --help
fsts-project --help
......@@ -124,9 +111,6 @@ fsttablecompose --help
generate-proxy-keywords --help
get-full-lda-mat --help
get-post-on-ali --help
get-silence-probs --help
global-gmm-adapt-map --help
gmm-acc-hlda --help
gmm-acc-mllt --help
gmm-acc-mllt-global --help
gmm-acc-stats --help
......@@ -141,15 +125,12 @@ gmm-basis-fmllr-accs-gpost --help
gmm-basis-fmllr-training --help
gmm-boost-silence --help
gmm-compute-likes --help
gmm-compute-likes-gmmubm --help
gmm-copy --help
gmm-decode-biglm-faster --help
gmm-decode-faster --help
gmm-decode-faster-regtree-fmllr --help
gmm-decode-faster-regtree-mllr --help
gmm-decode-nbest --help
gmm-decode-simple --help
gmm-diff-accs --help
gmm-est --help
gmm-est-basis-fmllr --help
gmm-est-basis-fmllr-gpost --help
......@@ -159,7 +140,6 @@ gmm-est-fmllr-gpost --help
gmm-est-fmllr-raw --help
gmm-est-fmllr-raw-gpost --help
gmm-est-gaussians-ebw --help
gmm-est-hlda --help
gmm-est-lvtln-trans --help
gmm-est-map --help
gmm-est-regtree-fmllr --help
......@@ -168,7 +148,6 @@ gmm-est-regtree-mllr --help
gmm-est-rescale --help
gmm-est-weights-ebw --help
gmm-fmpe-acc-stats --help
gmm-get-feat-deriv --help
gmm-get-stats-deriv --help
gmm-global-acc-stats --help
gmm-global-acc-stats-twofeats --help
......@@ -189,7 +168,6 @@ gmm-init-lvtln --help
gmm-init-model --help
gmm-init-model-flat --help
gmm-init-mono --help
gmm-init-trans --help
gmm-ismooth-stats --help
gmm-latgen-biglm-faster --help
gmm-latgen-faster --help
......@@ -201,7 +179,6 @@ gmm-make-regtree --help
gmm-mixup --help
gmm-post-to-gpost --help
gmm-rescore-lattice --help
gmm-scale-accs --help
gmm-sum-accs --help
gmm-train-lvtln-special --help
gmm-transform-means --help
......@@ -277,7 +254,6 @@ lattice-to-phone-lattice --help
lattice-to-post --help
lattice-to-smbr-post --help
lattice-union --help
lattice-word-align --help
linear-to-nbest --help
logistic-regression-copy --help
logistic-regression-eval --help
......@@ -287,7 +263,6 @@ make-h-transducer --help
make-ilabel-transducer --help
make-pdf-to-tid-transducer --help
matrix-dim --help
matrix-logprob --help
matrix-sum --help
matrix-sum-rows --help
merge-vads --help
......@@ -299,23 +274,16 @@ nbest-to-prons --help
nnet-adjust-priors --help
nnet-align-compiled --help
nnet-am-average --help
nnet-am-combine --help
nnet-am-compute --help
nnet-am-copy --help
nnet-am-fix --help
nnet-am-info --help
nnet-am-init --help
nnet-am-limit-rank --help
nnet-am-limit-rank-final --help
nnet-am-mixup --help
nnet-am-reinitialize --help
nnet-am-rescale --help
nnet-am-shrink --help
nnet-am-stats --help
nnet-am-switch-preconditioning --help
nnet-am-widen --help
nnet-combine --help
nnet-combine-a --help
nnet-combine-egs-discriminative --help
nnet-combine-fast --help
nnet-compare-hash-discriminative --help
......@@ -332,30 +300,18 @@ nnet-get-egs-discriminative --help
nnet-get-feature-transform --help
nnet-get-feature-transform-multi --help
nnet-get-weighted-egs --help
nnet-gradient --help
nnet-info --help
nnet-init --help
nnet-initialize --help
nnet-insert --help
nnet-kl-hmm-acc --help
nnet-kl-hmm-mat-to-component --help
nnet-latgen-faster --help
nnet-latgen-faster-parallel --help
nnet-limit-degradation --help
nnet-logprob --help
nnet-logprob-parallel --help
nnet-logprob2 --help
nnet-logprob2-parallel --help
nnet-modify-learning-rates --help
nnet-normalize-stddev --help
nnet-perturb-egs --help
nnet-perturb-egs-fmllr --help
nnet-relabel-egs --help
nnet-replace-last-layers --help
nnet-select-egs --help
nnet-set-learnrate --help
nnet-show-progress --help
nnet-shrink --help
nnet-shuffle-egs --help
nnet-shuffle-egs-discriminative --help
nnet-subset-egs --help
......@@ -373,10 +329,8 @@ nnet-train-perutt --help
nnet-train-simple --help
nnet-train-transitions --help
nnet1-to-raw-nnet --help
nnet2-boost-silence --help
paste-feats --help
paste-post --help
pdf-to-counts --help
phones-to-prons --help
post-to-feats --help
post-to-pdf-post --help
......@@ -388,15 +342,11 @@ prob-to-post --help
process-kaldi-pitch-feats --help
process-pitch-feats --help
prons-to-wordali --help
rand-prune-post --help
raw-nnet-concat --help
raw-nnet-copy --help
raw-nnet-info --help
rbm-convert-to-nnet --help
rbm-train-cd1-frmshuff --help
remove-mean --help
reverse-feats --help
reverse-weights --help
scale-post --help
select-feats --help
select-voiced-frames --help
......@@ -431,7 +381,6 @@ sum-matrices --help
sum-mllt-accs --help
sum-post --help
sum-tree-stats --help
thresh-post --help
train-transitions --help
transcripts-to-fsts --help
transf-to-nnet --help
......
Supports Markdown
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