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

188 Коммитов

Автор SHA1 Сообщение Дата
Clemens Marschner 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
Clemens Marschner 0bbf3c4901 Fix reader on Linux 2016-02-01 17:42:38 +01:00
Clemens Marschner 46ce1e55d3 Make file name consistent with Windows 2016-02-01 17:42:35 +01:00
Clemens Marschner bd0b68d11b Activate LibSparsePCReader on Linux build 2016-02-01 17:42:34 +01:00
Eldar Akchurin e514d1fb0c Fixing linking against open cv 3.0 2016-02-01 13:47:59 +01:00
Mark Hillebrand 263a3176a0 Makefile: exit early if 1Bit-SGD headers not found in 1Bit-SGD build 2016-01-29 12:07:22 +00:00
Alexey Orlov cd1bb59125 Fixed wrong ld OpenCV path in Linux Makefile 2016-01-28 16:32:23 +01:00
Amit 621637e5b3 Merge branch 'master' of https://github.com/Microsoft/CNTK into amitaga/releaseModeCallStacks 2016-01-25 22:07:12 -08:00
Amit 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
Frank Seide 6d31cda88a removed two more Multinetworks configs from SimpleNetworkBuilder 2016-01-22 09:42:57 -08:00
Alexey Orlov 89a2b0dac0 Fixed Linux Makefile error message 2016-01-22 16:27:50 +01:00
Amit Agarwal e32329a85c Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/separate1bitDataParallelSGD 2016-01-15 00:08:17 -08:00
Philipp Kranen 135b992df9 fixed Linux Makefile wrt deleted files 2016-01-14 09:06:40 +01:00
Amit Agarwal 18528f15b4 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/separate1bitDataParallelSGD 2016-01-13 22:43:27 -08:00
Amit 9cf113de6f Made 1bit support an optionally configurable build option for CNTK which is off by default 2016-01-13 14:29:19 -08:00
Marko Radmilac ba61abd79e Disable popups on Windows 2016-01-13 10:11:28 -08:00
Amit 21fceca779 Fixed linux build 2016-01-06 19:00:13 -08:00
Amit 96e03050a6 Fixed linux build error 2016-01-05 10:42:38 -08:00
Frank Seide da8f560043 made gcc happy 2015-12-28 20:03:50 -08:00
Mark Hillebrand 679c3c5298 Source/Readers/LMSequenceReader/: also build SequenceWriter on Linux 2015-12-18 11:59:40 +00:00
thhoens 3ab0ddace2 Fix for LibSVMBinaryReader to add prefetching, microbatches, and Linux support. 2015-12-16 12:13:38 -08:00
Mark Hillebrand a9c4922a5e Makefile: adapt to new location of generate_build_infop script 2015-12-16 14:24:49 +00:00
Mark Hillebrand caf67c74fc Adapt Linux build 2015-12-16 08:05:32 +00:00
Frank Seide aec884a4d3 started the TensorView class by adding header and CPP to math lib 2015-12-15 15:02:43 -08:00
yzhang87 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
Alexey Kamenev 254b04c9b5 cudnn: added OpenCV libs to Linux build. 2015-12-12 10:00:01 -08:00
Alexey Kamenev 3023f11e6e cudnn: enabled build on Linux with cuDNN. 2015-12-12 09:59:09 -08:00
Frank Seide 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
Frank Seide 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
Alexey Kamenev 93a0872069 Added NDEBUG to Linux Release build. 2015-12-03 11:20:50 -08:00
Qiwei Ye e3a8caca88 add NVMLPATH to the linking target cntk for the libnvidia-ml.so 2015-11-26 07:34:37 -05:00
Amit 77da34e8d5 Added call stack printing functionality for Linux 2015-11-25 17:20:56 -08:00
Yongqiang Wang 377c8223d4 Fix a bug in Scripts/genrate_build_info 2015-11-24 21:34:30 -08:00
Yongqiang Wang 33cf6a013f Enable PrintBuildInfo for both Windows and Linux 2015-11-24 16:38:37 -08:00
Frank Seide 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
Frank Seide ae778f6be4 added more scaffolding (empty CPP files) for moving actions to CNTKActionsLib. Updated Linux Makefile 2015-11-17 23:22:33 -08:00
Frank Seide 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
Frank Seide 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
Frank Seide 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
Mark Hillebrand 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
Vladimir Ivanov f2db77795e Applying workaround for race condition in OpenMPI on non-0 exit code from CNTK 2015-10-30 16:16:09 -07:00
Frank Seide 525f9be994 moved memshare functions from header to ComputationNetworkEvaluation.cpp;
created new ComputationNetworkEditing.cpp
2015-10-30 10:35:12 -07:00
Frank Seide c3328c00fa moved sets of functions from ComputationNetwork.cpp to ComputationNetworkEvaluation.cpp and ComputationNetworkAnalysis.cpp 2015-10-30 10:05:12 -07:00
Yu 9d26bfdcd9 Fix build for NoGPU. 2015-10-28 20:59:52 -04:00
Amit 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
Amit Agarwal 4777f5f7d3 Rename SequenceTraining project to CNTKSequenceTrainingLib to be consistent with other libs 2015-10-18 12:40:43 -07:00
Alexey Kamenev bb62af7d13 ImageReader fixes for Linux build. 2015-10-14 12:30:11 -07:00
Alexey 78d2e0ba68 Add CUB path. 2015-10-14 12:29:51 -07:00
Amit 9a4c84beb4 Fixed Linux build 2015-10-09 23:54:37 -07:00
Guoguo Chen d6ae0b0adc Merge remote-tracking branch 'remotes/origin/master' into guoguo/linuxBuildFix 2015-10-07 18:19:11 -04:00
Alexey Kamenev b7d9ab9737 Refactor SequenceTraining to support CPUONLY. 2015-10-07 10:35:31 -07:00
Frank Seide 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
Guoguo Chen ac70bfe47c fixing linux build for master branch; removed duplicated files in KaldiReader and Kaldi2Reader 2015-09-30 18:02:05 -04:00
Amit e736be8b6e Port the Sequence trainign code to Linux 2015-09-25 17:22:58 -07:00
Amit Agarwal 3212a55b35 Merge branch 'master' of https://git01.codeplex.com/forks/srehpycs/mitsls into srehpycs/mitsls 2015-09-24 10:50:00 -07:00
Alexey Kamenev f6acb1033e Add env vars to control CUDA codegen. 2015-09-17 16:57:26 -07:00
Alexey Kamenev c5c1537bd4 Change CUDA settings for Debug builds. 2015-09-17 16:37:00 -07:00
Scott Cyphers 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
Scott Cyphers 9878959e3d Merge remote-tracking branch 'cntk/master' into merge 2015-09-17 09:32:17 -04:00
Amit Agarwal 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
Frank Seide 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
Frank Seide a4c32ac19f CNTKEval now builds (missed the new .cpp files) 2015-09-03 19:15:00 -07:00
Frank Seide 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
U-FAREAST\fseide 1219c24f60 Merge branch 'master' into fseide/bs 2015-09-03 15:05:46 -07:00
Frank Seide a4c480fd92 Merge branch 'master' into fseide/bs
Conflicts:
	Math/Math/NoGPU.cpp
