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

65 Коммитов

Автор SHA1 Сообщение Дата
Dong Yu 9a90db4f91 Merge branch 'master' of https://git01.codeplex.com/cntk into linux-gcc 2015-07-20 16:57:26 -07:00
Amit Agarwal 44b0f56024 Added /bigobj option to CNTKEval.vcxproj to address the 'too many sections' compiltation error in that project 2015-07-19 12:02:30 -07:00
Dong Yu c5e68c9134 changed feature packing flag names from utteranceXYZ and sentence_XYZ to SequenceXYZ to make them consistent and be understood for both speech and text people.
Added flag to indicate the condition of no feature (with assumption that there is also no label)  to support efficient bi-directional model training.
Updated the windows version of HTKMLFReader, LM and LU Sequence readers.
Caution: this change will not allow for using past and future label information in the recurrent networks. The ultimate solution is to have a flag for each feature read-in. However, this will require huge change and we will do this after reader refactorization to reduce effort.
2015-07-18 17:28:14 -07:00
chenguoguo 482d24c88b Merge branch 'master' to 'linux-gcc' 2015-07-17 23:42:22 +00:00
erw 6d88882872 Keep m_SentenceBoundary always in CPU memory; Make CNTKEval compatible with the current SetenceBoundary setting change. 2015-07-16 21:32:00 -07:00
kaisheny cfa38b1e63 use pointer to refer to networks and nodes. 2015-07-13 09:33:54 -07:00
kaisheny ae71cc6ff7 Supporting multinetwork SGD. Return pointer instead of reference for network functions, including OutputNodes, InputNodes, etc. SetActualMiniBatchSize also has a vector of ComputationNodePtr of feature nodes so that those feature nodes can have function column size set according to minibatch size. Added PairNodes interface for ComputationNetwork and serialize this for MultiNetwork SGD. SimpleEvaluator to use pointer to refer nodes and networks. 2015-07-11 21:41:50 -07:00
erw 3e7af618be Allow CNTKEval to set number of CPU threads in Init
The current CNTKEval use default numbers of CPU threads. This can be
problematic if we run parallel decoding jobs on CPU farm. This commits allows
callers to set number of CPU threads via config string  "numCPUThreads=xx" and
the default number of threads is 1.
2015-07-09 16:49:48 -07:00
Vladimir Ivanov 86aea900d1 Build braek fix 2015-07-08 15:49:16 -07:00
Yu 3207aa7257 Fix non-sequence reader. 2015-07-08 16:52:44 -04:00
Yu Zhang 3d7b6b91b1 Merge remote-tracking branch 'origin/master' into linux-gcc
Conflicts:
	CNTK.sln
	Common/Include/Basics.h
	DataReader/HTKMLFReader/HTKMLFReader.cpp
	DataReader/HTKMLFReader_linux/HTKMLFReader.cpp
	DataReader/KaldiReader/HTKMLFReader.cpp
	MachineLearning/CNTK/ComputationNetwork.h
	MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
	MachineLearning/CNTK/NonlinearityNodes.h
	MachineLearning/CNTK/SynchronousExecutionEngine.h
2015-07-01 23:35:59 -07:00
Frank Seide 34a2bbdcd1 renamed myRank and numProcs to mpiRank and mpiNumProcesses, respectively (myRank is only understood by people who know MPI) 2015-06-29 16:10:37 -07:00
erw de00815626 Fix a minor bug in EvalReader and EvalWriter.
This bug will be exposed when sentence length > 1024 frames. In that case,
     after 1024 frames, the EvalReader only fetches values in the first 1024
     frames, and the writer will not write to the values after 1024 frames.
2015-06-29 14:09:27 -07:00
Dong Yu f3ef2109be Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/dev
Conflicts:
	MachineLearning/CNTK/CNTK.vcxproj
