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

100 Коммитов

Автор SHA1 Сообщение Дата
Alexey Kamenev c0a20b379d Added SM3.0 to Linux Debug build. Added serialization of new fields to BN node. 2016-02-16 12:31:28 -08:00
Project Philly e1093b9537 Integrate f0d8a23b26 into master 2016-02-13 07:28:20 -08:00
Alexey Kamenev e8ab337235 Refactored Makefile to include defines both to NVCC and g++. 2016-02-12 09:33:47 -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
Clemens Marschner 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
Mark Hillebrand 2251188bef Fix ReaderLib.lib (and references) 2016-02-02 13:31:59 +01:00
Mark Hillebrand 93fb8d8283 Rename Source/Readers/{{New -> }ImageReader,Reader{ -> Lib}} 2016-02-02 13:24:37 +01:00
Mark Hillebrand 52d6444920 Add new image reader under new reader architecture 2016-02-02 11:30:15 +01:00
Chris Basoglu 69112d13c8 Simplified clean 2016-02-01 12:56:54 -08:00
Chris Basoglu 31a212579e Fix progress when epochsize is 0 and fix the git hash built into the exe 2016-02-01 12:56:47 -08:00
Clemens Marschner a8e807658f Fix Merge Problem 2016-02-01 17:42:44 +01:00
Clemens Marschner 3b3d8998a5 Fix reader on Linux 2016-02-01 17:42:43 +01:00
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