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

397 Коммитов

Автор SHA1 Сообщение Дата
Nikos Karampatziakis c406520b47 incorporated some cr feedback 2016-11-09 13:17:08 -08:00
Mark Hillebrand 88065644f7 Merge remote-tracking branch 'origin/master' into mahilleb/pr/874 2016-11-09 14:01:33 +00:00
Project Philly 12b1c23fd0 Integrate zhouwang/pr899 into master 2016-11-09 06:00:04 -08:00
Zhou Wang 28fc07483f add CPPEvalExtendedClient to examples
disable checking result as the model trained with 1 epoch during test is not accurate enought to produce correct results under each build flavor.
2016-11-09 13:17:12 +01:00
Zhou Wang 7f06c917cf fix index bug, add test project, adjust example project, integrate into
E2E tests
2016-11-09 13:15:43 +01:00
yuxiao.guo 814381b9a8 1. Fixed some known merging problems
2. Fixed a bug of EndForwardProp in BatchNormalization
2016-11-09 17:26:00 +08:00
Nathan Luehr 4670158510 Added NCCL support to SimpleDistGradAggregator 2016-11-08 18:15:01 -08:00
Qiwei Ye 345f259190 Addressed CR comments 2016-11-08 19:59:19 +08:00
Qiwei Ye 0b93d7b0de revert unexpected change 2016-11-07 19:36:30 +08:00
Qiwei Ye af999a1144 revert makefile: libEval depends on SGDLib, which will depends on Multiverso 2016-11-07 19:23:28 +08:00
Qiwei Ye 71d68c8b5e update makefile to latests 2016-11-06 13:11:20 +08:00
Qiwei Ye f1da36427f Merge branch 'master' into qiwye/asgd-dev 2016-11-06 12:49:20 +08:00
Friedel van Megen e0fbef2073 fix comments from CR 2016-11-04 16:38:55 +01:00
Marco Fiscato f835b4095b fix for python in docker 2016-11-04 12:00:08 +00:00
Qiwei Ye ff03e400d2 fix linux build 2016-11-03 17:31:28 +08:00
Fei Gao 7cc84c8731 Fix Makefile seperator issue 2016-11-01 20:13:58 -07:00
Fei Gao 70ca67c09b Fix makefile tab separator issue 2016-11-01 18:52:25 -07:00
Fei Gao 10b40dfffa Linux Build OK 2016-11-01 06:59:10 -07:00
Qiwei Ye 5f8e9c6385 Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev 2016-11-01 20:42:49 +08:00
feiga 060e9f678d Update Makefile for the new added ASGDHelper.cpp file 2016-11-01 20:36:24 +08:00
Qiwei Ye 42e5ea1328 remove unnecessary dependency; adding debug version 2016-11-01 16:29:18 +08:00
Friedel van Megen 82ec273df3 Merge branch 'master' into fmegen/aarch64/mpi
# Conflicts:
#	Source/1BitSGD
#	Source/Common/Include/MPIWrapper.h
#	Source/Common/MPIWrapper.cpp
#	configure
2016-10-31 16:08:02 +01:00
Momcilo Vasilijevic 6fb30c545d Add accumulator node
Value of accumulator node contains mean sample value of its input node
values since the beginning of training epoch.
Also, refactor crop node tests. Dummy input node was as part of epoch
accumulator node tests. Removing class with the same functionality from
crop node tests and reusing newly introduced one.
2016-10-28 09:54:25 -07:00
KeDengMS a7391e0a54 Add CNTKv2LibraryDistribution unit test to BVT/nightly
Add example test for distributed
Skip distributed python API test for non-1bit
Remove print in distributed API
2016-10-27 18:41:08 -07:00
KeDengMS 37e4bfdb68 Makefile fix 2016-10-27 15:21:56 -07:00
KeDengMS 4106af5521 Add V2LibraryDistributionTests to Linux 2016-10-27 12:49:44 -07:00
KeDengMS 0178bc5899 Revert "Add V2LibraryDistributionTests to Linux build"
This reverts commit e3e294a345.
2016-10-27 12:47:16 -07:00
KeDengMS e3e294a345 Add V2LibraryDistributionTests to Linux build 2016-10-27 12:41:30 -07:00
Qiwei Ye 4be2822a65 Merge branch 'master' into qiwye/asgd-dev 2016-10-27 16:31:48 +08:00
Sasa Galic 417f3fe730 Add crop node
In this change crop node is implemented.
The purpose of this node is to crop portion of the first node that
dimension-wise corresponds to the second node at the given or
calculated offset.
Offsets may be given manually or calculated based on affine transform
between two inputs along the path that connects them.
2016-10-26 11:18:36 +02:00
Qiwei Ye a1b7a5cec7 code review: removing unnecessary files/tabs 2016-10-25 11:50:58 +08:00
Qiwei Ye 19844ed9dd Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Makefile
	Source/SGDLib/SGDLib.vcxproj.filters
