https://github.com/Microsoft/CNTK
Revision 8705dd0f0243647248b0894a44841469b5a435c6 authored by Frank Seide on 02 September 2015, 17:12:15 UTC, committed by Frank Seide on 02 September 2015, 17:12:15 UTC
Conflicts:
	DataReader/HTKMLFReader/ssematrix.h
	Math/Math/CUDAPageLockedMemAllocator.cpp
	Math/Math/Matrix.cpp
	Math/Math/NoGPU.cpp
	Math/Math/ValueQuantizer.h
2 parent s 67464d2 + cf0d15a
History
Tip revision: 8705dd0f0243647248b0894a44841469b5a435c6 authored by Frank Seide on 02 September 2015, 17:12:15 UTC
Merge remote-tracking branch 'origin' into fseide/bs
Tip revision: 8705dd0
File Mode Size
BrainScript
Common
DataReader
Demos
Documentation
ExampleSetups
MachineLearning
Math
Scripts
Tests
license
.gitattributes -rw-r--r-- 21 bytes
.gitignore -rw-r--r-- 2.6 KB
CNTK.sln -rw-r--r-- 22.3 KB
CppCntk.vssettings -rw-r--r-- 10.0 KB
Makefile -rw-r--r-- 12.8 KB
Makefile_kaldi.cpu -rw-r--r-- 8.2 KB
Makefile_kaldi.gpu -rw-r--r-- 9.4 KB
Makefile_kaldi2.cpu -rw-r--r-- 8.2 KB
Makefile_kaldi2.gpu -rw-r--r-- 9.1 KB
README -rw-r--r-- 4.7 KB
ThirdPartyNotices.txt -rw-r--r-- 2.1 KB
configure -rw-r--r-- 9.8 KB
kaldi_vars.mk -rw-r--r-- 927 bytes

README

back to top