2015-06-23 16:39:30 -07:00
Amit Agarwal 1fea145764 Fixed several compiler options in the VS Proj files. The most notable one
was the incorrect use of -G (generate debug info for device code) in
release configuration which results in most optimizations being disabled
for GPU code resulting in bad GPU kernel performance.
2015-06-23 12:40:45 -07:00
kaisheny 973d96f683 Merge from master branch 2015-05-20 17:11:52 -07:00
Frank Seide f1b8080a49 split ComputationNode.h off into 5 additional headers (InputAndParam, LinearAlgebra, Nonlinearity, Recurrent, Convolutional), grouped by nature of their function (but no code change other than moving classes in this check-in);
sorted #includes in many places (system #includes first), and removed some unnecessary #includes;
TWO_PI moved into Basics.h;
fixed an unused-argument warning in GPUMatrix.cu
2015-05-18 23:40:48 -07:00
Frank Seide c380b98a54 Visual Studio Solution cleanup:
moved minibatchsourcehelpers.h to Common/Include, as it is shared amongst readers (exception: the HTK reader, which has a different version);
fixed some incorrect #include of basetypes.h;
copying of DLLs now does not copy if the file already exists and is not out of date;
prebuild.bat now only updates builddate.h if it has changed, to avoid CNTK.cpp to be recompiled each time;
fixed a few build warnings in the CUDA kernels (uninitialized variables);
removed unused PTasks references in Linux makefiles
2015-05-18 20:32:39 -07:00
Frank Seide 1247b704c7 various cleanups:
renamed cn.exe to CNTK.exe on Windows and "cntk" (no more .exe!) on Linux;
renamed 'cn' folder to 'CNTK';
moved CNTK.sln out from CNTKSolution folder, which now no longer needs to exist;
removed Win32 build target from Visual Studio Solution and all Projects;
added are documentation and Linux makefiles to the Visual Studio Solution for easy access;
removed unused PTasks files
2015-05-18 18:51:20 -07:00
erw ad5a4e9ec4 CNTKEval dll project (debug) is revised from /MTd to /MDd (Multi-thread DLL debug) such that one commond CRT is used. 2015-05-15 11:35:49 -07:00
erw 2f433e493d Add cudart64_70.dll to delay loaded DLLs 2015-05-15 11:26:56 -07:00
kaisheny 37d02c3cfd Use -1,0,1 to denote no observation, sentence begining and in-the-middle-of-sentence. changed LU sequence reader. But other readers haven't changed accordingly. 2015-04-08 21:20:12 -07:00
Dong Yu f6c1907b8a make Resize and SwitchToMatrixType to use explicit specification of arguments to avoid unexpected behavior.
Completely remove PTask. This makes code clean and much easier to understand.

Added SetMatrixFromCSCFormat to CPU sparse matrix.

Reimplemented Set(Get)MatrixFromCSC(CSR)Format functions to take CPUSPARSE_INDEX_TYPE. changed GPU sparse matrices' persistence code accordingly.
2015-02-16 13:18:57 -08:00
Mike Seltzer 2b4e746d32 Merge branch 'master' of https://git01.codeplex.com/cntk
Conflicts:
	DataReader/HTKMLFReader/HTKMLFReader.cpp
	DataReader/HTKMLFReader/HTKMLFReader.h
