f835b4095b
fix for python in docker
2016-11-04 12:00:08 +00:00
ff03e400d2
fix linux build
2016-11-03 17:31:28 +08:00
7cc84c8731
Fix Makefile seperator issue
2016-11-01 20:13:58 -07:00
70ca67c09b
Fix makefile tab separator issue
2016-11-01 18:52:25 -07:00
10b40dfffa
Linux Build OK
2016-11-01 06:59:10 -07:00
5f8e9c6385
Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev
2016-11-01 20:42:49 +08:00
060e9f678d
Update Makefile for the new added ASGDHelper.cpp file
2016-11-01 20:36:24 +08:00
42e5ea1328
remove unnecessary dependency; adding debug version
2016-11-01 16:29:18 +08:00
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
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
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
37e4bfdb68
Makefile fix
2016-10-27 15:21:56 -07:00
4106af5521
Add V2LibraryDistributionTests to Linux
2016-10-27 12:49:44 -07:00
0178bc5899
Revert "Add V2LibraryDistributionTests to Linux build"
...
This reverts commit e3e294a345
2016-10-27 12:47:16 -07:00
e3e294a345
Add V2LibraryDistributionTests to Linux build
2016-10-27 12:41:30 -07:00
4be2822a65
Merge branch 'master' into qiwye/asgd-dev
2016-10-27 16:31:48 +08:00
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
a1b7a5cec7
code review: removing unnecessary files/tabs
2016-10-25 11:50:58 +08:00
19844ed9dd
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Makefile
Source/SGDLib/SGDLib.vcxproj.filters
2016-10-25 11:31:42 +08:00
12c29a1763
Merge branch 'master' into alrezni/v2_protobuf
2016-10-25 02:53:41 +02:00
e986d27c13
Add protobuf-based serialization
2016-10-25 01:00:38 +02:00
ea38f9d905
build EvalV2Client on Linux
2016-10-21 12:53:56 +02:00
f3289b0f84
First version of distributed aggregator for v2
2016-10-19 13:49:10 +02:00
96b2009814
Integrate mahilleb/LinuxPyBuildTune into master
2016-10-19 04:38:01 -07:00
efbdeaa490
Linux: Python build: fix error handling
2016-10-19 10:22:31 +01:00
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
60c9def20c
Makefile: python: use existing LD_LIBRARY_PATH; use python setup.py build_ext --inplace
2016-10-18 18:58:08 +02:00
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
a5d7b7f369
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
CNTK.sln
2016-10-18 16:03:09 +08:00
8c360f27d9
Merge branch 'master' into v-yuxgu/resnet-rc
2016-10-18 15:02:13 +08:00
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
3d4723ca04
address CR comments from Mark
2016-10-14 18:05:29 +02:00
ce848e586f
Integrate mahilleb/PyBuildUpdate into master
2016-10-14 07:19:12 -07:00
1aa805fe87
merge
2016-10-14 13:42:33 +02:00
d4bcd5937e
Tune; address CR comments
2016-10-14 13:05:30 +02:00
b63f10b444
Merge branch 'master' into fmegen/aarch64/mpi
2016-10-14 12:45:13 +02:00
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
ddb1434e50
Linux: CNTK v2 Python build support through Makefile
2016-10-12 16:12:25 +02:00
4a1df9f4a9
merging from master
2016-10-10 11:47:55 +02:00
614a51e7fb
Merge branch 'qiwye/asgd-dev' of https://github.com/Microsoft/CNTK into qiwye/asgd-dev
2016-10-10 12:18:26 +09:00
2ed62be847
Update Makefile
2016-10-10 12:18:17 +09:00
2ab22c55d7
Merge branch 'master' into qiwye/asgd-dev
2016-10-09 16:02:34 +08:00
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
d67c0be084
make mpi optional in makefile
2016-10-07 15:24:52 +02:00
1335440b1e
fix typo
2016-10-07 15:22:05 +02:00
a4366e2c5f
mark openmpi as not available
2016-10-07 15:21:25 +02:00
e90b140f5b
merging from master
2016-10-06 15:03:02 +02:00
096b5a707d
add missing include path
2016-10-05 19:25:39 +02:00
d4615d9ae9
add missing LIBZIP_PATH to LIBPATH
2016-10-05 19:25:39 +02:00
61c26012a6
Adding TrainingNodes.cpp to makefile
2016-09-30 17:05:00 +02:00
03af74b6df
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
2016-09-29 18:22:24 -07:00
15625d01e0
Update Makefile, build Multiverso unittest along
2016-09-30 00:58:21 +09:00
762b4c2880
CNTK v2 library: Fixed a bug in counting samples for computing criterion value
2016-09-29 02:48:13 -07:00
eed2832700
Update Makefile
2016-09-29 16:48:57 +09:00
5059e931d1
Merge branch 'qiwye/asgd-dev' into feiga/multiverso
...
Conflicts:
Source/SGDLib/SGD.cpp
2016-09-29 11:05:11 +08:00
2f53509644
Add UTs for device selection API
2016-09-28 11:52:37 +02:00
3d3b523e5d
Fix the relative path to absolution path in Makefile
2016-09-28 18:27:40 +09:00
d7463fe507
Refine Makefile
2016-09-27 22:17:42 +09:00
89e53a9226
fix Makefile
2016-09-27 21:58:30 +09:00
dfc2c6ccca
Update Makefile
2016-09-27 20:07:32 +08:00
3ff5975e2c
Update Makefile
2016-09-27 19:58:38 +09:00
6b315511e4
Update Makefile
2016-09-27 19:46:26 +09:00
8a2e67aba8
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Source/1BitSGD
Source/SGDLib/SGD.cpp
2016-09-27 17:04:03 +08:00
50827a564d
Remove multiverso header file dependence in SGD.h
2016-09-27 18:00:02 +09:00
516682b936
Update Makefile
2016-09-27 14:47:46 +08:00
a46ae614b1
Minor Makefile change
2016-09-27 15:40:01 +09:00
b4de776657
Fix Makefile Multiverso link issue
2016-09-27 12:37:31 +09:00
2ae40949ae
Fix Makefile to solve the make failure in Jenkins
2016-09-26 06:20:51 -07:00
c073fb0b17
Solve the multiversotests loader library path issue
2016-09-26 04:54:53 -07:00
92a072806d
restruct project structure
2016-09-22 22:47:16 +02:00
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
773dca2b4c
First version of GPU prefetch
2016-09-21 12:00:04 +02:00
804d79286d
Enable ASGD make
2016-09-20 21:45:14 -07:00
5163671eab
First implementation of the pinned memory in the new readers
2016-09-20 09:40:48 +02:00
f5671d86c1
Build with Multiverso and ASGD
2016-09-19 03:07:15 -07:00
fab018435c
Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
...
Conflicts:
Source/CNTK/CNTK.cpp
2016-09-18 13:34:42 +08:00
d91a01b2e9
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Source/1BitSGD
Source/SGDLib/SGD.cpp
2016-09-18 13:31:45 +08:00
b938d9a603
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
CNTK.sln
2016-09-13 14:34:05 +08:00
e9037cef99
added RecurrentNodes.cpp to Linux Makefile
2016-09-04 18:36:17 -07:00
07eff6b7c2
add TensorTests and QuantziersTests to makefile
...
fix build errors on Linux
2016-09-01 22:00:04 +02:00
68ae8803a5
Moving forceDeterministicAlgorithms to globals
2016-09-01 10:26:18 +02:00
0d077ff592
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Source/SGDLib/SGD.cpp
2016-09-01 12:55:44 +08:00
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
4299d870c8
CNTK v2 library: API simplifcation, added new primitive Functions and addressed pending CR feedback
2016-08-26 18:29:30 -07:00
f3942f188c
added missing RNN bits to Linux Makefile
2016-08-24 20:54:08 -07:00
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
5f14fcaea0
merged from mahilleb/CuDnn5Test
2016-08-24 18:45:39 -07:00
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
e27af11d9b
Integrate zhouwang/rebase-mtNonUniform2 into master
2016-08-24 00:47:02 -07:00
86ec025f32
Use mt19937 instead of rand()
2016-08-23 19:24:45 +02:00
e20626af7c
Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
...
Conflicts:
Source/Multiverso
2016-08-23 19:42:36 +08:00
c5ccb2a10d
Merge branch 'master' into qiwye/asgd-dev
2016-08-23 19:35:31 +08:00
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
1f9c539c61
Merge branch 'jdroppo/cudnn-rnn-lstm' of https://github.com/Microsoft/cntk into fseide/cudnn5
2016-08-22 20:11:07 -07:00
54f096083d
merged from mahilleb/CuDnn5Test
2016-08-22 18:51:22 -07:00
2fa1b7033d
Merge commit 'origin/master' 8493f11 into jdroppo/cudnn-rnn-lstm
2016-08-22 13:28:42 -07:00
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
45f4cbb115
CNTK v2 library: Linux build fixes
2016-08-21 04:25:53 -07:00
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
40d247841a
remove reference to acml math library
2016-08-17 10:04:56 +02:00
41fb7ade94
Fix for linux build
2016-08-17 08:12:03 +02:00
80d077054d
Merge branch 'master' into jdroppo/cudnn-rnn-lstm
2016-08-15 16:11:16 -07:00
5b86ad3709
Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp
2016-08-08 15:43:27 +08:00
eff143e5ba
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Source/CNTK/prebuild.bat
configure
2016-08-08 15:40:37 +08:00
ca2f33f6e5
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
2016-08-07 16:33:51 -07:00
b6cfca3bd2
fix missing path for nvidia-ml in brainscripttests
2016-08-05 15:58:10 +01:00
63a5580d8b
Update linux build
2016-08-03 12:56:19 +02:00
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
0854708400
CNTK v2 library: a) Convolution b) Mean variance normalization c) Added Cifar resnet test
2016-07-30 16:16:41 -07:00
018877f8ed
Linux: Makefile/configure: split GDK_PATH setting into two, include and NVML path
2016-07-29 12:09:27 +01:00
182b0377db
Use ORIGINLIBDIR instead of LIBDIR in rpath
...
Add $LIBPATH to unit test eval
2016-07-29 11:13:10 +02:00
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
180f593af6
Add Boost to Dockerfiles
2016-07-29 11:13:10 +02:00
6a6ebc48ab
Merge branch 'master' of https://github.com/Microsoft/CNTK into fseide/clonebs
2016-07-27 10:36:18 -07:00
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
4bc342edcf
adding dl for link
2016-07-27 15:23:18 +08:00
9dbf806c39
merged from master
2016-07-26 16:51:19 -07:00
5a33a35eac
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Source/1BitSGD
Source/SGDLib/SGD.cpp
2016-07-25 20:13:27 +08:00
4164856b1f
CNTK v2 library: Use dynamic loading of CompositeDataReader instead of a static dependency
2016-07-24 18:50:10 -07:00
4828b57ddb
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
2016-07-21 10:04:57 -07:00
39a9175097
merged from master
2016-07-19 16:40:51 -07:00
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
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
c747b28437
temporarily not build unit tests as docker image does not include boost.
2016-07-16 17:55:38 +01:00
4d14065627
Integrate zhouwang/unittests-linux into master
2016-07-14 10:17:30 -07:00
94a39eb6bb
fix NVMLLIBPATH
2016-07-13 16:03:06 +02:00
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
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
1b0548fdde
Add v2 Learners (standalone)
2016-07-13 11:10:02 +02:00
67998341be
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Source/1BitSGD
Source/SGDLib/SGDLib.vcxproj
2016-07-07 15:59:07 +08:00
dd1410e957
Integrate zhouwang/nvmlpath-makefile into master
2016-07-05 09:48:52 -07:00
999df5d70d
use NVMLLIBPATH instead of NVMLPATH
2016-06-30 12:14:34 +01:00
7537b49054
Added NVMLPATH when building eval
2016-06-28 13:13:59 +02:00
a5a5139f9e
define RPATH only once, as it is not changed.
2016-06-28 10:58:21 +02:00
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
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
d39410d2fc
Integrate anthaue/addblockmultiplier into master
2016-06-24 16:50:41 -07:00
8ea48ecb22
Add -mssse3 flag (-msse3 and -mssse3 both need to be specified apparently
2016-06-21 15:55:21 -07:00
6a07bcfe5e
Add -msse3 flag to CUFLAGS
2016-06-21 15:41:27 -07:00
f6bd20fd76
Play with spacing to help make find endif
2016-06-21 15:02:36 -07:00
523731635f
Remove line-continuation backslash in makefile
2016-06-21 13:59:26 -07:00
7527dd0154
Make AVX2 flag conditional on SUPPORT_AVX2 macro in linux build file
2016-06-21 13:02:39 -07:00
1043f45466
Specify AVX instead of AVX2. TODO: Figure out story for conditional
...
compilation
2016-06-21 12:22:46 -07:00
1e6fb55338
Add Stdafx.h headers to fix release win build breaks; add -mavx2 flag to
...
fix linux build break
2016-06-21 10:43:29 -07:00
12140c993b
Makefile and *.vcxproj changes
2016-06-17 08:57:55 -07:00
8835d4f61b
Remove SM20 support
2016-06-15 13:16:29 -07:00
a9f769884a
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
2016-06-15 11:11:37 -07:00
0cd50e0edf
Fix build with active codepage 936 (non-ASCII characters in files without BOM)
...
This closes #487 , closes #47 .
2016-06-15 14:24:17 +02:00
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
0ec5b27404
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
...
Conflicts:
CNTK.sln
2016-06-14 11:36:37 -07:00
Marco Fiscato
Qiwei Ye
Fei Gao
Friedel van Megen
Momcilo Vasilijevic
KeDengMS
Sasa Galic
Alexey Reznichenko
Zhou Wang
Eldar Akchurin
Project Philly
Mark Hillebrand
yuxiao.guo
Thilo Will
Amit Agarwal
Fei Gao
Frank Seide
Jasha Droppo
Wolfgang Manousek
Ivan Rodriguez
U-FAREAST\fseide
anthonyaue
Marko Radmilac