2016-10-25 11:31:42 +08:00
Alexey Reznichenko 12c29a1763 Merge branch 'master' into alrezni/v2_protobuf 2016-10-25 02:53:41 +02:00
Alexey Reznichenko e986d27c13 Add protobuf-based serialization 2016-10-25 01:00:38 +02:00
Zhou Wang ea38f9d905 build EvalV2Client on Linux 2016-10-21 12:53:56 +02:00
Eldar Akchurin f3289b0f84 First version of distributed aggregator for v2 2016-10-19 13:49:10 +02:00
Project Philly 96b2009814 Integrate mahilleb/LinuxPyBuildTune into master 2016-10-19 04:38:01 -07:00
Mark Hillebrand efbdeaa490 Linux: Python build: fix error handling 2016-10-19 10:22:31 +01:00
Alexey Reznichenko b56efb62f6 Function graph: add save and load to/from a dictionary
* Function serialization to/from dictionary + in-place version to load
   state from a dict into the existing function + refactored a few
   graph traversal methods;
   * Learner serialization, including the learning rate + refactored API
   to reset LR;
   * Value serialization;
   * Trainer serialization (checkpointing);
   * A number of unit tests.
2016-10-18 22:56:34 +02:00
Mark Hillebrand 60c9def20c Makefile: python: use existing LD_LIBRARY_PATH; use python setup.py build_ext --inplace 2016-10-18 18:58:08 +02:00
Qiwei Ye 4dd1625797 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGDLib.vcxproj.filters
2016-10-18 21:29:23 +08:00
Qiwei Ye a5d7b7f369 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	CNTK.sln
2016-10-18 16:03:09 +08:00
yuxiao.guo 8c360f27d9 Merge branch 'master' into v-yuxgu/resnet-rc 2016-10-18 15:02:13 +08:00
yuxiao.guo 9cb329a0da Optimize the flow of post batch normalization statistics, and allow disable regularization terms in batch normalization 2016-10-18 13:53:36 +08:00
Friedel van Megen 3d4723ca04 address CR comments from Mark 2016-10-14 18:05:29 +02:00
Project Philly ce848e586f Integrate mahilleb/PyBuildUpdate into master 2016-10-14 07:19:12 -07:00
Friedel van Megen 1aa805fe87 merge 2016-10-14 13:42:33 +02:00
Mark Hillebrand d4bcd5937e Tune; address CR comments 2016-10-14 13:05:30 +02:00
Friedel van Megen b63f10b444 Merge branch 'master' into fmegen/aarch64/mpi 2016-10-14 12:45:13 +02:00
Friedel van Megen a183815dd1 enabling cross-compile of the cntk sources for arm64 devices.
This commit replaces implementations of functions based on sse with a non-sse version
and updates the makefile such that SSE_FLAGS can be overriden when compiling for non-Intel architectures.
2016-10-14 10:09:40 +02:00
Mark Hillebrand ddb1434e50 Linux: CNTK v2 Python build support through Makefile 2016-10-12 16:12:25 +02:00
Thilo Will 4a1df9f4a9 merging from master 2016-10-10 11:47:55 +02: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 2ab22c55d7 Merge branch 'master' into qiwye/asgd-dev 2016-10-09 16:02:34 +08: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
Friedel van Megen d67c0be084 make mpi optional in makefile 2016-10-07 15:24:52 +02:00
Friedel van Megen 1335440b1e fix typo 2016-10-07 15:22:05 +02:00
Friedel van Megen a4366e2c5f mark openmpi as not available 2016-10-07 15:21:25 +02:00
Thilo Will e90b140f5b merging from master 2016-10-06 15:03:02 +02:00
Zhou Wang 096b5a707d add missing include path 2016-10-05 19:25:39 +02:00
Zhou Wang d4615d9ae9 add missing LIBZIP_PATH to LIBPATH 2016-10-05 19:25:39 +02:00
Thilo Will 61c26012a6 Adding TrainingNodes.cpp to makefile 2016-09-30 17:05:00 +02:00
Amit Agarwal 03af74b6df Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library 2016-09-29 18:22:24 -07:00
feiga 15625d01e0 Update Makefile, build Multiverso unittest along 2016-09-30 00:58:21 +09:00
Amit Agarwal 762b4c2880 CNTK v2 library: Fixed a bug in counting samples for computing criterion value 2016-09-29 02:48:13 -07:00
feiga eed2832700 Update Makefile 2016-09-29 16:48:57 +09:00
Qiwei Ye 5059e931d1 Merge branch 'qiwye/asgd-dev' into feiga/multiverso
Conflicts:
	Source/SGDLib/SGD.cpp