2015-02-06 16:14:47 -08:00
Dong Yu 67ee258170 fix the build problem in the debug build of CNTKEval project. 2015-01-28 23:21:59 -08:00
Dong Yu ca1c1fb878 move TimerUtilities.h to common\include. Add TimerUtilities.cpp to CNTKEval project. 2015-01-28 15:59:31 -08:00
Jasha Droppo 78f4d323c6 Added debug output 2015-01-14 18:09:37 -08:00
Dong Yu 446d7261c9 Significant improvement to GPUSparseMatrix and CPUSparseMatrix. Also makes device id type consistent across classes. 2014-11-29 19:18:58 -08:00
Jasha Droppo 0b4e6e05ce Chaned CNTKEval.vcxproj so it can build in different solutions (relative paths were incorrect) 2014-11-19 18:28:03 -08:00
Jasha Droppo 3c473b802f Shielded targetver.h from linux build, where it doesn't make sense. 2014-11-11 16:40:52 +00:00
Jasha Droppo 10bcc9f9d9 Moving location of variables to avoid conflicts between cn.exe and dll building 2014-11-07 18:25:28 -08:00
Jasha Droppo 19f24a09e6 Fixing references in project files 2014-11-07 18:24:13 -08:00
Jasha Droppo adf91bce12 Changes to get CNTKEval to compile on Windows 2014-11-07 10:48:31 -08:00
Dong Yu db8aac7467 replace all tabs to four spaces in all files in the solution. 2014-11-06 19:24:05 -08:00
Frank Seide 26f4e74807 defined fake memcpy_s() in basetypes.h for GCC;
fixed last bits in CNTKEval.cpp, also compiles now
2014-11-04 20:07:35 -08:00
Frank Seide c20a95ec59 moved _wunlink() and _wmkdir() to basetypes.h since they were used at more than one place;
ConfigValue::operator unsigned long() is ambigous on GCC/x64, now not declaring it there;
discovered several incorrect "throw new runtime_error()" (notice the "new"), replaced with RuntimeError() or throw std::runtime_error(), as appropriate;
changed several initializations of ConfigParameters x = y to ConfigParameters x(y) since it blew up on GCC which tries to use a private move constructor;
eliminated an unnecessary use of Windows type LONG64;
fixed several fprintf() and RuntimeError() calls where a std::string was passed without c_str();
fixed a few more accesses to base-class members where base class has a template parameter;
fixed a few bad TABs;
minor other stuff that failed on GCC;
cn.cpp compiles now on GCC--yay!
2014-11-04 16:35:10 -08:00
Frank Seide 3cbc0dc7d2 changed XXX::iterator to auto where possible, as some had caused a build problem with GCC 2014-11-04 13:47:58 -08:00
Frank Seide 45e5290399 BestGpu.h is now the place to #define CPUONLY in source code if needed (which you would do when compiling from Visual Studio. You can also define it on the compiler command line, which you would do when compiling from an explicit makefile);
references to CUDA libs moved from BestGpu.h to the .cpp, which is will soon be moved into the CNTKMathCUDA project and thus not get compiled if no CUDA SDK is installed;
no-CUDA implementation of DeviceFromConfig() moved from BestGpu.cpp to NoGPU.cpp;
removed several no-longer-needed CUDA references from project files--two referenced-lib settings are now again identical between Debug and Release, they were inconsistent before
2014-11-04 09:10:32 -08:00
Frank Seide be8f687e73 removed dependency of 'cn' project on the CUDA SDK (CNTKMath still needs the SDK at this point in time even if we want to compile for CPUONLY mode);
renamed GPU*.cuh to .h since neither actually contains CUDA kernel code;
moved an #include "BestGpu.h" to where it is used
2014-10-31 23:39:29 -07:00
Frank Seide ddcac3dcf1 Adding untracked *.filters files. Oops. 2014-10-30 17:57:01 -07:00
Frank Seide 6114061549 removed message.h from Solution 2014-10-30 10:38:38 -07:00
Frank Seide 413ec92d50 msra_mgram.h no longer uses MESSAGE(_NOLF) macros from message.h;
unified Error() and ERROR() functions to RuntimeError() defined in basetypes.h, and eliminated message.h altogether (it was only used for ERROR);
new method LogicError()--note: some RuntimeError() calls really should be LogicError()s, need to fix as we notice them
2014-10-30 10:33:51 -07:00
Frank Seide 8a51569280 removed dependency of File.cpp on message.h 2014-10-30 09:45:02 -07:00
Frank Seide 0b62ef7c22 some more non-standard VS CRT calls replaced by standard 2014-10-23 11:55:53 -07:00
Frank Seide 0a031dcf80 removed dependency on tchar.h, instead changed to wmain and wchar_t throughout (it's 2014 after all!) 2014-10-23 09:34:40 -07:00
Frank Seide f28e5d8429 towards portable code: disabled warnings for using "unsafe" CRT functions (not available in GCC/Linux) and a few unnecessary Win32-dependent pieces of code that were not actually used;
CNTKEval now compiles at warning level 4 without error
2014-10-23 09:16:51 -07:00
Dong Yu 28af6a54c4 change several assertions to exception throw to guard it from incorrect behavior under the release build.
change gradient check error information display from stdout to stderr.
2014-10-16 16:37:37 -07:00
Frank Seide b4f468dcb7 fixed compiler warning in DllMain (unused args) 2014-10-15 16:15:24 -07:00
Frank Seide 4cc27ccc6a bug fix in RandomGaussian, used wrong dimensions;
fixed loads of int size and signedness warnings;
fixed lots of unused-parameter warnings (in dummy implementations);
two more projects build warning-free
2014-10-15 16:11:51 -07:00
Dong Yu dcc5a07b53 clear warnings 2014-10-14 22:39:19 -07:00