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

222 Коммитов

Автор SHA1 Сообщение Дата
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
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
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
Frank Seide 9dbf806c39 merged from master 2016-07-26 16:51:19 -07: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
Amit Agarwal 4828b57ddb Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library 2016-07-21 10:04:57 -07:00
Frank Seide 39a9175097 merged from master 2016-07-19 16:40:51 -07:00
Jasha Droppo a4e42744c2 Merge branch 'master' into jdroppo/cudnn-rnn-lstm
Conflicts:
	Makefile
	Source/CNTK/BrainScript/CNTKCoreLib/CNTK.core.bs
	Source/Math/CuDnnBatchNormalization.cu
	Source/Math/CuDnnConvolutionEngine.cu
	Source/Math/Math.vcxproj
	Source/SGDLib/SGD.cpp
2016-07-18 11:11:58 -07:00
Amit Agarwal 9ba93ab84e CNTK v2 library: Added support for loading legacy v1 format models and saving models in v1 format 2016-07-17 16:44:44 -07:00
Zhou Wang c747b28437 temporarily not build unit tests as docker image does not include boost. 2016-07-16 17:55:38 +01:00
Project Philly 4d14065627 Integrate zhouwang/unittests-linux into master 2016-07-14 10:17:30 -07:00
Zhou Wang 94a39eb6bb fix NVMLLIBPATH 2016-07-13 16:03:06 +02:00
Zhou Wang e3927bb717 Add math unit tests and adapt them for Linux
This is a combination of 7 commits.
minor format changes

adapt makefile and math tests

enable sse4.1 support

adapt to linux

fix shadow param, and adjust order of functions

netowrk tests need .cu

move constant definition into a .cpp file, instead of .h
2016-07-13 16:03:06 +02:00
Zhou Wang 8147ed8169 Add unit tests on Linux, adapt tests to work on Linux.
This is a combination of 25 commits.

Add unit tests

make them work on Linux

add to build eval unit tests.

adapt for Linux

fix incompatablity issues on linux

using runtime_error() instead of exception to make linux happy

add library and path

change order of included files

use dynmaic library on linux

link with boost dynamic libraries

minor changes

use BOOSTLIBS to specify all required boost libraries

Add reader unit tests

add .phony unittests to only build unit tests. (will be removed later)

fix errors

add ifdef for platform specifc stuff

fix for linux

adapt makefile for unit tests

adapt reader test to work on Linux

add missing files for the networks unit test

adapt the networks unit test

add the math unit tests

fix errors

minor changes

remove unexpected tab
2016-07-13 16:03:06 +02:00
Alexey Reznichenko 1b0548fdde Add v2 Learners (standalone) 2016-07-13 11:10:02 +02:00
Project Philly dd1410e957 Integrate zhouwang/nvmlpath-makefile into master 2016-07-05 09:48:52 -07:00
Zhou Wang 999df5d70d use NVMLLIBPATH instead of NVMLPATH 2016-06-30 12:14:34 +01:00
Zhou Wang 7537b49054 Added NVMLPATH when building eval 2016-06-28 13:13:59 +02:00
Zhou Wang a5a5139f9e define RPATH only once, as it is not changed. 2016-06-28 10:58:21 +02:00
Zhou Wang 4ed2cb211a Remove pre-complier headers, simlify namings in Makefile
remvoed pre-compiler headers and addressed CR comments

simplify naming comments from CR

delete unused files, minor changes

Changes in comments and Todo
2016-06-27 17:44:21 +02:00
Zhou Wang c367e6cc4f Add building libeval.so and cppevalclient on Linux;
Adapt cppevalcient to build both on Windwos and Linux

Add comment for using "this->" explicitly

Add to build LibEval.so in Makefile

minor changes

EvalSample on Linux

Add EvalSampleClient to Makefile

fix errors in Makefile

fix compilation error on Linux

fix more errors

add main function for Linux

Fix captial case for Eval.h on Linux

build cppevalclient

Add dependency processing for .cu

replace \ with / in the file path on Linux

Adapt path on Linux

fix path on Linux

Use main() on Windows, remvoe unused files and path in Makefile
remove unused files

Use main() on Windows, and remove the wrapper for Linux

further remvoe unused files

fine tuning on lib and path

minor changes
2016-06-27 12:43:21 +02:00
Project Philly d39410d2fc Integrate anthaue/addblockmultiplier into master 2016-06-24 16:50:41 -07:00
anthonyaue 8ea48ecb22 Add -mssse3 flag (-msse3 and -mssse3 both need to be specified apparently 2016-06-21 15:55:21 -07:00
anthonyaue 6a07bcfe5e Add -msse3 flag to CUFLAGS 2016-06-21 15:41:27 -07:00
anthonyaue f6bd20fd76 Play with spacing to help make find endif 2016-06-21 15:02:36 -07:00
anthonyaue 523731635f Remove line-continuation backslash in makefile 2016-06-21 13:59:26 -07:00