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

88 Коммитов

Автор SHA1 Сообщение Дата
Qiwei ye f8d0d4b182 Merge branch 'master' into qiwye/multiverso
Conflicts:
	Source/ActionsLib/ActionsLib.vcxproj
	Source/CNTK/CNTK.vcxproj
	Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
	Source/EvalDll/EvalDll.vcxproj
	Source/SGDLib/SGDLib.vcxproj
2016-01-28 22:41:07 +08:00
Amit 621637e5b3 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/releaseModeCallStacks 2016-01-25 22:07:12 -08:00
Amit aace504d8c Added -g and -rdynamic compiler/linker options for release mode builds on linux to enable call stack generation in release builds 2016-01-25 21:55:48 -08:00
Qiwei ye 6446a2fa79 Merge branch 'master' into qiwye/multiverso
Conflicts:
	.gitignore
	CNTK.sln
	Source/CNTK/CNTK.cpp
	Source/CNTK/CNTK.vcxproj
	Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
	Source/EvalDll/EvalDll.vcxproj
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
	Source/SGDLib/SGDLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj.filters
2016-01-25 16:56:12 +08:00
Frank Seide 6d31cda88a removed two more Multinetworks configs from SimpleNetworkBuilder 2016-01-22 09:42:57 -08:00
Alexey Orlov 89a2b0dac0 Fixed Linux Makefile error message 2016-01-22 16:27:50 +01:00
Amit Agarwal e32329a85c Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/separate1bitDataParallelSGD 2016-01-15 00:08:17 -08:00
Philipp Kranen 135b992df9 fixed Linux Makefile wrt deleted files 2016-01-14 09:06:40 +01:00
Amit Agarwal 18528f15b4 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/separate1bitDataParallelSGD 2016-01-13 22:43:27 -08:00
Amit 9cf113de6f Made 1bit support an optionally configurable build option for CNTK which is off by default 2016-01-13 14:29:19 -08:00
Marko Radmilac ba61abd79e Disable popups on Windows 2016-01-13 10:11:28 -08:00
Qiwei Ye 6c2ee1aa51 Merge branch 'master' into qiwye/multiverso
Conflicts:
	Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj.filters
2016-01-07 16:57:09 +08:00
Amit 21fceca779 Fixed linux build 2016-01-06 19:00:13 -08:00
Amit 96e03050a6 Fixed linux build error 2016-01-05 10:42:38 -08:00
Frank Seide da8f560043 made gcc happy 2015-12-28 20:03:50 -08:00
Qiwei Ye 9664daccb0 Merge branch 'master' into qiwye/multiverso 2015-12-19 12:43:46 +08:00
Mark Hillebrand 679c3c5298 Source/Readers/LMSequenceReader/: also build SequenceWriter on Linux 2015-12-18 11:59:40 +00:00
Qiwei Ye 254b45e680 Merge branch 'master' into qiwye/multiverso
Conflicts:
	Source/CNTK/CNTK.vcxproj
	Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
	Source/EvalDll/EvalDll.vcxproj
	Source/SGDLib/SGDLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj.filters