2015-09-03 13:50:03 -07:00
Marko Radmilac 4bbcca453e NVCC warnings as errors 2015-09-03 13:30:30 -07:00
Marko Radmilac fe3346b0bf Cleanup warnings in Linux 2015-09-03 09:24:03 -07:00
Frank Seide 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
Frank Seide 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
Frank Seide d4c3e4afb0 added BS to Linux Makefile--with lots of fallout that needs to be fixed 2015-09-01 13:44:20 -07:00
Amit Agarwal 8e85f07de3 Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/mergeHTKMLFReaders 2015-09-01 13:27:19 -07:00
Amit Agarwal 1df4e8e5e1 Merge the linux and windows forks of the HTKMLFReader fork into one. 2015-09-01 13:09:57 -07:00
Scott Cyphers 19506bc123 Merge remote-tracking branch 'cntk/master' 2015-09-01 13:57:24 -04:00
Amit Agarwal 7915fef15d Fixed CPUONLY build 2015-09-01 00:06:38 -07:00
Frank Seide 025e1323cd added BrainScript to Linux Makefile INCLUDEPATH 2015-08-31 21:06:28 -07:00
Scott Cyphers 7697c39294 Merge remote-tracking branch 'cntk/master' 2015-08-28 13:36:11 -04:00
Amit Agarwal acd24c738e Addressed code review feedback 2015-08-17 14:48:06 -07:00
Scott Cyphers 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
Amit Agarwal 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
Scott Cyphers 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
Scott Cyphers 404f167938 Use original build targets when PREFIX is not supplied. 2015-08-06 15:28:56 -04:00
Scott Cyphers 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
Scott Cyphers 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
Amit Agarwal 64fae7a0bc Implementation of data-parallel SGD with 1bit quantization of gradients for reduced communication costs 2015-08-05 09:23:33 -07:00
Scott Cyphers f5634aff70 Add the appropriate math -rpath to shared libraries link. 2015-07-30 13:35:50 -04:00
Marko Radmilac 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
Alexey Kamenev db64969c51 Add lib path for NVML, remove redundant lib references 2015-07-02 10:53:26 -07:00
Marko Radmilac c20ee5b882 Create common makefile, and remove cpu and gpu specific makefiles. Also do some cleanup. 2015-06-24 13:59:05 -07:00