180fae557b
Removed the no longer needed MANAGEDEXTERN device option
2015-10-17 21:53:51 -07:00
b8adcb5b71
Replaced all bare throw calls with Centralized exception functions that print the call stack
2015-10-10 18:38:59 -07:00
349f07f173
Merge branch 'master' of https://git01.codeplex.com/cntk into bmitra/Changes
...
Conflicts:
Common/Include/Basics.h
DataReader/LMSequenceReader/LMSequenceReader.vcxproj
DataReader/SparsePCReader/SparsePCReader.vcxproj
MachineLearning/CNTKComputationNetworkLib/NonlinearityNodes.h
Math/Math/CNTKMathCUDA.vcxproj.filters
Math/Math/CommonMatrix.h
Math/Math/GPUMatrix.cu
Math/Math/GPUSparseMatrix.cu
Math/Math/Matrix.h
2015-10-09 23:07:34 -07:00
4b7046e64d
added stubs to Binary, DSSM, LivbSVM, and SparsePCReader for allocating and passing an MBLayout (but that layout is not currently filled in)
2015-10-01 16:21:01 -07:00
af316bffb8
changed { SetActualNbrSlicesInEachRecurentIteration(); CopyMBLayoutTo(); } to { CopyMBLayoutTo(); VerifyActualNumParallelSequences(); } and removed m_actualNbrSlicesInEachRecurentIteration;
...
renamed ...NbrSlicesEachRecurrentIter to ...NumParallelSequences;
also MBLayout::GetNumStreams() to GetNumTimeSteps() and GetNumFrames() to GetNumTimeSteps()
2015-09-18 17:35:07 -07:00
fdd93c3492
Merge branch 'master' of https://git.codeplex.com/cntk
...
Conflicts:
CNTK.sln
2015-09-18 01:57:18 -07:00
9812602cef
Rename the Target Name of CNTKEvalDll and CNTKMathDll back to CNTKEval and CNTKMath respectively to honor the existing receipt.
...
Project name is kept intact.
2015-09-18 01:12:22 -07:00
d114c8bb38
DataReader::SetSentenceSegBatch() renamed to CopyMBLayoutTo(), and it takes a MBLayoutPtr now (towards more flexible timing and layout
2015-09-16 13:24:54 -07:00
b0f036f0d9
renamed MinibatchPackingFlag to MinibatchPackingFlags;
...
also m_SentenceBoundary to m_sentenceBoundaryFlags
2015-09-16 10:09:37 -07:00
c4bfc92ce6
Merge branch 'master' of https://git01.codeplex.com/cntk into bmitra/Changes
...
Conflicts:
Common/Include/Basics.h
DataReader/LMSequenceReader/LMSequenceReader.vcxproj
DataReader/SparsePCReader/SparsePCReader.vcxproj
MachineLearning/CNTK/ComputationNetwork.h
MachineLearning/CNTK/NetworkDescriptionLanguage.cpp
MachineLearning/CNTK/SynchronousExecutionEngine.h
Math/Math/Matrix.cpp
Math/Math/Matrix.h
Math/Math/NoGPU.cpp
2015-09-14 07:23:54 -07:00
27d12d21b4
Matrix.h now no longer pulls in the CPU/GPUMatrix headers (this required cleaning up a few incorrect header dependencies as well);
...
cleaned up <class ElemType> vs. <typename ElemType> (using class since that was used more often, causing less diffs)
2015-09-06 17:17:07 +02:00
3e86195524
fixed wrong type of Matrix<float> in SetSentenceSegBatch();
...
fixed a missing percentage in testcases.yml
2015-09-03 15:18:17 -07:00
8794397ab9
DiagonalNode and DebugUtil.
2015-08-05 10:44:09 +10:00
2c6c940a8f
Build braek fix
2015-07-08 15:49:16 -07:00
b1f7263326
Merge from master branch
2015-05-20 17:11:52 -07:00
a059635386
moved nocase_compare to Basics.h, and removed unnecessary dependencies caused by this on commandArgUtil.h, hoping for less recompilation;
...
renamed PreprocessConfigLine() to StripComments();
updated CNTKBook PDF
2015-05-19 14:32:21 -07:00
89ea3f3448
replaced printf format %ws by %ls which is portable between Visual Studio and gcc
2015-05-19 00:24:08 -07:00
178555d0a4
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
08625d482d
created a new header file Basics.h, to take on the whole of the legacy basetypes.h (which was to contain a very limited set of generally useful core functions, like UTF8 conversion)
2015-05-18 19:36:04 -07:00
392d64da08
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
14ce7f4f2f
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
22d7769b04
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
ca4f760c34
Edited the project to treat warnings as errors.
2015-02-10 13:17:57 -08:00
e28f4a6555
Fixed a bug in DSSMReader where the labels matrix wouldn't be resized for partial batches.
2015-02-10 13:13:43 -08:00
69e88c0cb4
Merge branch 'thhoens' of http://vstfpg07:8080/tfs/msrspeech/msrspeech/_git/cntk
2015-02-05 16:49:55 -08:00
9610e69acd
Fixed some compilation issues. Still trying to determine why _CRT_SECURE_NO_WARNINGS doesn't work for basetypes.h.
2015-02-05 16:49:38 -08:00
ed3dfd796a
DSSM project setting change. remove precompiled headers.
2015-02-05 16:23:15 -08:00
c4ae117311
DSSMReader needed \Yc for precompiled headers. I'm not sure why this version needs that, but other versions I've used do not. TODO: Look into why this dll needs \Yc instead of \Yu.
2015-02-04 14:40:36 -08:00
fb3a2f0313
Forgot stdafx.h/cpp
2015-02-04 14:26:18 -08:00
590172dcc2
Somehow these files were not committed to source control.
2015-02-04 14:25:32 -08:00
984b2e46ee
Added DSSM nodes and readers to CNTK. Note that these are not particularly efficient implementations.
2015-02-04 12:51:31 -08:00
b55b7d7d1a
Initial commit of DSSMReader to add the project to source control.
2015-02-04 10:32:59 -08:00
Amit Agarwal
Frank Seide
erw
bmitra
UnderdogGeek
Vladimir Ivanov
kaisheny
Dong Yu
thhoens