diff --git a/src/Makefile b/src/Makefile index 2d365b15d70..9905be869a0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -108,6 +108,9 @@ check_portaudio: clean: rmlibdir -for x in $(SUBDIRS) $(EXT_SUBDIRS); do $(MAKE) -C $$x clean; done +distclean: clean + -for x in $(SUBDIRS) $(EXT_SUBDIRS); do $(MAKE) -C $$x distclean; done + test: $(addsuffix /test, $(SUBDIRS)) ext_test: $(addsuffix /test, $(EXT_SUBDIRS)) @@ -124,6 +127,8 @@ cudavalgrind: valgrind: -for x in $(MEMTESTDIRS); do $(MAKE) -C $$x valgrind || { echo "valgrind on $$x failed"; exit 1; }; done +base/.depend.mk: + $(MAKE) depend depend: $(addsuffix /depend, $(SUBDIRS)) @@ -153,7 +158,7 @@ bin fstbin gmmbin fgmmbin sgmmbin sgmm2bin featbin nnetbin nnet2bin nnet3bin cha lm decoder lat cudamatrix nnet nnet2 nnet3 ivector chain kws online2 #2)The libraries have inter-dependencies -base: +base: base/.depend.mk matrix: base thread: base util: base matrix thread diff --git a/src/configure b/src/configure index bc414a8eb0d..1b94d744228 100755 --- a/src/configure +++ b/src/configure @@ -14,12 +14,14 @@ # ./configure --mkl-root=/opt/intel/mkl # ./configure --mkl-root=/opt/intel/mkl --threaded-math=yes # ./configure --mkl-root=/opt/intel/mkl --threaded-math=yes --mkl-threading=tbb -# This is for MKL 11.3 -- which does not seem to provide Intel OMP libs +# # This is for MKL 11.3, which does not seem to provide Intel OMP libs # ./configure --openblas-root=../tools/OpenBLAS/install # before doing # # this, cd to ../tools and type "make openblas". Note: # # this is not working correctly on all platforms, do "make test" # # and look out for segmentation faults. # ./configure --atlas-root=../tools/ATLAS/build +# ./configure --use-cuda=no # disable CUDA detection (will build cpu-only +# # version of kaldi even on CUDA-enabled machine #This should be incremented after every significant change of the configure script #I.e. after each change that affects the kaldi.mk or the build system as whole diff --git a/src/makefiles/default_rules.mk b/src/makefiles/default_rules.mk index 3d3f963a71f..a329ee86706 100644 --- a/src/makefiles/default_rules.mk +++ b/src/makefiles/default_rules.mk @@ -67,6 +67,9 @@ $(BINFILES): $(LIBFILE) $(XDEPENDS) clean: -rm -f *.o *.a *.so $(TESTFILES) $(BINFILES) $(TESTOUTPUTS) tmp* *.tmp *.testlog +distclean: clean + -rm -f .depend.mk + $(TESTFILES): $(LIBFILE) $(XDEPENDS) test_compile: $(TESTFILES)