Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into mahilleb/CuDnn5Test
Browse files Browse the repository at this point in the history
Conflicts:
	Source/ComputationNetworkLib/ComputationNode.h
	Source/ComputationNetworkLib/TrainingNodes.h
	Tests/EndToEndTests/Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv/baseline.linux.txt
	Tests/EndToEndTests/Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv/baseline.windows.txt
	Tests/UnitTests/MathTests/ConvolutionEngineTests.cpp
mahilleb-msft committed Aug 24, 2016
2 parents 493744d + 9d6345b commit 0285fa9
Showing 426 changed files with 225,693 additions and 720,342 deletions.
3 changes: 3 additions & 0 deletions CNTK.Cpp.props
Original file line number Diff line number Diff line change
@@ -31,6 +31,9 @@

<HasOpenCv>false</HasOpenCv>
<HasOpenCv Condition="Exists('$(OPENCV_PATH)') Or Exists('$(OPENCV_PATH_V31)')">true</HasOpenCv>

<HasBoost>false</HasBoost>
<HasBoost Condition="Exists('$(BOOST_INCLUDE_PATH)') And Exists('$(BOOST_LIB_PATH)')">true</HasBoost>

<UseZip>false</UseZip>
<UseZip Condition="Exists('$(ZLIB_PATH)')">true</UseZip>
76 changes: 76 additions & 0 deletions CNTK.sln
Original file line number Diff line number Diff line change
@@ -1156,6 +1156,72 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BrainScriptTests", "Tests\U
{86883653-8A61-4038-81A0-2379FAE4200A} = {86883653-8A61-4038-81A0-2379FAE4200A}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorials", "Tutorials", "{8BE0642A-A3AA-4A64-95D0-C78FB285B2A4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImageHandsOn", "ImageHandsOn", "{2230BF3D-4317-4A3F-A743-DDD6160503F8}"
ProjectSection(SolutionItems) = preProject
Tutorials\ImageHandsOn\ImageHandsOn.cntk = Tutorials\ImageHandsOn\ImageHandsOn.cntk
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SLUHandsOn", "SLUHandsOn", "{CC143D08-567D-4DAC-9E14-264749C19039}"
ProjectSection(SolutionItems) = preProject
Tutorials\SLUHandsOn\SLUHandsOn.cntk = Tutorials\SLUHandsOn\SLUHandsOn.cntk
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pretrained Models", "Pretrained Models", "{0ED2EE97-0A26-4865-871F-11033867BA34}"
ProjectSection(SolutionItems) = preProject
Tutorials\ImageHandsOn\cifar10.pretrained.cmf = Tutorials\ImageHandsOn\cifar10.pretrained.cmf
Tutorials\ImageHandsOn\cifar10.ResNet.cmf = Tutorials\ImageHandsOn\cifar10.ResNet.cmf
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solutions", "Solutions", "{A2A4893C-0D5B-42E2-BFAD-C123AE7FDAFD}"
ProjectSection(SolutionItems) = preProject
Tutorials\ImageHandsOn\ImageHandsOn_Solution1.cntk = Tutorials\ImageHandsOn\ImageHandsOn_Solution1.cntk
Tutorials\ImageHandsOn\ImageHandsOn_Solution2.cntk = Tutorials\ImageHandsOn\ImageHandsOn_Solution2.cntk
Tutorials\ImageHandsOn\ImageHandsOn_Solution3.cntk = Tutorials\ImageHandsOn\ImageHandsOn_Solution3.cntk
Tutorials\ImageHandsOn\ImageHandsOn_Solution4.cntk = Tutorials\ImageHandsOn\ImageHandsOn_Solution4.cntk
Tutorials\ImageHandsOn\ImageHandsOn_Solution5.cntk = Tutorials\ImageHandsOn\ImageHandsOn_Solution5.cntk
Tutorials\ImageHandsOn\ImageHandsOn_Task4_Start.cntk = Tutorials\ImageHandsOn\ImageHandsOn_Task4_Start.cntk
Tutorials\ImageHandsOn\ImageHandsOn_Task6.cntk = Tutorials\ImageHandsOn\ImageHandsOn_Task6.cntk
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{8CFBD0DB-5F16-48E6-984C-4401317FA10E}"
ProjectSection(SolutionItems) = preProject
Tutorials\SLUHandsOn\atis.test.ctf = Tutorials\SLUHandsOn\atis.test.ctf
Tutorials\SLUHandsOn\atis.train.ctf = Tutorials\SLUHandsOn\atis.train.ctf
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solutions", "Solutions", "{BD7FF8C0-EC3A-49CD-9D81-4A8A29B8AD8E}"
ProjectSection(SolutionItems) = preProject
Tutorials\SLUHandsOn\SLUHandsOn_Solution1.cntk = Tutorials\SLUHandsOn\SLUHandsOn_Solution1.cntk
Tutorials\SLUHandsOn\SLUHandsOn_Solution2.cntk = Tutorials\SLUHandsOn\SLUHandsOn_Solution2.cntk
Tutorials\SLUHandsOn\SLUHandsOn_Solution3.cntk = Tutorials\SLUHandsOn\SLUHandsOn_Solution3.cntk
Tutorials\SLUHandsOn\SLUHandsOn_Solution4.cntk = Tutorials\SLUHandsOn\SLUHandsOn_Solution4.cntk
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pretrained Models", "Pretrained Models", "{4727594B-A052-4834-B0E8-57DBB9ADEF13}"
ProjectSection(SolutionItems) = preProject
Tutorials\SLUHandsOn\slu.forward.backward.cmf = Tutorials\SLUHandsOn\slu.forward.backward.cmf
Tutorials\SLUHandsOn\slu.forward.cmf = Tutorials\SLUHandsOn\slu.forward.cmf
Tutorials\SLUHandsOn\slu.forward.lookahead.cmf = Tutorials\SLUHandsOn\slu.forward.lookahead.cmf
Tutorials\SLUHandsOn\slu.forward.nobn.cmf = Tutorials\SLUHandsOn\slu.forward.nobn.cmf
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{4A59163B-1EDE-4439-9E7D-40A30B82A3A0}"
ProjectSection(SolutionItems) = preProject
Tutorials\ImageHandsOn\CifarConverter.py = Tutorials\ImageHandsOn\CifarConverter.py
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TIMIT", "TIMIT", "{B586AA4C-0BB9-4629-9EDA-25FF2618AC9F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TrainSimpleNetwork", "TrainSimpleNetwork", "{C2102C39-BF5F-4B12-9C41-849D1ED35EE8}"
ProjectSection(SolutionItems) = preProject
Tests\EndToEndTests\Examples\Speech\TIMIT\TrainSimpleNetwork\baseline.linux.txt = Tests\EndToEndTests\Examples\Speech\TIMIT\TrainSimpleNetwork\baseline.linux.txt
Tests\EndToEndTests\Examples\Speech\TIMIT\TrainSimpleNetwork\baseline.windows.txt = Tests\EndToEndTests\Examples\Speech\TIMIT\TrainSimpleNetwork\baseline.windows.txt
Tests\EndToEndTests\Examples\Speech\TIMIT\TrainSimpleNetwork\run-test = Tests\EndToEndTests\Examples\Speech\TIMIT\TrainSimpleNetwork\run-test
Tests\EndToEndTests\Examples\Speech\TIMIT\TrainSimpleNetwork\testcases.yml = Tests\EndToEndTests\Examples\Speech\TIMIT\TrainSimpleNetwork\testcases.yml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_CpuOnly|x64 = Debug_CpuOnly|x64
@@ -1601,5 +1667,15 @@ Global
{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF} = {3385EBEA-5F97-4B2B-9F30-0E6D7F91B9CA}
{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E} = {3385EBEA-5F97-4B2B-9F30-0E6D7F91B9CA}
{9F999212-AFC5-4EAC-AA78-F7247D46C456} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE}
{2230BF3D-4317-4A3F-A743-DDD6160503F8} = {8BE0642A-A3AA-4A64-95D0-C78FB285B2A4}
{CC143D08-567D-4DAC-9E14-264749C19039} = {8BE0642A-A3AA-4A64-95D0-C78FB285B2A4}
{0ED2EE97-0A26-4865-871F-11033867BA34} = {2230BF3D-4317-4A3F-A743-DDD6160503F8}
{A2A4893C-0D5B-42E2-BFAD-C123AE7FDAFD} = {2230BF3D-4317-4A3F-A743-DDD6160503F8}
{8CFBD0DB-5F16-48E6-984C-4401317FA10E} = {CC143D08-567D-4DAC-9E14-264749C19039}
{BD7FF8C0-EC3A-49CD-9D81-4A8A29B8AD8E} = {CC143D08-567D-4DAC-9E14-264749C19039}
{4727594B-A052-4834-B0E8-57DBB9ADEF13} = {CC143D08-567D-4DAC-9E14-264749C19039}
{4A59163B-1EDE-4439-9E7D-40A30B82A3A0} = {2230BF3D-4317-4A3F-A743-DDD6160503F8}
{B586AA4C-0BB9-4629-9EDA-25FF2618AC9F} = {FB7AF7B9-6BEA-459F-94D9-94D53916D2B6}
{C2102C39-BF5F-4B12-9C41-849D1ED35EE8} = {B586AA4C-0BB9-4629-9EDA-25FF2618AC9F}
EndGlobalSection
EndGlobal
26 changes: 13 additions & 13 deletions Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Adv_Chapter.lyx
Original file line number Diff line number Diff line change
@@ -259,7 +259,7 @@ CE=CrossEntropyWithSoftmax(labels, Plus2)

\begin_layout Plain Layout

ErrPredict=ErrorPrediction(labels, Plus2)
ErrPredict=ClassificationError(labels, Plus2)
\end_layout

\begin_layout Plain Layout
@@ -616,7 +616,7 @@ CE=CrossEntropyWithSoftmax(labels, Plus2)

\begin_layout Plain Layout

ErrPredict=ErrorPrediction(labels, Plus2)
ErrPredict=ClassificationError(labels, Plus2)
\end_layout

\end_inset
@@ -633,19 +633,19 @@ CrossEntropyWithSoftmax

\end_inset

() to compute the training criterion and the operator ErrorPrediction
() to compute the training criterion and the operator ClassificationError
\begin_inset Index idx
status open

\begin_layout Plain Layout
ErrorPrediction
ClassificationError
\end_layout

\end_inset

() to compute the testing criterion.
These operators are internally represented as computation nodes CrossEntropyWit
hSoftmaxNode and ErrorPredictionNode with names CE and ErrPredict, respectively.
hSoftmaxNode and ClassificationErrorNode with names CE and ErrPredict, respectively.
\end_layout

\begin_layout Subsubsection
@@ -740,7 +740,7 @@ status open

\begin_layout Plain Layout

ErrPredict=ErrorPrediction(labels, Plus2) # classification error
ErrPredict=ClassificationError(labels, Plus2) # classification error
\end_layout

\begin_layout Plain Layout
@@ -1025,7 +1025,7 @@ reference "sub:NDL-Basic-Concepts"
but is much simpler and easier to understand because of the use of macros.
One new feature shown in this network definition is the access to macro-region
variables.
ErrorPrediction() needs to access an intermediate result from SMBFF before
ClassificationError() needs to access an intermediate result from SMBFF before
the CrossEntropyWithSoftmax() is applied.
Although the needed variable is local to the macro, it can be accessed
via the
@@ -1107,7 +1107,7 @@ CE = SMBFF(L1, LDim, HDim, labels)

\begin_layout Plain Layout

Err=ErrorPrediction(labels, CE.F)
Err=ClassificationError(labels, CE.F)
\end_layout

\end_inset
@@ -1280,7 +1280,7 @@ CE = SMBFF(L3, LDim, HDim, labels, tag="criterion")

\begin_layout Plain Layout

Err=ErrorPrediction(labels, CE.F, tag="evaluation")
Err=ClassificationError(labels, CE.F, tag="evaluation")
\end_layout

\end_inset
@@ -2900,12 +2900,12 @@ classProbBeforeSoftmax - applying softmax on this matrix will result in
\end_layout

\begin_layout Subsubsection
ErrorPrediction
ClassificationError
\begin_inset Index idx
status open

\begin_layout Plain Layout
ErrorPrediction
ClassificationError
\end_layout

\end_inset
@@ -2941,7 +2941,7 @@ status open

\begin_layout Plain Layout

ErrorPrediction(labels, m)
ClassificationError(labels, m)
\end_layout

\begin_layout Plain Layout
@@ -4059,7 +4059,7 @@ CE = SMBFF(L3, LDim, HDim, labels, tag="criterion")

\begin_layout Plain Layout

Err=ErrorPrediction(labels, CE.F, tag="evaluation")
Err=ClassificationError(labels, CE.F, tag="evaluation")
\end_layout

\begin_layout Plain Layout
Original file line number Diff line number Diff line change
@@ -290,7 +290,7 @@ cntkSpeech.dnn"

\begin_layout Plain Layout

evalCriterion="ErrorPrediction"
evalCriterion="ClassificationError"
\end_layout

\begin_layout Plain Layout
@@ -1610,7 +1610,7 @@ CE1=CrossEntropyWithSoftmax(labels,BFF1.FF.P,tag="evaluation")

\begin_layout Plain Layout

FER1 = ErrorPrediction(labels,BFF1.FF.P,tag="evaluation")
FER1 = ClassificationError(labels,BFF1.FF.P,tag="evaluation")
\end_layout

\begin_layout Plain Layout
@@ -1634,7 +1634,7 @@ CE2=CrossEntropyWithSoftmax(regions,BFF2.FF.P,tag="evaluation")

\begin_layout Plain Layout

FER2 = ErrorPrediction(regions,BFF2.FF.P,tag="evaluation")
FER2 = ClassificationError(regions,BFF2.FF.P,tag="evaluation")
\end_layout

\begin_layout Plain Layout
Original file line number Diff line number Diff line change
@@ -514,7 +514,7 @@ Simple_Demo=[

\begin_layout Plain Layout

evalCriterion="ErrorPrediction"
evalCriterion="ClassificationError"
\end_layout

\begin_layout Plain Layout
4 changes: 2 additions & 2 deletions Examples/Image/MNIST/Config/01_OneHidden.cntk
Original file line number Diff line number Diff line change
@@ -52,12 +52,12 @@ train = [
z = DNNLayer (hiddenDim, labelDim, h1, 1)

ce = CrossEntropyWithSoftmax (labels, z)
errs = ErrorPrediction (labels, z)
errs = ClassificationError (labels, z)

# set top5Errs as an evaluation node to compute the top-5 error rate
# This is not marked tag="evaluation" since expensive during training.
# We explicitly select it as an output node in the "test" command.
top5Errs = ErrorPrediction (labels, z, topN=5)
top5Errs = ClassificationError (labels, z, topN=5)

# declare special nodes
featureNodes = (features)
4 changes: 2 additions & 2 deletions Examples/Image/MNIST/Config/01_OneHidden.ndl
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ DNN = [
ol = DNNLayer(hiddenDim, labelDim, h1, 1)

ce = CrossEntropyWithSoftmax(labels, ol)
errs = ErrorPrediction(labels, ol)
top5Errs = ErrorPrediction(labels, ol, Const(5), tag="eval") # only used in testing
errs = ClassificationError(labels, ol)
top5Errs = ClassificationError(labels, ol, Const(5), tag="eval") # only used in testing

# Special Nodes
FeatureNodes = (features)
2 changes: 1 addition & 1 deletion Examples/Image/MNIST/Config/02_Convolution.ndl
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ DNN=[
ol = DNNLayer(h1Dim, labelDim, h1, 1)

ce = CrossEntropyWithSoftmax(labels, ol)
errs = ErrorPrediction(labels, ol)
errs = ClassificationError(labels, ol)

# Special Nodes
FeatureNodes = (features)
2 changes: 1 addition & 1 deletion Examples/Image/MNIST/Config/03_ConvBatchNorm.ndl
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ DNN = [
ol = DNNLayer(h1Dim, labelDim, h1, 1)

ce = CrossEntropyWithSoftmax(labels, ol)
errs = ErrorPrediction(labels, ol)
errs = ClassificationError(labels, ol)

# Special Nodes
FeatureNodes = (features)
2 changes: 1 addition & 1 deletion Examples/Image/MNIST/Config/04_DeConv.ndl
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ DNN=[
deconv1 = DeconvReLULayer(unpool1, kW1, kH1, imageC, 25, cMap1, hStride1, vStride1, lpad1, upad1, wScale1, bValue1)

mse = SquareError(featScaled, deconv1)
#err = ErrorPrediction(labels, ol)
#err = ClassificationError(labels, ol)

# Special Nodes
FeatureNodes = (features)
2 changes: 1 addition & 1 deletion Examples/Image/Miscellaneous/CIFAR-10/01_Convolution.ndl
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ DNN=[
ol = DNNLastLayer(hiddenDim, labelDim, h1_d, fc2WScale, fc2BValue)

CE = CrossEntropyWithSoftmax(labels, ol, tag = Criteria)
Err = ErrorPrediction(labels, ol, tag = Eval)
Err = ClassificationError(labels, ol, tag = Eval)
OutputNodes = ol
]

2 changes: 1 addition & 1 deletion Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv.ndl
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ DNN=[
ol = DNNLastLayer(hiddenDim, labelDim, h1, fc2WScale, fc2BValue)

CE = CrossEntropyWithSoftmax(labels, ol, tag = Criteria)
Err = ErrorPrediction(labels, ol, tag = Eval)
Err = ClassificationError(labels, ol, tag = Eval)
OutputNodes = ol
]

2 changes: 1 addition & 1 deletion Examples/Image/Miscellaneous/CIFAR-10/03_ResNet.ndl
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ DNN=[
ol = DnnLastLayer(cMap3, labelDim, pool, fc1WScale, fc1BValue)

CE = CrossEntropyWithSoftmax(labels, ol, tag = Criteria)
Err = ErrorPrediction(labels, ol, tag = Eval)
Err = ClassificationError(labels, ol, tag = Eval)
OutputNodes = ol
]

2 changes: 1 addition & 1 deletion Examples/Image/Miscellaneous/CIFAR-10/04_ResNet_56.ndl
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ DNN=[
ol = DnnLastLayer(cMap3, labelDim, pool, fc1WScale, fc1BValue)

CE = CrossEntropyWithSoftmax(labels, ol, tag = Criteria)
Err = ErrorPrediction(labels, ol, tag = Eval)
Err = ClassificationError(labels, ol, tag = Eval)
OutputNodes = ol
]

2 changes: 1 addition & 1 deletion Examples/Image/Miscellaneous/CIFAR-10/05_ConvLocal.ndl
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ DNN=[
ol = DnnImageLastLayer(7, 7, cMap4, labelDim, conv4, fc1WScale, fc1BValue)

CE = CrossEntropyWithSoftmax(labels, ol, tag = Criteria)
Err = ErrorPrediction(labels, ol, tag = Eval)
Err = ClassificationError(labels, ol, tag = Eval)
OutputNodes = ol
]

Loading

0 comments on commit 0285fa9

Please sign in to comment.