c25061633d
Merge branch 'master' of https://git01.codeplex.com/cntk into amitaga/readerPerfSpew
2015-11-04 18:06:37 -08:00
3db565404b
HTKMLFReader bug fixes. a) Proper handling of end of epoch conditions for truncated utterance mode reading b) Remove the incorrect early exit condition in TrainOneEpoch
2015-11-04 18:05:06 -08:00
bb8e25ab04
Fix a bug when using PrefixPathInSCP in HTKMLFReader
2015-11-04 12:50:58 -08:00
41407f8b9a
Temporarily fix an issue with the nbruttsineachrecurrentiter setting. This setting is still broken when one specifies different values for different epochs and will be fixed in a later change
2015-11-03 18:26:35 -08:00
bd06036a2a
Fix file headers
2015-11-03 14:39:10 +01:00
8b9565dc56
Some cleanup of the handling of number of parallel sequences in HTKMLFReader
2015-11-02 22:54:35 -08:00
94f1f91d71
Fixed a bug in HTKMLFReader
2015-11-02 16:31:47 -08:00
d42c7ba15c
Minor HTKMLFReader perf fixes
2015-10-31 23:15:04 -07:00
0e067fc692
Minor changes in HTKMLFReader to minimize allocations
2015-10-31 20:06:38 -07:00
c51edb086f
Fixed a Linux only bug in the reader in getting the key for an utterance
2015-10-29 21:59:05 -07:00
24c540dc3c
Yongqiang: Fixed a bug in reader about incorrect duplicate entry reporting in MLF
2015-10-29 18:35:48 -07:00
c0b55a7cb3
merged with master
2015-10-29 10:09:12 -07:00
e4f6a266ab
Added some performance counters to HTKMLFReader
2015-10-28 18:09:06 -07:00
661942127e
Fix KaldiReader for the new interface (SetValue).
2015-10-28 18:36:52 -04:00
5d7d5350ea
Merge branch 'master' of https://git01.codeplex.com/cntk into yu/memshare
...
Conflicts:
DataReader/HTKMLFReader/HTKMLFReader.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h
MachineLearning/CNTKSGDLib/SGD.cpp
2015-10-22 15:52:58 -07:00
2494b544f6
renamed HTKMLFReader::m_mbNumCols to m_mbNumTimeSteps (my bad)
2015-10-22 11:26:35 -07:00
6a635f150f
Fixed a reader bug in the handling of no data being available from the source
2015-10-21 17:42:15 -07:00
e72b4fdc2f
Bug fix: The guard for filling lattice was checking for presence of lattice on an updated mbiter instead of the previous one from which the utterance was actually filled
2015-10-21 15:18:11 -07:00
85e31e938d
Merge branch 'yu/memshare' of https://git.codeplex.com/cntk into yu/memshare
2015-10-19 12:03:56 -07:00
58dea3f154
bug fix: CrossEntropyWithSoftMax did not correctly zero out gaps in the labels (only in the data to test). Also took the opportunity to remove the -S function;
...
commented and renamed a few variables in HTKMLFReader to more accurate names, e.g. m_mbSize to m_mbNumCols;
ComputationNetwork: cleaned up more (*nodeIter)-> to node->
2015-10-19 12:01:57 -07:00
da3cf5caaa
Merge branch 'master' of https://git01.codeplex.com/cntk into yu/memshare
2015-10-19 11:21:48 -07:00
2c72bc3ce7
Allow users to specify a PrefixPathInSCP option , so there is no need to
...
revise scp after moving
2015-10-18 15:57:39 -07:00
4884430b06
Merge branch 'master' of https://git01.codeplex.com/cntk into yu/memshare
...
Conflicts:
MachineLearning/CNTKComputationNetworkLib/InputAndParamNodes.h
2015-10-17 23:52:59 -07:00
180fae557b
Removed the no longer needed MANAGEDEXTERN device option
2015-10-17 21:53:51 -07:00
35b0e71b5a
Merge branch 'master' of https://git01.codeplex.com/cntk into yu/memshare
...
Conflicts:
MachineLearning/CNTKComputationNetworkLib/CompositeComputationNodes.h
MachineLearning/CNTKComputationNetworkLib/ComputationNode.h
MachineLearning/CNTKComputationNetworkLib/EvaluationCriterionNodes.h
MachineLearning/CNTKComputationNetworkLib/LinearAlgebraNodes.h
Tests/Speech/LSTM/cntk.config
configure
2015-10-15 21:08:10 -07:00
2fae709dfe
Fix for ImageReader and MBLayout.
2015-10-15 11:33:19 -07:00
fc9897b367
Merge fix.
2015-10-14 12:30:31 -07:00
bb62af7d13
ImageReader fixes for Linux build.
2015-10-14 12:30:11 -07:00
64fec93f98
Enabled check for CUB and conditional build for OpenCV.
2015-10-14 12:29:41 -07:00
797c727dfb
Fix merge issues.
2015-10-14 12:29:11 -07:00
a5acf9d56f
Refactor to use conc_stack.
2015-10-14 12:29:01 -07:00
98324b8979
Add unit tests for TopK-related Matrix changes.
2015-10-14 12:28:50 -07:00
3129a35ed0
Minor changes in ImageReader and TopK eval.
2015-10-14 12:28:30 -07:00
fa4383e7f5
Add TopK error evaluation
2015-10-14 12:28:10 -07:00
35d4a54437
Minor changes
2015-10-14 12:28:00 -07:00
6cd863e228
Refactoring to use transforms
2015-10-14 12:27:50 -07:00
ecdd9ae99f
Add crop transform
2015-10-14 12:27:39 -07:00
9aba3648f0
Add ImageReader
2015-10-14 12:27:29 -07:00
8703ad44bf
Merge branch 'master' of https://git01.codeplex.com/cntk into yu/memshare
2015-10-12 22:54:43 -07:00
2263ca4b7f
Merge remote-tracking branch 'origin/master' into yu/memshare
...
Conflicts:
BrainScript/BrainScriptEvaluator.cpp
BrainScript/BrainScriptParser.cpp
BrainScript/BrainScriptParser.h
BrainScript/BrainScriptTest.cpp
Common/Include/Basics.h
Common/Include/ssematrix.h
DataReader/LMSequenceReader/LMSequenceReader.vcxproj
DataReader/SparsePCReader/SparsePCReader.vcxproj
MachineLearning/CNTK/ExperimentalNetworkBuilder.cpp
MachineLearning/CNTK/SynchronousExecutionEngine.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h
MachineLearning/CNTKComputationNetworkLib/ComputationNetworkBuilder.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNode.h
MachineLearning/CNTKComputationNetworkLib/InputAndParamNodes.h
MachineLearning/CNTKComputationNetworkLib/NetworkBuilderFromConfig.cpp
MachineLearning/CNTKComputationNetworkLib/NonlinearityNodes.h
MachineLearning/CNTKComputationNetworkLib/TrainingCriterionNodes.h
MachineLearning/ParseConfig/ParseConfig.vcxproj
Math/Math/ValueQuantizer.h
Tests/Speech/LSTM/cntk.config
2015-10-13 01:34:23 -04:00
450b16b20f
Fixed a bug where labelIDs assigment was incorrectly being done unconditionally when it only applies when lattices exist
2015-10-12 22:12:21 -07:00
46a9beebb1
Merge remote-tracking branch 'origin/guoguo/linuxBuildFix' into yu/memshare
...
Conflicts:
MachineLearning/CNTK/SynchronousExecutionEngine.cpp
MachineLearning/CNTKComputationNetworkLib/CompositeComputationNodes.h
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.cpp
MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h
MachineLearning/CNTKComputationNetworkLib/ComputationNode.h
MachineLearning/CNTKComputationNetworkLib/ConvolutionalNodes.h
MachineLearning/CNTKComputationNetworkLib/DecoderNode.h
MachineLearning/CNTKComputationNetworkLib/EvaluationCriterionNodes.h
MachineLearning/CNTKComputationNetworkLib/InputAndParamNodes.h
MachineLearning/CNTKComputationNetworkLib/LinearAlgebraNodes.h
MachineLearning/CNTKComputationNetworkLib/NetworkBuilderFromConfig.cpp
MachineLearning/CNTKComputationNetworkLib/NonlinearityNodes.h
MachineLearning/CNTKComputationNetworkLib/RecurrentNodes.h
MachineLearning/CNTKComputationNetworkLib/TrainingCriterionNodes.h
2015-10-13 00:24:52 -04:00
b8adcb5b71
Replaced all bare throw calls with Centralized exception functions that print the call stack
2015-10-10 18:38:59 -07:00
d9cdf9e5da
Replace use of basetypes.h header in HTKMLFReader with Basics.h
2015-10-10 12:12:16 -07:00
4d31376f8e
Merged Common/basetypes.h and HTKMLFReader/basetypes.h and deleted the HTKMLFReader/basetypes.h copy
2015-10-10 02:06:03 -07:00
3d2d626eb7
Centralized PrintCallStack calls
2015-10-10 00:22:36 -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
a47a9c4233
Remove some unused variables.
2015-10-09 02:08:46 -04:00
f4b61496c4
Merge remote-tracking branch 'remotes/origin/master' into guoguo/linuxBuildFix
2015-10-09 00:46:08 -04:00
acca55754f
Merge remote-tracking branch 'origin/guoguo/linuxBuildFix' into yu/memshare
2015-10-08 17:04:20 -04:00
Amit Agarwal
erw
Mark Hillebrand
Frank Seide
Yu
Alexey Kamenev
Guoguo Chen