From c1fac7ef61e4afcd9a5fa07f273edaf06f479cc3 Mon Sep 17 00:00:00 2001 From: David Snyder Date: Sat, 20 Feb 2016 14:03:30 -0500 Subject: [PATCH] xvector: fixing Makefiles --- src/Makefile | 9 +++++---- src/ivector/Makefile | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile b/src/Makefile index 57a4b98e0aa..c3fe511486f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,13 +9,13 @@ SUBDIRS = base matrix util feat tree thread gmm transform sgmm \ fstext hmm lm decoder lat kws cudamatrix nnet \ bin fstbin gmmbin fgmmbin sgmmbin featbin \ nnetbin latbin sgmm2 sgmm2bin nnet2 nnet3 chain nnet3bin nnet2bin kwsbin \ - ivector ivectorbin online2 online2bin lmbin chainbin + ivector ivectorbin xvector xvectorbin online2 online2bin lmbin chainbin MEMTESTDIRS = base matrix util feat tree thread gmm transform sgmm \ fstext hmm lm decoder lat nnet kws chain \ bin fstbin gmmbin fgmmbin sgmmbin featbin \ nnetbin latbin sgmm2 nnet2 nnet3 nnet2bin nnet3bin sgmm2bin kwsbin \ - ivector ivectorbin online2 online2bin lmbin + ivector ivectorbin xvector xvectorbin online2 online2bin lmbin CUDAMEMTESTDIR = cudamatrix @@ -145,9 +145,9 @@ $(EXT_SUBDIRS) : mklibdir # this is necessary for correct parallel compilation #1)The tools depend on all the libraries -bin fstbin gmmbin fgmmbin sgmmbin sgmm2bin featbin nnetbin nnet2bin nnet3bin chainbin latbin ivectorbin lmbin kwsbin online2bin: \ +bin fstbin gmmbin fgmmbin sgmmbin sgmm2bin featbin nnetbin nnet2bin nnet3bin chainbin latbin ivectorbin xvectorbin lmbin kwsbin online2bin: \ base matrix util feat tree optimization thread gmm transform sgmm sgmm2 fstext hmm \ - lm decoder lat cudamatrix nnet nnet2 nnet3 ivector + lm decoder lat cudamatrix nnet nnet2 nnet3 ivector xvector #2)The libraries have inter-dependencies base: @@ -172,6 +172,7 @@ nnet2: base util matrix thread lat gmm hmm tree transform cudamatrix nnet3: base util matrix thread lat gmm hmm tree transform cudamatrix chain chain: lat hmm tree fstext matrix cudamatrix util base ivector: base util matrix thread transform tree gmm +xvector: base util matrix cudamatrix nnet3 #3)Dependencies for optional parts of Kaldi onlinebin: base matrix util feat tree optimization gmm transform sgmm sgmm2 fstext hmm lm decoder lat cudamatrix nnet nnet2 online thread # python-kaldi-decoding: base matrix util feat tree optimization thread gmm transform sgmm sgmm2 fstext hmm decoder lat online diff --git a/src/ivector/Makefile b/src/ivector/Makefile index bbf4b01faf9..879cc6e69b2 100644 --- a/src/ivector/Makefile +++ b/src/ivector/Makefile @@ -15,8 +15,7 @@ OBJFILES = ivector-extractor.o voice-activity-detection.o plda.o logistic-regres LIBNAME = kaldi-ivector ADDLIBS = ../gmm/kaldi-gmm.a ../tree/kaldi-tree.a ../transform/kaldi-transform.a \ - ../thread/kaldi-thread.a ../nnet3/kaldi-nnet3.a ../cudamatrix/kaldi-cudamatrix.a \ - ../matrix/kaldi-matrix.a ../base/kaldi-base.a \ + ../thread/kaldi-thread.a ../matrix/kaldi-matrix.a ../base/kaldi-base.a \ ../util/kaldi-util.a include ../makefiles/default_rules.mk