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
52ae07279d
CNTK custom MKL support
2016-06-14 17:39:24 +02:00
a47c3d877f
Temporarily add the CNTK v2 library tests as an end-to-end test. This will be switched to the BOOST unit test framework later when the framework is setup for linux too.
2016-06-13 09:45:51 -07:00
cc296fc0dc
Makefile: rename MAKEFILES -> BUILD_CONFIGURATION
...
MAKEFILES is special and automatically inherited in sub makes.
2016-06-13 16:08:40 +02:00
e875771784
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/cntkv2Library
...
Conflicts:
CNTK.sln
2016-06-12 09:14:03 -07:00
26c2006541
CNTKv2Library: Linux port
2016-06-11 16:50:26 -07:00
5d474c4d57
Renaming to HTKDeserializers
2016-06-06 15:23:39 +02:00
5d5d29ac6c
Fixing file type
2016-06-06 14:02:25 +02:00
3d5bfcab27
Fixing forgoten rename
2016-06-06 14:02:25 +02:00
290139c4d7
Renaming ExperimentalHTKMLFReader into HTKMLFDeserializer
2016-06-06 14:02:25 +02:00
5558144363
Merge remote-tracking branch 'origin/master' into jdroppo/cudnn-rnn-lstm
...
Conflicts:
Source/Math/Math.vcxproj
Source/Math/Math.vcxproj.filters
Source/Math/MathCUDA.vcxproj.filters
2016-05-20 11:20:07 -07:00
d3130e721a
Add a few improvements to CNTKTextFormatReader.
...
* Move caching into a stand-alone ChunkCache class.
Add a config flag 'keepDataInMemory' to cache the whole dataset.
* Allow both tabs and spaces as separators.
* Couple loading/indexing retries with file re-opening (if there was a
file error and the file handle is stale).
* Break 'randomize' config parameter into boolean 'randomize' and
integer 'randomizationWindow'.
* Add 'frameMode' config flag.
* Add an extra check and verify that the expected sequence length
(calculated during indexing) matches the actual length (maximum
number of samples in an input).
2016-05-18 15:50:04 +02:00
6b47558bfa
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Source/SGDLib/SGD.cpp
Source/SGDLib/SGD.h
2016-05-09 12:15:34 +08:00
f4204ce1cd
Change in dropout randomization implementation to ensure reproducability across checkpoints
2016-05-05 12:17:10 -07:00
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
29e464a96e
Merge branch 'master' of https://github.com/Microsoft/CNTK into erw/bm_rc
2016-05-02 11:57:31 -07:00
d87b1d4f3d
(Address CR feedback)
2016-05-02 11:51:25 -07:00
aadeb32304
Changes to enable Block Momentum release
...
(Adding an initial test case for Block Momentum)
2016-05-02 11:51:13 -07:00
63c7fad4c8
Add support for gcov code coverage builds
2016-05-02 09:48:46 -07:00
4cca2126a1
Fixing wrong reference file
2016-05-02 09:55:11 +02:00
61f2cc120a
Adapting the makefile
2016-05-02 09:55:11 +02:00
0b35c4646c
Add support for new CU
2016-04-28 12:06:34 -07:00
679b55df50
Merge branch 'master' into qiwye/asgd-dev
...
Conflicts:
Source/ActionsLib/ActionsLib.vcxproj
Source/Readers/HTKMLFReader/utterancesourcemulti.h
Source/SGDLib/SGDLib.vcxproj
2016-04-28 13:56:19 +08:00
0651892cc7
Do not create a new packer for each epoch
2016-04-22 11:33:31 +02:00
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
ca4afe5c67
Address review comments
2016-04-13 14:30:06 +02:00
d184028dbd
Address CR comment
2016-04-11 20:24:24 +01:00
2138dfc2f7
Makefile: Add Config.make to object dependencies
2016-04-11 09:19:45 +01:00
14de27d114
Enable sequences for sparse input.
...
Extend sequence and frame packers to support sparse input.
Create a tightly filled layout and base packing off of it.
Add a number of unit test for sequence packing (both sparse and
dense, no randomization, using CNTK text format for input).
2016-04-07 14:34:42 +02:00
e080d2c561
moved LearnableParameterNode implementation to a CPP file
2016-04-03 17:03:35 -07:00
7784350f29
merged with master
2016-04-03 00:59:10 -07:00
531f5538b6
updated seq-2-seq decoder to match updated training;
...
new operation Trace() (TraceNode) as a debugging aid;
WriteMinibatchWithFormatting() can now log by FrameRange;
WriteFormattingOptions now in ComputationNode.h
2016-04-02 23:29:40 -07:00
694a259991
Refactoring of bptt packer
2016-04-01 09:43:24 +02:00
0d23b5308d
Fixed merge issue in Makefile.
2016-03-30 10:00:49 -07:00
da0ef59e56
Updated Makefile and samples.
2016-03-30 10:00:36 -07:00
4faeca8c6f
Fixed gcc build issues.
2016-03-30 09:58:04 -07:00
4f38bb48eb
Linux: buildinfo.h-related fixes
...
Only update buildinfo.h if changed. Fix parameter passing in
Tools/generate_build_info.
2016-03-29 21:04:11 +02:00
c22f6cc950
Initial implementation for full utterance packer
2016-03-29 13:51:20 +02:00
f4432575ae
Makefile: fix dependency for buildinfo.h
...
* Use .d files for CNTK binary
* Pre-declare dependency for CNTK.o on buildinfo.h
2016-03-29 08:19:00 +01:00
e65ec4a1f5
Fixed LUSequenceReader build on linux: Added missing LUSequenceWriter.cpp file to the list of sources for the reader
2016-03-24 11:33:14 -07:00
f188493589
Merge branch 'master' of https://github.com/Microsoft/CNTK into fseide/pack
2016-03-22 09:00:59 -07:00
76543e8708
bug fix: InferMBLayoutFromInputsForStandardCase() must test isFinalValidationPass
2016-03-21 21:34:41 -07:00
0cdc149a2c
Updating makefile
2016-03-21 09:51:03 +01:00
40ea419e49
Refactoring of the randomizer into sequence and chunk ones
2016-03-21 09:51:03 +01:00
18fad62e74
Fix Linux
2016-03-21 09:51:03 +01:00
34531d8920
merged from master
2016-03-17 13:06:32 -07:00
23839659b8
Fix makefile (re-add lost changes)
2016-03-17 15:11:44 +01:00
527c61ba95
merged from master
2016-03-15 18:48:29 -07:00
f8be2e4eec
Renames SynchronouseExecutionEngine to NDLBuilderImpl
...
Renames SynchronousNodeEvaluator to NDLNodeEvaluatorImpl
Merges SynchronousExecutionEngine.h into NDLNetworkBuilder.h
Renames SynchronousExecutionEngine.cpp into NDLNetworkBuilder.cpp
2016-03-14 09:55:05 +01:00
576eeb5f87
Moves SynchronouseExecutionEngine to ActionsLib
2016-03-14 09:55:00 +01:00
75364c8936
Relocates Network building files from ComputationNetworkLib to ActionsLib.
2016-03-14 09:54:58 +01:00
e2f31ff658
Addresses CR : Rename NetworkCreator to NetworkFactory
2016-03-14 09:54:57 +01:00
27667a13d2
Make gcc happy
2016-03-14 09:54:33 +01:00
63c50f6364
added new node Where (only BS)
2016-03-11 16:57:14 -08:00
8a517d0c6d
added an experimental seq-2-seq auto-encoder
2016-03-06 17:40:58 -08:00
2ae9eea1a7
added first batch of BS standard operations
2016-03-06 00:25:39 -08:00
ecc8deb5b5
implemented include-path traversal for BrainScript and turned CNTK standard BS into an include file CNTK.core.bs;
...
bug fix for Issue #210 : PreComputeNodeBase must infer layout from input after loading;
ImageReader post-build events now consistently use xcopy
2016-03-05 21:27:04 -08:00
f7865837e3
Merge branch 'master' of https://github.com/Microsoft/CNTK into fseide/s2s
2016-03-01 13:32:44 -08:00
7ce997c726
Per Amit's suggestion, add NO_SYNC to debug build as well. Now it is consistent
...
with Windows build.
2016-03-01 11:29:10 -08:00
8bb5aa89e2
Turn NO_SYNC on in the release build.
2016-03-01 11:29:09 -08:00
5304784b6c
fixed NoGPU build re do_sync;
...
updated ExperimentalHTKMLFReader w.r.t. file naming
2016-02-29 21:27:49 -08:00
7d3e84e773
merged from master
2016-02-29 19:17:35 -08:00
67f12739bc
Fixed Issue #176 : random number used for random_shuffle() had an int overflow on gcc, which caused uncaught out-of-bounds accesses.
2016-02-29 11:58:13 -08:00
4d5566d5ac
Experimental HTKMLF Reader (currently only supports frame mode)
2016-02-29 15:54:39 +01:00
e54b352822
removed template parameter ElemType from (I)DataReader and (I)DataWriter
2016-02-28 19:01:07 -08:00
246907dbb6
Addressed code review comments.
2016-02-25 10:56:42 -08:00
5d6a468278
Fixed ImageReader Linux build.
2016-02-25 09:47:15 -08:00
bbf67cf03b
Added libzip support on Linux.
2016-02-25 09:47:14 -08:00
09dea188f5
Adds ExceptionWithCallStack class to wrap native exceptions (runtime_error, logic_error, invalid_arguent), so that the call stack can be provided to the managed layer.
...
Moves DebugUtil functions (PrintCallStack, GetCallStack) to ExceptionWithCallStack
Refactors the PrintCallStack and GetCallStack functions in ExceptionWithCallBack to re-use the common functionality.
Make gcc happy
2016-02-23 09:11:12 +01:00
1b9a83617f
Merge branch 'master' into qiwye/asgd-dev
2016-02-17 13:37:16 +08:00
c0a20b379d
Added SM3.0 to Linux Debug build. Added serialization of new fields to BN node.
2016-02-16 12:31:28 -08:00
b14d6576a2
make gcc happy for the multiverso lib
2016-02-15 21:01:04 +09:00
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
e1093b9537
Integrate f0d8a23b26 into master
2016-02-13 07:28:20 -08:00
e8ab337235
Refactored Makefile to include defines both to NVCC and g++.
2016-02-12 09:33:47 -08:00
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
6fe2f8e464
Merge branch 'master' into qiwye/multiverso
2016-02-03 19:31:38 +08:00
0e5ad89a15
Reapply fix in Makefile for SparsePCReader
...
Reapply name changes in Makefile that had been resolved but
got lost during excessive rebasing.
2016-02-03 01:15:34 -08:00
2251188bef
Fix ReaderLib.lib (and references)
2016-02-02 13:31:59 +01:00
93fb8d8283
Rename Source/Readers/{{New -> }ImageReader,Reader{ -> Lib}}
2016-02-02 13:24:37 +01:00
397614801c
Adding macros for the multiverso submodule
2016-02-02 19:11:02 +08:00
52d6444920
Add new image reader under new reader architecture
2016-02-02 11:30:15 +01:00
c69c2d50f2
Merge branch 'master' into qiwye/multiverso
2016-02-02 12:04:35 +08:00
69112d13c8
Simplified clean
2016-02-01 12:56:54 -08:00
31a212579e
Fix progress when epochsize is 0 and fix the git hash built into the exe
2016-02-01 12:56:47 -08:00
a8e807658f
Fix Merge Problem
2016-02-01 17:42:44 +01:00
Friedel van Megen
Mark Hillebrand
Thilo Will
feiga
Qiwei Ye
Zhou Wang
Amit Agarwal
Alexey Reznichenko
Fei Gao
Eldar Akchurin
Frank Seide
Project Philly
Jasha Droppo
Wolfgang Manousek
Ivan Rodriguez
U-FAREAST\fseide
anthonyaue
Marko Radmilac
Yongqiang Wang
Clemens Marschner
Alexey Kamenev
Alexey Kamenev
Gaizka Navarro
Ross Wightman
Chris Basoglu