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

63 Коммитов

Автор SHA1 Сообщение Дата
Mark Hillebrand 7cb1db6620 Merge remote-tracking branch 'origin/master' into mahilleb/vs2015fi
Conflicts:
    Source/CNTKv2LibraryDll/Utils.cpp
2017-01-10 11:29:03 +01:00
Mark Hillebrand 911b2ca82e Windows: switch to Visual Studio 2015 2017-01-10 10:47:35 +01:00
Junjie Qian 71c5aaba06 MPI_info: Path check and error handling for MPI exec
MPI_check: Check and selection of the installed MPI

MPI_info: default unknown fix for MPI name and version
2017-01-06 10:03:01 -08:00
Mark Hillebrand ada156e48b configure: don't pick up Python versions implicitly 2017-01-05 08:11:46 +00:00
Mark Hillebrand e2fd7255af Align randomization across platforms 2016-12-21 17:31:22 +01:00
Mark Hillebrand 8f4cad8f40 Enable Python 2.7 2016-12-19 13:49:05 +01:00
Mark Hillebrand 096810f83b Linux: CUDA-8.0
- A few baseline updates on Speech tasks.
- configure: put cuda-8.0 up front in the list
2016-12-07 13:40:11 +01:00
Takuma Yoshida b03cea93c3 Fix missing space and submodule 2016-11-13 15:13:13 +09:00
unknown 249989b95f Merge branch 'master' into qiwye/asgd-dev
# Conflicts:
#	CNTK.sln
#	Makefile
2016-11-10 16:50:46 +08:00
Nathan Luehr 4670158510 Added NCCL support to SimpleDistGradAggregator 2016-11-08 18:15:01 -08:00
Qiwei Ye b33e67ac75 fix license 2016-11-01 14:39:14 +08:00
Qiwei Ye 0a9f9f2bc8 change asgd to ASGD in configure 2016-10-25 17:35:01 +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 e986d27c13 Add protobuf-based serialization 2016-10-25 01:00:38 +02:00
Qiwei Ye a5d7b7f369 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	CNTK.sln
2016-10-18 16:03:09 +08:00
Mark Hillebrand d4bcd5937e Tune; address CR comments 2016-10-14 13:05:30 +02:00
Mark Hillebrand ddb1434e50 Linux: CNTK v2 Python build support through Makefile 2016-10-12 16:12:25 +02: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
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
Mark Hillebrand d59f543385 When we don't find the CNTK custom MKL we're looking for, also report the version number 2016-09-26 11:55:39 +02:00
Eldar Akchurin 22fc37dab0 Bumping mkl version in configs 2016-09-26 11:55:39 +02:00
Fei Gao 9c3c876cb2 Replace tab with spaces 2016-09-19 00:05:59 -07:00
Qiwei Ye 0d077ff592 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/SGDLib/SGD.cpp
2016-09-01 12:55:44 +08:00
Mark Hillebrand 3d60894b64 configure: prefer cudnn-5.1 over cudnn-5.0 2016-08-26 15:37:00 +02:00
Mark Hillebrand 1f55aa3742 configure: CuDNN 5.0 over CuDNN 5.1 for a little while 2016-08-26 10:09:19 +02:00
Mark Hillebrand e1cf519082 CuDNNv5: enable for build
v5.1 is preferred over v5.
2016-08-25 16:26:03 +02: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
Zhou Wang 86ec025f32 Use mt19937 instead of rand() 2016-08-23 19:24:45 +02: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
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
Wolfgang Manousek 79cfcf7d4f more acml removal 2016-08-17 10:04:56 +02: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
Mark A. Hillebrand 0d827e6190 configure: fix detection of LibZip when path explicitly specified
Closes: #713.
2016-08-01 14:27:38 +02: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 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
Qiwei Ye 67998341be Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/1BitSGD
	Source/SGDLib/SGDLib.vcxproj
