sandbox/dan2: changes to Makefiles so that CUDA libraries are not needed for...

sandbox/dan2: changes to Makefiles so that CUDA libraries are not needed for those programs that don't use CUDA.

git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/dan2@3065 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8

src/cudamatrix/Makefile

@@ -9,6 +9,7 @@ OPENFST_LDLIBS =
 include ../kaldi.mk
 
 LDFLAGS += $(CUDA_LDFLAGS)
+LDLIBS += $(CUDA_LDLIBS)
 
 TESTFILES = cu-vector-test cu-matrix-test cu-math-test cu-test cu-sp-matrix-test cu-packed-matrix-test cu-tp-matrix-test \
             cu-block-matrix-test cu-matrix-speed-test cu-vector-speed-test cu-sp-matrix-speed-test

src/feat/Makefile

@@ -13,7 +13,7 @@ OBJFILES = feature-functions.o feature-mfcc.o feature-plp.o feature-fbank.o \
 LIBNAME = kaldi-feat
 
 ADDLIBS = ../transform/kaldi-transform.a ../gmm/kaldi-gmm.a ../tree/kaldi-tree.a \
-					../util/kaldi-util.a ../matrix/kaldi-matrix.a ../base/kaldi-base.a
+	../util/kaldi-util.a ../matrix/kaldi-matrix.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
 

src/makefiles/linux_x86_64_cuda.mk

@@ -3,6 +3,6 @@ CUDA_INCLUDE= -I$(CUDATKDIR)/include
 CUDA_FLAGS = -g -Xcompiler -fPIC --verbose --machine 64 -DHAVE_CUDA
 
 CXXFLAGS += -DHAVE_CUDA -I$(CUDATKDIR)/include 
-LDFLAGS += -L$(CUDATKDIR)/lib64 -Wl,-rpath,$(CUDATKDIR)/lib64
-LDLIBS += -lcublas -lcudart #LDLIBS : The libs are loaded later than static libs in implicit rule
+CUDA_LDFLAGS += -L$(CUDATKDIR)/lib64 -Wl,-rpath,$(CUDATKDIR)/lib64
+CUDA_LDLIBS += -lcublas -lcudart #LDLIBS : The libs are loaded later than static libs in implicit rule
 

src/nnet/Makefile

@@ -5,6 +5,7 @@ all:
 include ../kaldi.mk
 
 LDFLAGS += $(CUDA_LDFLAGS)
+LDLIBS += $(CUDA_LDLIBS)
 
 TESTFILES = nnet-test
 

src/nnet2/Makefile

@@ -4,6 +4,10 @@ all:
 
 include ../kaldi.mk
 
+LDFLAGS += $(CUDA_LDFLAGS)
+LDLIBS += $(CUDA_LDLIBS)
+
+
 TESTFILES = nnet-component-test nnet-precondition-test nnet-precondition-online-test
 
 OBJFILES = nnet-component.o nnet-nnet.o nnet-update.o train-nnet.o \

src/nnet2bin/Makefile

@@ -4,6 +4,7 @@ EXTRA_CXXFLAGS = -Wno-sign-compare
 include ../kaldi.mk
 
 LDFLAGS += $(CUDA_LDFLAGS)
+LDLIBS += $(CUDA_LDLIBS)
 
 BINFILES = nnet-randomize-frames nnet-am-info nnet-train nnet-init \
    nnet-train-simple nnet-train-transitions nnet-latgen-faster nnet-am-copy \

src/nnetbin/Makefile

@@ -4,6 +4,7 @@ EXTRA_CXXFLAGS = -Wno-sign-compare
 include ../kaldi.mk
 
 LDFLAGS += $(CUDA_LDFLAGS)
+LDLIBS += $(CUDA_LDLIBS)
 
 BINFILES = nnet-train-xent-hardlab-perutt \
         nnet-train-xent-hardlab-frmshuff \