https://github.com/Microsoft/CNTK
Revision 16bb5f91ab64ed361a39eaa1bea2971ad725c590 authored by Frank Seide on 03 September 2015, 18:56:43 UTC, committed by Frank Seide on 03 September 2015, 18:56:43 UTC
and changed consumers of this, such as ComputationNetwork and SGD, now, wherever possible, to operate on the independent item. This is aimed at allowing abstract interfaces into CNTK without the complexity of the <ElemType> type parameterization (which is unnecessary on the interface level);
few ComputationNode implementations were adapted to consistently use Inputs() instead of m_children, since m_children[] will now give the base class;
changes all sentence-boundary flag matrices from Matrix<ElemType> to Matrix<float> (hoping that one day we can use Matrix<enum type>). BUGBUG: the old LSTM node currently is now broken because it directly multiplies data with this matrix--not fixed since that node is not in use currently;
changed LSTM test case tolerance to 2% to be resilient to changes in initial randomization;
MatrixPool no longer depends on <ElemType>, but instead implements both a float and a double pool
1 parent 329f2d1
Raw File
Tip revision: 16bb5f91ab64ed361a39eaa1bea2971ad725c590 authored by Frank Seide on 03 September 2015, 18:56:43 UTC
split ComputationNode into a part depending on <ElemType> and part not depending on it (called ComputationNodeBase);
Tip revision: 16bb5f9
kaldi_vars.mk
########## Set your Kaldi location and the Kaldi includes / libs you want to use ##########

############### make sure your kaldi is compiled by --share mode so we can find the lib ##############################
KALDI_PATH = /usr/users/yzhang87/code/kaldi-trunk

KALDI_INCLUDES = -I $(KALDI_PATH)/src
KALDI_LIBS = -L$(KALDI_PATH)/src/lib -lkaldi-util -lkaldi-matrix -lkaldi-base -lkaldi-hmm -lkaldi-cudamatrix -lkaldi-nnet -lkaldi-lat

########## Copy includes and defines from $(KALDI_PATH)/src/kaldi.mk ##########

FSTROOT = $(KALDI_PATH)/tools/openfst
ATLASINC = $(KALDI_PATH)/tools/ATLAS/include

KALDI_INCLUDES += \
-I $(ATLASINC) \
-I $(FSTROOT)/include

KALDI_DEFINES = \
-DKALDI_DOUBLEPRECISION=0 \
-DHAVE_POSIX_MEMALIGN \
-DHAVE_EXECINFO_H=1 \
-DHAVE_CXXABI_H \
-DHAVE_ATLAS \
-DHAVE_OPENFST_GE_10400 \

########## KALDI_LIBS, KALDI_INCLUDES, and KALDI_DEFINES are the only variables used outside this file ##########
back to top