2016-07-07 15:59:07 +08:00
Mark Hillebrand e04a9bd7f3 Update Tools/docker/Dockerfile-*
- Open MPI 1.10.3
- OpenBLAS 0.2.18, also compile with OpenMP and LAPACK
- OpenCV 3.1.0 (also support in ./configure)
- CNTK custom MKL, version 1
- MKL build (in /cntk/build-mkl/*/release)
- Add python-yaml package, so TestDriver.py can be run
2016-06-23 18:49:20 +01:00
Qiwei Ye d17ff5d9eb Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/CNTK/CNTK.cpp
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
2016-06-15 20:22:12 +08:00
Mark Hillebrand 52ae07279d CNTK custom MKL support 2016-06-14 17:39:24 +02:00
Qiwei Ye 16e890ea75 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
	configure
2016-05-03 10:58:07 +08:00
Marko Radmilac 63c7fad4c8 Add support for gcov code coverage builds 2016-05-02 09:48:46 -07:00
Qiwei Ye 9760990506 Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/ActionsLib/ActionsLib.vcxproj
	Source/CNTK/CNTK.cpp
	Source/CNTK/CNTK.vcxproj
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGD.h
	Source/SGDLib/SGDLib.vcxproj
	Source/SGDLib/SGDLib.vcxproj.filters
	Tools/generate_build_info
	configure
2016-04-16 10:41:47 +08:00
Mark Hillebrand 09068f7495 Linux: Enable Kaldi2Reader build and test
- Will build Kaldi2Reader if found at a default location.
- Set Kaldi2Reader end-to-end test to run on Linux GPU nightly.
2016-04-06 17:12:50 +02:00
Matan Nassau 3a21ed4fdf fix 1bitsgd default in configure help text 2016-03-25 13:32:57 -04:00
Alexey Kamenev 246907dbb6 Addressed code review comments. 2016-02-25 10:56:42 -08:00
Alexey Kamenev bbf67cf03b Added libzip support on Linux. 2016-02-25 09:47:14 -08:00
Qiwei Ye 492e2735de Merge branch 'master' into qiwye/asgd-dev
Conflicts:
	Source/ActionsLib/ActionsLib.vcxproj
	Source/CNTK/CNTK.cpp
	Source/CNTK/CNTK.vcxproj
	Source/SGDLib/SGD.cpp
	Source/SGDLib/SGDLib.vcxproj
2016-02-14 11:56:26 +08:00
Ross Wightman f0d8a23b26 Add experimental support for OpenBLAS library
* Add 'openblas' as mathlib option in configure. Not added to auto-search so
must be specified using --with-openblas

* configure script searches empty tail so that libraries located at default_path_list
roots (ie /usr/local/ + include/openblas_config.h) are found

* Treat ACML as the odd library out in ifdefs since it doesn't conform to typical
BLAS standard. Other libraries like ATLAS should be able to share
OpenBLAS/MKL variants. Add default USE_ACML define in VS projects to match

* Fix 'max' macro define colliding with C++ std::max once openblas headers are included

Usage Notes:

* For best performance, build OpenBLAS with USE_OPENMP=1. When running CNTK, set
OPENBLAS_NUM_THREADS environment var or set numCPUThreads CNTK config variable to the
physical core count or performance will suffer

* OpenBLAS 2.16 (git HEAD) tested in Linux with GCC 4.8.4 and in Windows with
OpenBLAS 2.15 (pre-built binary release + MingGW 64-bit support dlls)

* For Windows, in Math.vcxproj, replace libacml_mp_dll.lib with libopenblas.dll.a and change
USE_ACML define to USE_OPENBLAS. Change ACML_PATH environment variable to your OpenBLAS path.
Modify openblas_config.h as per https://github.com/xianyi/OpenBLAS/issues/708

* On current generation Intel processors, OpenBLAS measures a little faster than
AMD ACML and slower than Intel MKL on MNIST and other examples
2016-02-11 13:40:18 -08:00
Qiwei Ye d5621720d1 change default value of enable_asgd to yes for the jenkins build 2016-02-01 21:15:54 +09:00