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

598 Коммитов

Автор SHA1 Сообщение Дата
Dong Yu a0645c9cdf Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-12 12:08:43 -07:00
Dong Yu bba8a92d69 remove IsForwardComputing from FindInRecurrentLoop function. 2015-08-12 12:05:37 -07:00
Dong Yu d06170f0f2 add SumColumnElements function to ComputationNetwork
Change Sum function to SumElements in ComputationNetwork
2015-08-12 11:31:45 -07:00
Vladimir Ivanov ca189d8e35 Added ability to run speech e2e tests on Windows (cygwin) 2015-08-11 18:17:37 -07:00
Scott Cyphers b805063c5b Merge remote-tracking branch 'origin/linux-gcc' into sls
Prepare for merge back to linux-gcc
2015-08-06 09:26:33 -04:00
Dong Yu 370c0ff0a1 Merge branch 'linux-gcc' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-05 15:35:26 -07:00
Dong Yu f7eaeafd45 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc
Conflicts:
	MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
2015-08-05 15:35:06 -07:00
Dong Yu f6242d5754 Merge branch 'master' of https://git01.codeplex.com/cntk 2015-08-05 15:29:19 -07:00
Dong Yu d62e5db3f1 added RowElementTimes and ColumnElementTimes nodes.
Revoke back ElementTimes node to do element-wise multiplication since the implementation there for column element-wise multiplication is incorrect.
2015-08-05 15:13:11 -07:00
Vladimir Ivanov 378420de9c Preventing creation of corrupted checkpoint and model files if CNTK terminates during write 2015-08-05 12:24:21 -07:00
chenguoguo d7c06ef221 Small fix to sequence training 2015-08-04 19:45:16 -04:00
Dong Yu 203b060b9b Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-04 13:36:45 -07:00
Dong Yu 24dce717b3 Merge branch 'linux-gcc' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-04 13:36:32 -07:00
Dong Yu 2a1c90dcd1 move GetNumSamplesWithLabel from node to network. 2015-08-04 13:36:14 -07:00
Frank Seide afe6a1df3e Merge branch 'master' of https://git.codeplex.com/cntk 2015-08-04 12:29:23 +08:00
Frank Seide 58851a89ee merged the two versions (Win32, Linux) of CrossProcessMutex back into a single header file that contains both versions;
removed nvml.lib from the Windows linker command line (it is already listed inside the source code, but there it is conditional on CPUONLY mode);
added a missing #include to Profiler.cpp to make it compile in CPUONLY mode;
fixed the post-build action to copy nvml.dll to not fail if no NVSMI is installed (assuming CPUONLY mode)
2015-08-04 12:29:14 +08:00
chenguoguo ba103d558a Merge remote-tracking branch 'origin/master' into linux-gcc 2015-08-03 21:50:29 -04:00
erw 472bae7f72 Move m_BoundaryInfo in PastValudeNode and FutureValueNode to CPUDEVICE
Before this commit, m_BoundaryInfo is constructed on default device, usually
0. This may result in a single processor creating contexts on multiple GPU
devices.
2015-08-03 15:48:41 -07:00
Scott Cyphers 0dbcf94438 Fix memory leak.
Remove a small leak to redice noise in leak checkers.
2015-08-03 14:39:21 -04:00
Scott Cyphers ad5b8a20f7 Fix g++ compilation warnings
sprintf_s is snprintf, not sprintf
Need to use more symbols from SGD
Add externs for missing file name generators that seem to be not reachable
   and not defined.
2015-08-03 14:36:33 -04:00
Dong Yu ee05ee3b26 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-08-03 10:53:53 -07:00
Scott Cyphers e633191da1 Clean up warnings from G++
Use %zd for printing size_t
    %ls for wide strings
