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
3b3d8998a5
Fix reader on Linux
2016-02-01 17:42:43 +01:00
734baf94c7
Fix #define
...
Activate LibSparsePCReader on Linux build
Make file name consistent with Windows
Activate LibSparsePCReader on Linux build
Make file name consistent with Windows
Activate LibSparsePCReader on Linux build
Make file name consistent with Windows
Fix reader on Linux
Activate LibSparsePCReader on Linux build
Make file name consistent with Windows
Activate LibSparsePCReader on Linux build
Make file name consistent with Windows
Activate LibSparsePCReader on Linux build
Make file name consistent with Windows
Activate LibSparsePCReader on Linux build
Make file name consistent with Windows
2016-02-01 17:42:42 +01:00
0bbf3c4901
Fix reader on Linux
2016-02-01 17:42:38 +01:00
46ce1e55d3
Make file name consistent with Windows
2016-02-01 17:42:35 +01:00
bd0b68d11b
Activate LibSparsePCReader on Linux build
2016-02-01 17:42:34 +01:00
e514d1fb0c
Fixing linking against open cv 3.0
2016-02-01 13:47:59 +01:00
99cf8cbbbb
Merge branch 'master' into qiwye/multiverso
...
Conflicts:
Source/SGDLib/SGD.cpp
2016-02-01 11:14:55 +08:00
263a3176a0
Makefile: exit early if 1Bit-SGD headers not found in 1Bit-SGD build
2016-01-29 12:07:22 +00:00
c7bfebe740
Merge branch 'master' into qiwye/multiverso
2016-01-29 14:23:04 +08:00
7b495bdf9c
change makefile for Linux work with multiverso
2016-01-29 14:20:21 +08:00
cd1bb59125
Fixed wrong ld OpenCV path in Linux Makefile
2016-01-28 16:32:23 +01:00
f8d0d4b182
Merge branch 'master' into qiwye/multiverso
...
Conflicts:
Source/ActionsLib/ActionsLib.vcxproj
Source/CNTK/CNTK.vcxproj
Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
Source/EvalDll/EvalDll.vcxproj
Source/SGDLib/SGDLib.vcxproj
2016-01-28 22:41:07 +08:00
621637e5b3
Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/releaseModeCallStacks
2016-01-25 22:07:12 -08:00
aace504d8c
Added -g and -rdynamic compiler/linker options for release mode builds on linux to enable call stack generation in release builds
2016-01-25 21:55:48 -08:00
6446a2fa79
Merge branch 'master' into qiwye/multiverso
...
Conflicts:
.gitignore
CNTK.sln
Source/CNTK/CNTK.cpp
Source/CNTK/CNTK.vcxproj
Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
Source/EvalDll/EvalDll.vcxproj
Source/SGDLib/SGD.cpp
Source/SGDLib/SGD.h
Source/SGDLib/SGDLib.vcxproj
Source/SGDLib/SGDLib.vcxproj.filters
2016-01-25 16:56:12 +08:00
6d31cda88a
removed two more Multinetworks configs from SimpleNetworkBuilder
2016-01-22 09:42:57 -08:00
89a2b0dac0
Fixed Linux Makefile error message
2016-01-22 16:27:50 +01:00
e32329a85c
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/separate1bitDataParallelSGD
2016-01-15 00:08:17 -08:00
135b992df9
fixed Linux Makefile wrt deleted files
2016-01-14 09:06:40 +01:00
18528f15b4
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/separate1bitDataParallelSGD
2016-01-13 22:43:27 -08:00
9cf113de6f
Made 1bit support an optionally configurable build option for CNTK which is off by default
2016-01-13 14:29:19 -08:00
ba61abd79e
Disable popups on Windows
2016-01-13 10:11:28 -08:00
6c2ee1aa51
Merge branch 'master' into qiwye/multiverso
...
Conflicts:
Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
Source/SGDLib/SGDLib.vcxproj
Source/SGDLib/SGDLib.vcxproj.filters
2016-01-07 16:57:09 +08:00
21fceca779
Fixed linux build
2016-01-06 19:00:13 -08:00
96e03050a6
Fixed linux build error
2016-01-05 10:42:38 -08:00
da8f560043
made gcc happy
2015-12-28 20:03:50 -08:00
9664daccb0
Merge branch 'master' into qiwye/multiverso
2015-12-19 12:43:46 +08:00
679c3c5298
Source/Readers/LMSequenceReader/: also build SequenceWriter on Linux
2015-12-18 11:59:40 +00:00
254b45e680
Merge branch 'master' into qiwye/multiverso
...
Conflicts:
Source/CNTK/CNTK.vcxproj
Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
Source/EvalDll/EvalDll.vcxproj
Source/SGDLib/SGDLib.vcxproj
Source/SGDLib/SGDLib.vcxproj.filters
2015-12-17 10:35:08 +08:00
3ab0ddace2
Fix for LibSVMBinaryReader to add prefetching, microbatches, and Linux support.
2015-12-16 12:13:38 -08:00
a9c4922a5e
Makefile: adapt to new location of generate_build_infop script
2015-12-16 14:24:49 +00:00
caf67c74fc
Adapt Linux build
2015-12-16 08:05:32 +00:00
aec884a4d3
started the TensorView class by adding header and CPP to math lib
2015-12-15 15:02:43 -08:00
1d12689b58
Merge branch 'qiwye/dev' into qiwye/multiverso
2015-12-15 14:31:49 +08:00
b8eb51d4a3
Fix kaldi Reader. 1) Using the new MBLayout interface. 2) Modify the configParameter to configRecordType to consistent with HTKMLFReader. 3) Clean the warning message. Next: refactor to make it consistent with HTKMLFReader.
2015-12-14 11:00:20 -05:00
254b04c9b5
cudnn: added OpenCV libs to Linux build.
2015-12-12 10:00:01 -08:00
3023f11e6e
cudnn: enabled build on Linux with cuDNN.
2015-12-12 09:59:09 -08:00
07e48cd667
adding runtime libraries
2015-12-12 18:27:55 +09:00
896b0476a0
renamed commandArgUtil.h to Config.h and ConfigFile.cpp to Config.cpp;
...
bug fix in previous refactoring of sub-minibatching
2015-12-04 22:31:47 -08:00
0eb77f8e2f
Step 2 of moving LSTMNode to EsotericNodes.h: deleted it from RecurrentNodes.h;
...
made gcc happy
2015-12-04 20:56:33 -08:00
93a0872069
Added NDEBUG to Linux Release build.
2015-12-03 11:20:50 -08:00
e3a8caca88
add NVMLPATH to the linking target cntk for the libnvidia-ml.so
2015-11-26 07:34:37 -05:00
77da34e8d5
Added call stack printing functionality for Linux
2015-11-25 17:20:56 -08:00
377c8223d4
Fix a bug in Scripts/genrate_build_info
2015-11-24 21:34:30 -08:00
33cf6a013f
Enable PrintBuildInfo for both Windows and Linux
2015-11-24 16:38:37 -08:00
ab0dcf3434
simplified DeviceFromConfig() by removing PTasks-specific configuration options. Also added an overload for BrainScript;
...
added a dummy DataReader constructor from BrainScript (currently not implemented);
had to disable DelayLoadNofify() as that suddenly caused link errors (seems because DeviceFromConfig() is now called from a different place?);
further unified DoTrain() w.r.t. old CNTK config and BrainScript. Added a new BrainScriptBuilder (but the builders will go away next and get replaced by a lambda). DoTrain now accessible from BS (but not functional yet, too many pieces missing);
all builders now can be constructed from both old ConfigParameters and BrainScript IConfigRecord;
suddenly gcc got very picky, had to fix several places
2015-11-21 00:16:36 -08:00
ae778f6be4
added more scaffolding (empty CPP files) for moving actions to CNTKActionsLib. Updated Linux Makefile
2015-11-17 23:22:33 -08:00
1a754b968c
Eliminated NetworkBuilderFromConfig.cpp. Instead, the few surviving lines--the lines registering ComputationNode as a scriptable object--are now in ComputationNode.cpp;
...
fixed Linux Makefile after change of GPUMatrixCUDAKernels.cu to GPUMatrixCUDAKernels.cuh. It used to explicitly compile this in the GCC build, although it was included
2015-11-17 22:37:43 -08:00
4036a52f63
BrainScript: ComputationNetwork can now construct itself from BS (the special MakeRuntimeObject() function is gone);
...
new source file ComputationNetworkScripting.cpp;
changed ComputationNetwork::SetDeviceId(). Now just takes the input and sets that as the device. Before it did somethinf funky with m_deviceId, which looks like a bug;
in LSTM test config, removed remnants of old NDL, now completely based on BS
2015-11-16 09:57:01 -08:00
3b2068ead6
added CNTKActionsLib to Linux include path;
...
moved DisableLegacyTruncationSettings() away from being the very first piece of code in CNTK.cpp, hiding it close to where it is used. Also fixed its spelling and made it 'static'
2015-11-12 13:23:54 -08:00
88026d547c
Fix two perf problems
...
1. On Linux, use ACML MP as default ACML library.
2. For the parallel end-to-end tests, limit concurrency based on
available hardware threads.
2015-11-05 22:15:51 +01:00
f2db77795e
Applying workaround for race condition in OpenMPI on non-0 exit code from CNTK
2015-10-30 16:16:09 -07:00
525f9be994
moved memshare functions from header to ComputationNetworkEvaluation.cpp;
...
created new ComputationNetworkEditing.cpp
2015-10-30 10:35:12 -07:00
c3328c00fa
moved sets of functions from ComputationNetwork.cpp to ComputationNetworkEvaluation.cpp and ComputationNetworkAnalysis.cpp
2015-10-30 10:05:12 -07:00
9d26bfdcd9
Fix build for NoGPU.
2015-10-28 20:59:52 -04:00
69ccd3f64c
Remove debug info generation option for CUDA compilation in debug flavor builds and also enable fast-math optimizations . These changes have been done to eliminate differences in GPU results for the E2E tests between debug and release flavors. Setting environment variable CNTK_CUDA_DEVICE_DEBUGINFO=1 will enable debug info generation. The baselines for all E2E tests have also been updated in accordance with this change
2015-10-24 14:34:01 -07:00
4777f5f7d3
Rename SequenceTraining project to CNTKSequenceTrainingLib to be consistent with other libs
2015-10-18 12:40:43 -07:00
bb62af7d13
ImageReader fixes for Linux build.
2015-10-14 12:30:11 -07:00
78d2e0ba68
Add CUB path.
2015-10-14 12:29:51 -07:00
9a4c84beb4
Fixed Linux build
2015-10-09 23:54:37 -07:00
d6ae0b0adc
Merge remote-tracking branch 'remotes/origin/master' into guoguo/linuxBuildFix
2015-10-07 18:19:11 -04:00
b7d9ab9737
Refactor SequenceTraining to support CPUONLY.
2015-10-07 10:35:31 -07:00
1b01fd6965
more cleanup on when Resize() ops are done;
...
renamed SimpleEvaluator::PreCompute() to EvaluateBatchModeNodes() because the original name was misleading;
Linux Makefile now defines _DEBUG in debug builds
2015-10-06 14:02:45 -07:00
ac70bfe47c
fixing linux build for master branch; removed duplicated files in KaldiReader and Kaldi2Reader
2015-09-30 18:02:05 -04:00
e736be8b6e
Port the Sequence trainign code to Linux
2015-09-25 17:22:58 -07:00
3212a55b35
Merge branch 'master' of https://git01.codeplex.com/forks/srehpycs/mitsls into srehpycs/mitsls
2015-09-24 10:50:00 -07:00
f6acb1033e
Add env vars to control CUDA codegen.
2015-09-17 16:57:26 -07:00
c5c1537bd4
Change CUDA settings for Debug builds.
2015-09-17 16:37:00 -07:00
a654b6e3d5
Eradicate all possible warnings from g++
...
Replace hash_map with unordered_map
Fix size_t formatting (%zd)
Add some missing sprintf_s args
Some methods defined in base class need the base mentioned in templates
Don't use classname::methodname in class definitions
2015-09-17 16:00:48 -04:00
9878959e3d
Merge remote-tracking branch 'cntk/master' into merge
2015-09-17 09:32:17 -04:00
1a9908bc8e
Moved the parallel trainign guard when writing model/checkpoint files to the actual save functions instead of guarding at the call sites
2015-09-15 21:04:09 -07:00
54a6b1d2ec
made gcc happy again (mostly missing headers or wrong declaration orders);
...
Makefile adapted to new paths, but not yet building Network and SGD as separate libs
2015-09-06 09:20:28 -07:00
a4c32ac19f
CNTKEval now builds (missed the new .cpp files)
2015-09-03 19:15:00 -07:00
3066a16fe9
moved most <ElemType>-dependent functions out of ComputationNetwork into a ComputationNetworkBuilder class (added two files);
...
fixed the slew of dependencies, mostly SimpleNetworkBuilder.cpp;
ComputationNetwork no longer has to include all headers for all vairants of ComputationNodes;
a few ComputationNode derivates missed #includes
2015-09-03 18:41:59 -07:00
1219c24f60
Merge branch 'master' into fseide/bs
2015-09-03 15:05:46 -07:00
a4c480fd92
Merge branch 'master' into fseide/bs
...
Conflicts:
Math/Math/NoGPU.cpp
2015-09-03 13:50:03 -07:00
4bbcca453e
NVCC warnings as errors
2015-09-03 13:30:30 -07:00
fe3346b0bf
Cleanup warnings in Linux
2015-09-03 09:24:03 -07:00
8705dd0f02
Merge remote-tracking branch 'origin' into fseide/bs
...
Conflicts:
DataReader/HTKMLFReader/ssematrix.h
Math/Math/CUDAPageLockedMemAllocator.cpp
Math/Math/Matrix.cpp
Math/Math/NoGPU.cpp
Math/Math/ValueQuantizer.h
2015-09-02 10:12:15 -07:00
67464d22e0
some fixes to make gcc happy (one still missing);
...
somehow git lost 'Makefile'--readding, hoping it won't confuse the merge process
2015-09-02 08:43:31 -07:00
d4c3e4afb0
added BS to Linux Makefile--with lots of fallout that needs to be fixed
2015-09-01 13:44:20 -07:00
8e85f07de3
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/mergeHTKMLFReaders
2015-09-01 13:27:19 -07:00
1df4e8e5e1
Merge the linux and windows forks of the HTKMLFReader fork into one.
2015-09-01 13:09:57 -07:00
19506bc123
Merge remote-tracking branch 'cntk/master'
2015-09-01 13:57:24 -04:00
7915fef15d
Fixed CPUONLY build
2015-09-01 00:06:38 -07:00
025e1323cd
added BrainScript to Linux Makefile INCLUDEPATH
2015-08-31 21:06:28 -07:00
7697c39294
Merge remote-tracking branch 'cntk/master'
2015-08-28 13:36:11 -04:00
acd24c738e
Addressed code review feedback
2015-08-17 14:48:06 -07:00
ec14fd97b8
Cleanups, README improvements, missing Makefile dependency
...
Remove the no longer needed kaldi Makefiles.
Fix some pre-configure references in the README that were missed, add
a missing step to the build instructions, remove some obsolete
information, be more specific about the acml library that works, and
reword a few sentences.
Add math library dependencies to the kaldi plugins so that make -j
doesn't try to build them before the math library is finished.
2015-08-11 16:58:18 -04:00
1b025bc529
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/parallelTraining
...
Conflicts:
MachineLearning/CNTK/SGD.h
Makefile
2015-08-11 10:36:15 -07:00
0ebdaedb35
Add a configure script for setting build parameters
...
Add a configure script for initializing build parameters, either
for in or out of source builds. The script generates a Config.make
in the build directory, and, for out of source builds, a trampoline
Makefile.
Make the build-and-test script to do an out of source build.
Add Config.make to .gitignore, as well as emacs temporary file patterns.
2015-08-07 13:03:27 -04:00
404f167938
Use original build targets when PREFIX is not supplied.
2015-08-06 15:28:56 -04:00
c54a045de2
Remove site-specific paths from Makefile.
...
Change configuration to build to a specific PREFIX directory, where
a Config.make is located that contains build and site-specific information.
This also makes it easy to check just how an earlier build was configured.
Update the instructions in README.
2015-08-06 12:41:57 -04:00
25f8594d6e
Simplified unified CPU/GPU/Kaldi Makefile
...
Modularize build specifications for each target, where each target
adds what it needs to paths.
Add rpath to cntkmath and plugins so they do not need LD_LIBRARY_PATH.
Remove object files from cntk that were already in cntkmath.
Organize build targets into UNIX-like bin and lib directories under a
configuration-specific directory. Have .gitignore ignore these
directories.
Make it easy to keep sources in alphabetic order for easier comparison
with the Windows project definition.
2015-08-05 18:46:31 -04:00
64fae7a0bc
Implementation of data-parallel SGD with 1bit quantization of gradients for reduced communication costs
2015-08-05 09:23:33 -07:00
f5634aff70
Add the appropriate math -rpath to shared libraries link.
2015-07-30 13:35:50 -04:00
1fb5918b13
Implement minibatch prefetching
...
This change implements a read-ahead (prefetch) of one minibatch on a separate thread to ensure that main thread always has enough work. This is done through coarse-level parallelism, where GetMinibatch is called from a separate thread and result is cached for main thread to consume. The synchronization is a simple producer/consumer model with a single mutex and a conditional variable.
This change also modifies how we measure time it takes to read and compute a minibatch worth of data.
2015-07-15 11:57:06 -07:00
db64969c51
Add lib path for NVML, remove redundant lib references
2015-07-02 10:53:26 -07:00
c20ee5b882
Create common makefile, and remove cpu and gpu specific makefiles. Also do some cleanup.
2015-06-24 13:59:05 -07:00
Amit Agarwal
Eldar Akchurin
Jasha Droppo
Alexey Reznichenko
Qiwei Ye
Yongqiang Wang
Marko Radmilac
Clemens Marschner
Mark Hillebrand
Frank Seide
Alexey Kamenev
Alexey Kamenev
U-FAREAST\fseide
Gaizka Navarro
Project Philly
Ross Wightman
Chris Basoglu
Alexey Orlov
Philipp Kranen
thhoens
yzhang87
Vladimir Ivanov
Alexey
Guoguo Chen
Scott Cyphers