Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

SHELL := /bin/bash

SUBDIRS = base matrix util feat tree gmm transform \
SUBDIRS = base matrix util feat cudafeat tree gmm transform \
fstext hmm lm decoder lat kws cudamatrix nnet \
bin fstbin gmmbin fgmmbin featbin \
bin fstbin gmmbin fgmmbin featbin cudafeatbin \
nnetbin latbin sgmm2 sgmm2bin nnet2 nnet3 rnnlm chain nnet3bin nnet2bin kwsbin \
ivector ivectorbin online2 online2bin lmbin chainbin rnnlmbin \
cudadecoder cudadecoderbin

MEMTESTDIRS = base matrix util feat tree gmm transform \
MEMTESTDIRS = base matrix util feat cudafeat tree gmm transform \
fstext hmm lm decoder lat nnet kws chain \
bin fstbin gmmbin fgmmbin featbin \
bin fstbin gmmbin fgmmbin featbin cudafeatbin \
nnetbin latbin sgmm2 nnet2 nnet3 rnnlm nnet2bin nnet3bin sgmm2bin kwsbin \
ivector ivectorbin online2 online2bin lmbin

Expand Down Expand Up @@ -143,8 +143,8 @@ $(EXT_SUBDIRS) : checkversion kaldi.mk 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 rnnlmbin cudadecoderbin: \
base matrix util feat tree gmm transform sgmm2 fstext hmm \
bin fstbin gmmbin fgmmbin sgmm2bin featbin cudafeatbin nnetbin nnet2bin nnet3bin chainbin latbin ivectorbin lmbin kwsbin online2bin rnnlmbin cudadecoderbin: \
base matrix util feat cudafeat tree gmm transform sgmm2 fstext hmm \
lm decoder lat cudamatrix nnet nnet2 nnet3 ivector chain kws online2 rnnlm

#2)The libraries have inter-dependencies
Expand All @@ -171,6 +171,7 @@ ivector: base util matrix transform tree gmm
#3)Dependencies for optional parts of Kaldi
onlinebin: base matrix util feat tree gmm transform sgmm2 fstext hmm lm decoder lat cudamatrix nnet nnet2 online
# python-kaldi-decoding: base matrix util feat tree gmm transform sgmm2 fstext hmm decoder lat online
cudafeat: base matrix util gmm transform tree feat cudamatrix
online: decoder gmm transform feat matrix util base lat hmm tree
online2: decoder gmm transform feat matrix util base lat hmm tree ivector cudamatrix nnet2 nnet3 chain
kws: base util hmm tree matrix lat
Expand Down
29 changes: 29 additions & 0 deletions src/cudafeat/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@


all:

include ../kaldi.mk

TESTFILES =

OBJFILES =

ifeq ($(CUDA), true)
OBJFILES += feature-window-cuda.o feature-mfcc-cuda.o
endif


LIBNAME = kaldi-cudafeat

ADDLIBS = ../feat/kaldi-feat.a ../util/kaldi-util.a ../matrix/kaldi-matrix.a \
../base/kaldi-base.a ../cudamatrix/kaldi-cudamatrix.a \
../gmm/kaldi-gmm.a

LDFLAGS += $(CUDA_LDFLAGS)
LDLIBS += $(CUDA_LDLIBS)


%.o : %.cu
$(CUDATKDIR)/bin/nvcc -c -g $< -o $@ $(CUDA_INCLUDE) $(CUDA_FLAGS) $(CUDA_ARCH) -I../ -I$(OPENFSTINC)

include ../makefiles/default_rules.mk
Loading