2016-09-29 11:05:11 +08:00
Alexey Reznichenko 2f53509644 Add UTs for device selection API 2016-09-28 11:52:37 +02:00
feiga 3d3b523e5d Fix the relative path to absolution path in Makefile 2016-09-28 18:27:40 +09:00
feiga d7463fe507 Refine Makefile 2016-09-27 22:17:42 +09:00
feiga 89e53a9226 fix Makefile 2016-09-27 21:58:30 +09:00
Fei Gao dfc2c6ccca Update Makefile 2016-09-27 20:07:32 +08:00
feiga 3ff5975e2c Update Makefile 2016-09-27 19:58:38 +09:00
feiga 6b315511e4 Update Makefile 2016-09-27 19:46:26 +09:00
Qiwei Ye 8a2e67aba8 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/1BitSGD
	Source/SGDLib/SGD.cpp
2016-09-27 17:04:03 +08:00
feiga 50827a564d Remove multiverso header file dependence in SGD.h 2016-09-27 18:00:02 +09:00
Fei Gao 516682b936 Update Makefile 2016-09-27 14:47:46 +08:00
feiga a46ae614b1 Minor Makefile change 2016-09-27 15:40:01 +09:00
feiga b4de776657 Fix Makefile Multiverso link issue 2016-09-27 12:37:31 +09:00
Fei Gao 2ae40949ae Fix Makefile to solve the make failure in Jenkins 2016-09-26 06:20:51 -07:00
Fei Gao c073fb0b17 Solve the multiversotests loader library path issue 2016-09-26 04:54:53 -07:00
Zhou Wang 92a072806d restruct project structure 2016-09-22 22:47:16 +02:00
Zhou Wang 7449a77618 use struct-level static instead of local static as work around to ensure thread-safety in VS2013 2016-09-22 22:45:50 +02:00
Eldar Akchurin 773dca2b4c First version of GPU prefetch 2016-09-21 12:00:04 +02:00
Fei Gao 804d79286d Enable ASGD make 2016-09-20 21:45:14 -07:00
Eldar Akchurin 5163671eab First implementation of the pinned memory in the new readers 2016-09-20 09:40:48 +02:00
Fei Gao f5671d86c1 Build with Multiverso and ASGD 2016-09-19 03:07:15 -07:00
Qiwei Ye fab018435c Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
Conflicts:
	Source/CNTK/CNTK.cpp
2016-09-18 13:34:42 +08:00
Qiwei Ye d91a01b2e9 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/1BitSGD
	Source/SGDLib/SGD.cpp
2016-09-18 13:31:45 +08:00
Qiwei Ye b938d9a603 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	CNTK.sln
2016-09-13 14:34:05 +08:00
Frank Seide e9037cef99 added RecurrentNodes.cpp to Linux Makefile 2016-09-04 18:36:17 -07:00
Zhou Wang 07eff6b7c2 add TensorTests and QuantziersTests to makefile
fix build errors on Linux
2016-09-01 22:00:04 +02:00
Eldar Akchurin 68ae8803a5 Moving forceDeterministicAlgorithms to globals 2016-09-01 10:26:18 +02:00
Qiwei Ye 0d077ff592 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/SGDLib/SGD.cpp
2016-09-01 12:55:44 +08:00
Amit Agarwal 7a5c133edc CNTK v2 library: Added Seq2Seq implementation as a test using V2 C++ API and other related changes 2016-08-30 22:50:25 -07:00
Amit Agarwal 4299d870c8 CNTK v2 library: API simplifcation, added new primitive Functions and addressed pending CR feedback 2016-08-26 18:29:30 -07:00
Frank Seide f3942f188c added missing RNN bits to Linux Makefile 2016-08-24 20:54:08 -07:00
Frank Seide 4e19029652 RNNnodes.cpp missing in Linux Makefile;
changed test tolerance to accept a momentum printed as 0.899998 instead of the original 0.9
2016-08-24 20:42:48 -07:00
Frank Seide 5f14fcaea0 merged from mahilleb/CuDnn5Test 2016-08-24 18:45:39 -07:00