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

265 Коммитов

Автор SHA1 Сообщение Дата
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
Fei Gao 804d79286d Enable ASGD make 2016-09-20 21:45:14 -07: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
Mark Hillebrand 0285fa9a13 Merge remote-tracking branch 'origin/master' into mahilleb/CuDnn5Test
Conflicts:
	Source/ComputationNetworkLib/ComputationNode.h
	Source/ComputationNetworkLib/TrainingNodes.h
	Tests/EndToEndTests/Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv/baseline.linux.txt
	Tests/EndToEndTests/Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv/baseline.windows.txt
	Tests/UnitTests/MathTests/ConvolutionEngineTests.cpp
2016-08-25 00:37:49 +02:00
Project Philly e27af11d9b Integrate zhouwang/rebase-mtNonUniform2 into master 2016-08-24 00:47:02 -07:00
Zhou Wang 86ec025f32 Use mt19937 instead of rand() 2016-08-23 19:24:45 +02:00
Qiwei Ye e20626af7c Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
Conflicts:
	Source/Multiverso
2016-08-23 19:42:36 +08:00
Qiwei Ye c5ccb2a10d Merge branch 'master' into qiwye/asgd-dev 2016-08-23 19:35:31 +08:00
Mark Hillebrand 66498cf414 Merge remote-tracking branch 'origin/master' into mahilleb/CuDnn5Test
Note: baselines need to be fixed for
Tests/EndToEndTests/BatchNormalization and
Tests/EndToEndTests/Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv.
2016-08-23 11:12:35 +02:00
Frank Seide 1f9c539c61 Merge branch 'jdroppo/cudnn-rnn-lstm' of https://github.com/Microsoft/cntk into fseide/cudnn5 2016-08-22 20:11:07 -07:00
Frank Seide 54f096083d merged from mahilleb/CuDnn5Test 2016-08-22 18:51:22 -07:00
Jasha Droppo 2fa1b7033d Merge commit 'origin/master' 8493f11 into jdroppo/cudnn-rnn-lstm 2016-08-22 13:28:42 -07:00
Mark Hillebrand f76afa2b7e Switch to CuDNN v5
For batch normalization, running inverse standard deviation becomes
running variance. We mirror this CuDNN v5 change in the CNTK batch
normalization engine. Model version is bumped. When old models are
loaded, this parameter is (approximately) converted.

In the same model version change, let batch normalization count
samples seen rather minibatches (this deals with incorrect averaging
when minibatch size is varied across epochs).

For batch normalization averaging and blending handle initialization
cases, don't rely on mean and variance initial values (set in
NDL/BrainScript).

Update Windows / Linux / Docker build.
With this commit, CuDNN v4 is not supported anymore.
2016-08-22 17:55:10 +02:00
Amit Agarwal 45f4cbb115 CNTK v2 library: Linux build fixes 2016-08-21 04:25:53 -07:00
Alexey Reznichenko 9bd9308d2e Improve V2 Learner API, add basic serialization.
FSAdaGrad, RMSProp: pre-allocate smoothed gradients with expected
    number of columns.
    Improve configuring built-in learners: add learning rates and
    momentums schedules.
    Add NDArrayView as a DictionaryValue type.
    Add tests for serialization and basic learner functionality.
2016-08-18 15:06:54 +02:00
Wolfgang Manousek 40d247841a remove reference to acml math library 2016-08-17 10:04:56 +02:00
Ivan Rodriguez 41fb7ade94 Fix for linux build 2016-08-17 08:12:03 +02:00
Jasha Droppo 80d077054d Merge branch 'master' into jdroppo/cudnn-rnn-lstm 2016-08-15 16:11:16 -07:00
Qiwei Ye 5b86ad3709 Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp 2016-08-08 15:43:27 +08:00
Qiwei Ye eff143e5ba Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/CNTK/prebuild.bat
	configure
2016-08-08 15:40:37 +08:00
Amit Agarwal ca2f33f6e5 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library 2016-08-07 16:33:51 -07:00
Zhou Wang b6cfca3bd2 fix missing path for nvidia-ml in brainscripttests 2016-08-05 15:58:10 +01:00
Ivan Rodriguez 63a5580d8b Update linux build 2016-08-03 12:56:19 +02:00
Zhou Wang 01915bcfb1 Link libcntkmath to libeval
Use GDK_NVML_LIB_PATH
Simplify Boost libraries
Use ORIGINDIR in rpath of libeval

remove GDK_NVML_LIB_PATH from cppevalclient and Add -lcntkmath to libeval.so

Use GDK_NVML_LIB_PATH to avoid using system-wide one, Simplify

use  in libeval.so
2016-08-03 08:43:47 +02:00
Amit Agarwal 0854708400 CNTK v2 library: a) Convolution b) Mean variance normalization c) Added Cifar resnet test 2016-07-30 16:16:41 -07:00
Mark Hillebrand 018877f8ed Linux: Makefile/configure: split GDK_PATH setting into two, include and NVML path 2016-07-29 12:09:27 +01:00
Zhou Wang 182b0377db Use ORIGINLIBDIR instead of LIBDIR in rpath
Add $LIBPATH to unit test eval
2016-07-29 11:13:10 +02:00
Zhou Wang 3c3862a20a Install Boost at /usr/local/boost-x.y.z on Docker
Build unit tests only when Boost is available
Configure Boost path in configure
Address CR comments
fix #678

This is a combination of 10 commits.
Adapt makefile to work with Docker container on Linux

This is a combination of 7 commits.
enable unit tests build

remove -liomp5 from math unit test

enable openmp

add -ldl

fix space error

add -dl for reader test

change order of -l

remove gdk installation

use /usr/local/lib as boost library path

Adapt path in unit tests on Linux
adapt path for Linux

adapt path on other test projects for Linux

remove extra blank line

add BOOST_PATH,and build unit tests based on BOOST_PATH

configure boost path

install Boost 1.60.0; use version variable instead of hardcoding.

add comments for different paths on Linux than on Windows.

restore installation of gdk, because the removal of gdk needs more changes and will be done in a separate check-in

use ifdef, fix typos
2016-07-29 11:13:10 +02:00
Zhou Wang 180f593af6 Add Boost to Dockerfiles 2016-07-29 11:13:10 +02:00
U-FAREAST\fseide 6a6ebc48ab Merge branch 'master' of https://github.com/Microsoft/CNTK into fseide/clonebs 2016-07-27 10:36:18 -07:00
Mark Hillebrand 24cb169a9a Makefile: cppevalclient: link to stub libnvidia-ml.so (if real one not present)
Fixes build of Tools/docker/Dockerfile-GPU (with regular docker).
2016-07-27 13:05:02 +01:00
Qiwei Ye 4bc342edcf adding dl for link 2016-07-27 15:23:18 +08:00
Frank Seide 9dbf806c39 merged from master 2016-07-26 16:51:19 -07:00
Qiwei Ye 5a33a35eac Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/1BitSGD
	Source/SGDLib/SGD.cpp
2016-07-25 20:13:27 +08:00
Amit Agarwal 4164856b1f CNTK v2 library: Use dynamic loading of CompositeDataReader instead of a static dependency 2016-07-24 18:50:10 -07:00