Граф коммитов

9 Коммитов

Автор SHA1 Сообщение Дата
Yu Zhang e50cfed93c Merge remote-tracking branch 'origin/master' into linux-gcc
Conflicts:
	Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Adv_Chapter.lyx
	MachineLearning/CNTK/ComputationNetwork.h
	MachineLearning/CNTK/LinearAlgebraNodes.h
	MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
	Makefile_kaldi2.cpu
	Makefile_kaldi2.gpu
2015-07-05 22:28:21 -07:00
Yu 9c3fa25143 Fix the linux compile (NoGPU.cpp) 2015-07-05 23:51:40 -04:00
Dong Yu 96bf1a16e7 Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/dev
Conflicts:
	MachineLearning/CNTK/CNTK.vcxproj
2015-06-23 16:39:30 -07:00
Marko Radmilac 3e1ec366a9 Fix loading of Readers in CNTK to first try loading them next to executable 2015-06-23 10:39:30 -07:00
Yu 3994dab33e Fix some compile errors on linux and also change the matrix multiply to for loop for the delay node. 2015-06-15 02:08:04 -04:00
Frank Seide 178555d0a4 Visual Studio Solution cleanup:
moved minibatchsourcehelpers.h to Common/Include, as it is shared amongst readers (exception: the HTK reader, which has a different version);
fixed some incorrect #include of basetypes.h;
copying of DLLs now does not copy if the file already exists and is not out of date;
prebuild.bat now only updates builddate.h if it has changed, to avoid CNTK.cpp to be recompiled each time;
fixed a few build warnings in the CUDA kernels (uninitialized variables);
removed unused PTasks references in Linux makefiles
2015-05-18 20:32:39 -07:00
Frank Seide 392d64da08 various cleanups:
renamed cn.exe to CNTK.exe on Windows and "cntk" (no more .exe!) on Linux;
renamed 'cn' folder to 'CNTK';
moved CNTK.sln out from CNTKSolution folder, which now no longer needs to exist;
removed Win32 build target from Visual Studio Solution and all Projects;
added are documentation and Linux makefiles to the Visual Studio Solution for easy access;
removed unused PTasks files
2015-05-18 18:51:20 -07:00
Yu 1e48068cec Merge with recent changes. 2015-03-25 23:30:57 -04:00
Yu fde65fee3a Add the makefile to compile the Kaldi reader 2015-03-21 02:31:33 -04:00