Qiwei Ye
edc2dd81e8
adding predefine macro for linux with ASGD support
2016-02-16 15:46:04 +08:00
Qiwei Ye
a3cafdc8a3
debug info in actor
2016-02-16 15:29:36 +09:00
Qiwei Ye
fed7415461
Revert "debug check,. WARNING: should be revert later"
...
This reverts commit da13c84d9d
.
2016-02-16 13:28:40 +08:00
Qiwei Ye
8d6da277e1
update multiverso submodule to latest version
2016-02-16 12:38:10 +08:00
Qiwei Ye
da13c84d9d
debug check,. WARNING: should be revert later
2016-02-16 11:47:37 +08:00
Qiwei Ye
83a60750d7
Adding prebuild info for windows building
2016-02-16 11:21:30 +08:00
Qiwei Ye
b14d6576a2
make gcc happy for the multiverso lib
2016-02-15 21:01:04 +09:00
Qiwei Ye
c2c0bea959
Merge branch 'master' into qiwye/asgd-dev
2016-02-15 10:28:14 +08:00
vmazalov
11f11b1b05
Add printMetadata config to documentation for the dumpNode top-level command.
2016-02-14 17:23:37 -08:00
Project Philly
f89e5444a9
Integrate AddPrintMetadataFlag into master
2016-02-14 09:31:17 -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
Qiwei Ye
f3f543f2ea
Pass the build with IMultiverso
2016-02-14 11:49:21 +08:00
Project Philly
e1093b9537
Integrate f0d8a23b26
into master
2016-02-13 07:28:20 -08:00
Project Philly
d2b84a56c9
Integrate mahilleb/WindowsCpuOnlyTest into master
2016-02-13 05:54:40 -08:00
Alexey Kamenev
6ff885a228
Fixed build warning.
2016-02-12 11:43:40 -08:00
Alexey Kamenev
19b0c82f4b
Addressed code review feedback.
2016-02-12 11:34:03 -08:00
Mark Hillebrand
9d6f68f939
Enable Windows CPU-only end-to-end tests (empty commit)
2016-02-12 20:33:14 +01:00
Alexey Kamenev
fe997dbbca
Fix for printf warning.
2016-02-12 09:34:31 -08:00
Alexey Kamenev
03e8cc5266
Addressed code review feedback.
2016-02-12 09:34:17 -08:00
Alexey Kamenev
e12427dbbb
Fix for name resolution.
2016-02-12 09:34:02 -08:00
Alexey Kamenev
e8ab337235
Refactored Makefile to include defines both to NVCC and g++.
2016-02-12 09:33:47 -08:00
Alexey Kamenev
e25e5489b9
Added SM30 config to MathCuda Debug build defaults.
2016-02-12 09:33:32 -08:00
Alexey Kamenev
958f634fd4
Fixed builds.
2016-02-12 09:33:18 -08:00
Alexey Kamenev
820cfc2001
Fixed bug with BN engine param name in BS and fixed CPU build.
2016-02-12 09:33:03 -08:00
Alexey Kamenev
11fe2c64b0
Added eps and engine parameters to BN node.
2016-02-12 09:32:49 -08:00
Alexey Kamenev
9ad6147e80
Batch norm: added epsilon as parameter, enabled run mean/invstddev.
2016-02-12 09:32:35 -08:00
Alexey Kamenev
1379f58564
Added convolutional implementation for batch norm.
2016-02-12 09:32:21 -08:00
Alexey Kamenev
5846fae253
Improved BN unit tests.
2016-02-12 09:32:07 -08:00
Alexey Kamenev
21575f3618
Added batch norm per-activation backprop implementation.
2016-02-12 09:31:53 -08:00
Alexey Kamenev
4e9483b0ac
Added batch norm per-activation feed forward implementation.
2016-02-12 09:31:39 -08:00
Project Philly
6465c8018c
Integrate mahilleb/02_Convolution_Unstable into master
2016-02-12 08:14:42 -08:00
Mark Hillebrand
4e8c3e7edc
Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution: unstable on Windows
2016-02-12 16:44:58 +01:00
Project Philly
7d248101a3
Integrate mahilleb/TestDriverWinCpuonly into master
2016-02-12 07:01:12 -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
Amit Agarwal
9386b8d310
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/htkmlfreaderMemoryOptimizations
2016-02-11 10:50:57 -08:00
Amit Agarwal
e511c9d18b
Addressed CR feedback
2016-02-11 10:50:49 -08:00
Mark Hillebrand
7652ef06a2
Merge pull request #90 from felixonmars/patch-1
...
Fix a typo: lanugage -> language
2016-02-11 16:17:21 +01:00
Project Philly
c3607173e5
Integrate mahilleb/Msbuild2 into master
2016-02-11 05:27:19 -08:00
Eldar Akchurin
416577f953
Fixing the AV for the partial minibatch
2016-02-11 10:54:25 +01:00
Project Philly
c4ba87d832
Integrate cd4808e
into master
2016-02-11 00:41:16 -08:00
Amit Agarwal
58c768b4b3
Temporarily retained old memory inefficient frame randomization for side by side testing. The old randomization is off by default and can be switched on using a config setting minimizeReaderMemoryFootprint=false
2016-02-10 15:26:58 -08:00
Amit Agarwal
3021ad016a
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/htkmlfreaderMemoryOptimizations
2016-02-10 11:53:23 -08:00
Mark Hillebrand
4a3b6ea266
Tests/TestDriver.py: pick up Windows CPU-only binaries from x64/{Debug,Release}_CpuOnly
2016-02-10 17:52:49 +01:00
Mark Hillebrand
73b27efc52
Address CR comments
2016-02-10 12:18:24 +01:00
Mark Hillebrand
1b29d2fd69
.vcxproj: let intermediate output go into a common directory
...
Fixes #12 .
2016-02-10 09:10:07 +01:00
Mark Hillebrand
2c2a721fa8
CNTK.Cpp.props: define properties to distinguish build flavors and use them
2016-02-10 09:05:31 +01:00
Mark Hillebrand
ea55623979
Introduce CNTK.Cpp.props and load in every .vcxproj
2016-02-10 09:05:31 +01:00
Mark Hillebrand
52aad32084
.vcxproj: drop include path $(VCInstallDir)atlmfc\include
2016-02-10 09:05:31 +01:00
Mark Hillebrand
9c8022006d
.vcxproj: remove HTKMLFReader IncludePath where not needed
2016-02-10 09:05:31 +01:00
Mark Hillebrand
3b979f877a
.vcxproj: coalesce importing for .user.props for Debug / Release
2016-02-10 09:05:31 +01:00