2015-12-17 10:35:08 +08:00
thhoens 3ab0ddace2 Fix for LibSVMBinaryReader to add prefetching, microbatches, and Linux support. 2015-12-16 12:13:38 -08:00
Mark Hillebrand a9c4922a5e Makefile: adapt to new location of generate_build_infop script 2015-12-16 14:24:49 +00:00
Mark Hillebrand caf67c74fc Adapt Linux build 2015-12-16 08:05:32 +00:00
Frank Seide aec884a4d3 started the TensorView class by adding header and CPP to math lib 2015-12-15 15:02:43 -08:00
Qiwei Ye 1d12689b58 Merge branch 'qiwye/dev' into qiwye/multiverso 2015-12-15 14:31:49 +08:00
yzhang87 b8eb51d4a3 Fix kaldi Reader. 1) Using the new MBLayout interface. 2) Modify the configParameter to configRecordType to consistent with HTKMLFReader. 3) Clean the warning message. Next: refactor to make it consistent with HTKMLFReader. 2015-12-14 11:00:20 -05:00
Alexey Kamenev 254b04c9b5 cudnn: added OpenCV libs to Linux build. 2015-12-12 10:00:01 -08:00
Alexey Kamenev 3023f11e6e cudnn: enabled build on Linux with cuDNN. 2015-12-12 09:59:09 -08:00
Qiwei Ye 07e48cd667 adding runtime libraries 2015-12-12 18:27:55 +09:00
Frank Seide 896b0476a0 renamed commandArgUtil.h to Config.h and ConfigFile.cpp to Config.cpp;
bug fix in previous refactoring of sub-minibatching
2015-12-04 22:31:47 -08:00
Frank Seide 0eb77f8e2f Step 2 of moving LSTMNode to EsotericNodes.h: deleted it from RecurrentNodes.h;
made gcc happy
2015-12-04 20:56:33 -08:00
Alexey Kamenev 93a0872069 Added NDEBUG to Linux Release build. 2015-12-03 11:20:50 -08:00
Qiwei Ye e3a8caca88 add NVMLPATH to the linking target cntk for the libnvidia-ml.so 2015-11-26 07:34:37 -05:00
Amit 77da34e8d5 Added call stack printing functionality for Linux 2015-11-25 17:20:56 -08:00
Yongqiang Wang 377c8223d4 Fix a bug in Scripts/genrate_build_info 2015-11-24 21:34:30 -08:00
Yongqiang Wang 33cf6a013f Enable PrintBuildInfo for both Windows and Linux 2015-11-24 16:38:37 -08:00
Frank Seide ab0dcf3434 simplified DeviceFromConfig() by removing PTasks-specific configuration options. Also added an overload for BrainScript;
added a dummy DataReader constructor from BrainScript (currently not implemented);
had to disable DelayLoadNofify() as that suddenly caused link errors (seems because DeviceFromConfig() is now called from a different place?);
further unified DoTrain() w.r.t. old CNTK config and BrainScript. Added a new BrainScriptBuilder (but the builders will go away next and get replaced by a lambda). DoTrain now accessible from BS (but not functional yet, too many pieces missing);
all builders now can be constructed from both old ConfigParameters and BrainScript IConfigRecord;
suddenly gcc got very picky, had to fix several places
2015-11-21 00:16:36 -08:00
Frank Seide ae778f6be4 added more scaffolding (empty CPP files) for moving actions to CNTKActionsLib. Updated Linux Makefile 2015-11-17 23:22:33 -08:00
Frank Seide 1a754b968c Eliminated NetworkBuilderFromConfig.cpp. Instead, the few surviving lines--the lines registering ComputationNode as a scriptable object--are now in ComputationNode.cpp;
fixed Linux Makefile after change of GPUMatrixCUDAKernels.cu to GPUMatrixCUDAKernels.cuh. It used to explicitly compile this in the GCC build, although it was included
2015-11-17 22:37:43 -08:00
Frank Seide 4036a52f63 BrainScript: ComputationNetwork can now construct itself from BS (the special MakeRuntimeObject() function is gone);
new source file ComputationNetworkScripting.cpp;
changed ComputationNetwork::SetDeviceId(). Now just takes the input and sets that as the device. Before it did somethinf funky with m_deviceId, which looks like a bug;
in LSTM test config, removed remnants of old NDL, now completely based on BS
2015-11-16 09:57:01 -08:00
Frank Seide 3b2068ead6 added CNTKActionsLib to Linux include path;
moved DisableLegacyTruncationSettings() away from being the very first piece of code in CNTK.cpp, hiding it close to where it is used. Also fixed its spelling and made it 'static'
2015-11-12 13:23:54 -08:00
Mark Hillebrand 88026d547c Fix two perf problems
1. On Linux, use ACML MP as default ACML library.
2. For the parallel end-to-end tests, limit concurrency based on
   available hardware threads.
2015-11-05 22:15:51 +01:00
Vladimir Ivanov f2db77795e Applying workaround for race condition in OpenMPI on non-0 exit code from CNTK 2015-10-30 16:16:09 -07:00
Frank Seide 525f9be994 moved memshare functions from header to ComputationNetworkEvaluation.cpp;
created new ComputationNetworkEditing.cpp
2015-10-30 10:35:12 -07:00
Frank Seide c3328c00fa moved sets of functions from ComputationNetwork.cpp to ComputationNetworkEvaluation.cpp and ComputationNetworkAnalysis.cpp 2015-10-30 10:05:12 -07:00
Yu 9d26bfdcd9 Fix build for NoGPU. 2015-10-28 20:59:52 -04:00
Amit 69ccd3f64c Remove debug info generation option for CUDA compilation in debug flavor builds and also enable fast-math optimizations . These changes have been done to eliminate differences in GPU results for the E2E tests between debug and release flavors. Setting environment variable CNTK_CUDA_DEVICE_DEBUGINFO=1 will enable debug info generation. The baselines for all E2E tests have also been updated in accordance with this change 2015-10-24 14:34:01 -07:00
Amit Agarwal 4777f5f7d3 Rename SequenceTraining project to CNTKSequenceTrainingLib to be consistent with other libs 2015-10-18 12:40:43 -07:00
Alexey Kamenev bb62af7d13 ImageReader fixes for Linux build. 2015-10-14 12:30:11 -07:00
Alexey 78d2e0ba68 Add CUB path. 2015-10-14 12:29:51 -07:00
Amit 9a4c84beb4 Fixed Linux build 2015-10-09 23:54:37 -07:00
Guoguo Chen d6ae0b0adc Merge remote-tracking branch 'remotes/origin/master' into guoguo/linuxBuildFix 2015-10-07 18:19:11 -04:00