Use SGDBase as name for base class instead of redefining templated base
2015-08-03 11:05:33 -04:00
Chris Basoglu 7451c33faa Fix printouts when doing Adaptive Minibatch sizing 2015-07-30 08:39:47 -07:00
Dong Yu 433cab1fe3 add support to count NoLabel samples in the simpleEvaluator. Does not change complicated evaluator in SimpleEvaluator.h though. 2015-07-29 17:58:11 -07:00
Dong Yu 61514b108a refine PastValueNode and FutureValueNode. Fixed a bug in FutureValueNode When it's not inside a loop. 2015-07-29 10:40:45 -07:00
Dong Yu 2489646708 change the pastValueNode and FutureValueNode to support NO_FEATURE and NO_LABEL cases better. 2015-07-28 23:55:21 -07:00
Dong Yu cf3de9aa80 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-07-28 22:26:13 -07:00
Amit Agarwal 779c6d8969 Fixed a build break on Windows 2015-07-27 16:53:40 -07:00
Chris Basoglu 930c7ef183 Fix bugs in adaptive minibatch size 2015-07-27 16:25:51 -07:00
Dong Yu 0f0cc2153c Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc
Conflicts:
	MachineLearning/CNTK/SGD.h
2015-07-27 15:41:18 -07:00
Dong Yu 7fb42b8390 Merge branch 'master' of https://git01.codeplex.com/cntk 2015-07-27 14:51:54 -07:00
Dong Yu 7a456a1c15 move useCVSetControlLRIfCVExists and useEvalCriterionControlLR to the autoLRAdjust block. 2015-07-27 14:50:24 -07:00
Dong Yu d320d17126 support computing number of no_label samples in each minibatch to make error statistics computation correct. 2015-07-27 14:28:27 -07:00
Chris Basoglu f7cad28c02 Fix whitespace isuses from previous merges 2015-07-27 09:30:27 -07:00
Dong Yu ed0697f8a4 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-07-24 17:24:04 -07:00
Dong Yu 51091cfc79 add UseCVSetControlLRIfCVExists and UseEvalCriterionControlLR to the SGD configuration to allow using training set and evaluation criterion to control learning rate selection when autoAdjustLR=adjustafterepoch 2015-07-24 17:23:16 -07:00
chenguoguo 4b9c8b25fc Merge branch 'linux-gcc' of https://git.codeplex.com/cntk into linux-gcc 2015-07-24 16:55:29 +00:00
chenguoguo f0107498aa Adding suppport for parallelized sequence training in Kaldi2Reader 2015-07-24 16:55:21 +00:00
Yu fb02f1509a Merge remote-tracking branch 'origin/master' into linux-gcc 2015-07-23 10:17:26 -04:00
erw 36cd25551d Fix a minor bug for buildinfo.h when CUDA_PATH is not defined 2015-07-22 16:53:54 -07:00
Dong Yu 98c76dad47 make sure all LoadFromFile functions in ComputationNodes are virtual and calls the base class's LoadFromFile. 2015-07-22 10:16:54 -07:00
Dong Yu fce1212959 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc
Conflicts:
	DataReader/LMSequenceReader/SequenceReader.cpp
2015-07-22 09:53:02 -07:00
Yinggong ZHAO ae76821812 Set shuffle always true, set m_evalMode under old version 2015-07-21 05:35:16 -07:00
Yinggong ZHAO 3e46e6e78d fix dataend issue, and support old-version model for test
modified:   DataReader/LMSequenceReader/SequenceReader.cpp
	modified:   MachineLearning/CNTK/TrainingCriterionNodes.h
2015-07-20 20:11:52 -07:00
Dong Yu 75acf2b21e fix some float-int conversion warnings. 2015-07-20 17:28:03 -07:00
Dong Yu c74cdb58f9 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-07-20 16:57:26 -07:00
Amit Agarwal 7e09cfae6c Restore the SetSentenceSegBatch call accidentally removed in the prefetch undo 2015-07-20 15:21:35 -07:00
Marko Radmilac f33224b60e Undo prefetch 2015-07-20 14:10:19 -07:00
Amit Agarwal 3cbf7fe668 Disable prefetching by default as there are issues in case of RNNs 2015-07-20 14:05:49 -07:00
Amit Agarwal a054e65894 Fix MPI_SUPPORT build 2015-07-20 10:43:47 -07:00