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

8715 Коммитов

Автор SHA1 Сообщение Дата
feiga ebefc5ade5 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev 2016-10-10 13:04:06 +08:00
feiga 5e37b37093 Add Multiverso vs project file to CNTK solution 2016-10-10 13:03:57 +08:00
feiga 614a51e7fb Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev 2016-10-10 12:18:26 +09:00
feiga 2ed62be847 Update Makefile 2016-10-10 12:18:17 +09:00
Qiwei Ye 5ab89ca283 Removing hard tabs 2016-10-10 10:39:32 +08:00
Qiwei Ye 2ab22c55d7 Merge branch 'master' into qiwye/asgd-dev 2016-10-09 16:02:34 +08:00
Qiwei Ye e745745430 ASGD: using ArrayTable instead of MatrixTable for less comunications 2016-10-09 16:01:09 +08:00
Qiwei Ye acde6e1ab2 updating submodule for linux build 2016-10-09 13:16:40 +08:00
Project Philly 5c18f2f8e9 Integrate wilrich/alpha3 into master 2016-10-08 11:58:33 -07:00
Willi Richert f0428d3bf1 Bump version to 2.0.a3 2016-10-08 11:22:05 -07:00
Project Philly abbb2594a7 Integrate vadimma/EvalRNNUnitTest into master 2016-10-08 10:36:53 -07:00
Willi Richert 7e78bd9ec9 Merge remote-tracking branch 'origin/master' into wilrich/alpha3 2016-10-08 12:27:10 +02:00
Willi Richert e3450f4e55 Require arguments to be list or dict; fix bug in string-based input evaluation 2016-10-08 12:26:56 +02:00
feiga a3c8e9bca6 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev
# Conflicts:
#	Source/Common/Include/NoMultiversoWrapper.h
2016-10-08 16:52:55 +08:00
feiga e87e5cd17b Update interface of NoMultiversoWrapper 2016-10-08 16:50:25 +08:00
Project Philly 0d4997084c Integrate wilrich/alpha3 into master 2016-10-08 01:22:51 -07:00
Qiwei Ye 1b9a33ef26 fix 1bit build error 2016-10-08 15:14:44 +08:00
Willi Richert 4abbcc2375 Add missing persist test 2016-10-08 09:13:02 +02:00
Willi Richert b71ea1e3ce Remove explicit device setting; leave it as a comment for the user 2016-10-08 09:09:01 +02:00
Willi Richert 4571bfe682 Fix indentation 2016-10-08 09:02:41 +02:00
Willi Richert f79899ca00 Merge branch 'wilrich/alpha3' of https://github.com/Microsoft/CNTK into wilrich/alpha3 2016-10-08 05:05:38 +02:00
Willi Richert 5b31db65e5 Merge remote-tracking branch 'origin/master' into wilrich/alpha3
Conflicts:
	bindings/python/cntk/io/__init__.py
	bindings/python/examples/MNIST/SimpleMNIST.py
	bindings/python/examples/Sequence2Sequence/Sequence2Sequence.py
2016-10-08 05:05:19 +02:00
Amit Agarwal 83720de7fa Merge branch 'master' of https://github.com/Microsoft/CNTK into wilrich/alpha3 2016-10-07 17:49:09 -07:00
Willi Richert 2d19fba946 Comments 2016-10-07 23:01:45 +02:00
Zhou Wang 210885ba34 fix a bug 2016-10-07 22:37:39 +02:00
Zhou Wang c75ebacc3d enable run GPU build on CPU only device.
run GPU on CPU device also in BVT

fix bug; not run debug gpu on cpu device.
2016-10-07 22:23:00 +02:00
Project Philly a6684569c8 Integrate amitaga/shapeInference into master 2016-10-07 13:16:44 -07:00
Vadim Mazalov 1c0813a9d0 Add RNN unittest to ExtendedEval 2016-10-07 11:15:44 -07:00
Zhou Wang c3bc0592f3 disable running GPU build on CPU device for now as it takes too long time 2016-10-07 17:45:38 +02:00
Amit Agarwal a18dfee6c0 t push origin Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/shapeInference 2016-10-07 08:45:10 -07:00
Amit Agarwal b594ebc6cf CNTK v2 library: Disable python module tests on Windows for GPU device 2016-10-07 08:45:03 -07:00
Willi Richert 1596d689b2 Add missing typemaps 2016-10-07 17:18:35 +02:00
Willi Richert a59b0b0df4 Let Function behave like Variable in case it has only one output 2016-10-07 15:11:22 +02:00
Willi Richert abfe6862ca Hide MinibatchData's m_data 2016-10-07 14:21:55 +02:00
Mark Hillebrand 216bd48fc7 bindings/python/doc/concepts.rst: remove BOM 2016-10-07 13:59:37 +02:00
Mark Hillebrand bd104b687b Tests/EndToEndTests/CNTKv2Python/Doc: try to enable for Windows GPU 2016-10-07 12:42:53 +02:00
Mark Hillebrand eecbb62859 Tests/EndToEndTests/CNTKv2Python/Doc: added, plus required changes to pass it 2016-10-07 12:42:17 +02:00
Willi Richert 23c48e8ad1 Clean up 2016-10-07 12:06:07 +02:00
Willi Richert 903cffcf61 Refactored precision sanitization; doc improvements 2016-10-07 12:02:39 +02:00
Willi Richert a4a1d8d54a Automatic conversion of Swig types to CNTK types; documentation of Trainer and Learner 2016-10-07 12:02:25 +02:00
Willi Richert b5189a8c92 Address CR comments 2016-10-07 12:02:20 +02:00
Amit Agarwal 21e57ca497 CNTK v2 library: Fixed combine operator to accept Variable operands and added randomize argument to TextMinibatchSource factory method 2016-10-07 00:00:43 -07:00
Project Philly 6476614a55 Integrate chazhang/image_tests into master 2016-10-06 20:19:32 -07:00
Project Philly ca553dabcb Integrate amitaga/cntkv2Library into master 2016-10-06 19:03:13 -07:00
Project Philly 5d727d906e Integrate kedeng/FixCriterionNode into master 2016-10-06 18:18:29 -07:00
Project Philly 65a67096f1 Integrate zhouwang/eval20-loadmodel into master 2016-10-06 18:01:15 -07:00
Cha Zhang 9289f91c5e Path fix. 2016-10-06 16:59:53 -07:00
Cha Zhang 883c9e91bd Path fix. 2016-10-06 16:58:27 -07:00
Cha Zhang f5926c7902 Path fix. 2016-10-06 16:58:11 -07:00
Amit Agarwal 96e7241927 CNTK v2 library: Minor improvements in test code 2016-10-06 16:47:50 -07:00