renamed TrainingCriterionNodes.h to TrainingNodes.h, and moved Dropou…

…tNode and BatchNormalizationNode there; renamed EvaluationCriterionNodes.h to EvaluationNodes.h, and moved SequenceDecoderNode there
KimKJ · Jan 22, 2016 · 03a4fcb · 03a4fcb
1 parent d11963d
commit 03a4fcb
Show file tree

Hide file tree

Showing 23 changed files with 813 additions and 821 deletions.
diff --git a/Source/CNTK/CNTK.vcxproj b/Source/CNTK/CNTK.vcxproj
@@ -169,6 +169,8 @@
     <ClInclude Include="..\Common\Include\ScriptableObjects.h" />
     <ClInclude Include="..\Common\Include\Sequences.h" />
     <ClInclude Include="..\Common\Include\TimerUtility.h" />
+    <ClInclude Include="..\ComputationNetworkLib\EvaluationNodes.h" />
+    <ClInclude Include="..\ComputationNetworkLib\TrainingNodes.h" />
     <ClInclude Include="..\Math\CPUMatrix.h" />
     <ClInclude Include="..\Math\Matrix.h" />
     <ClInclude Include="..\ComputationNetworkLib\CompositeComputationNodes.h" />
@@ -181,7 +183,6 @@
     <ClInclude Include="..\ComputationNetworkLib\ComputationNetworkBuilder.h" />
     <ClInclude Include="..\ComputationNetworkLib\ComputationNode.h" />
     <ClInclude Include="..\ComputationNetworkLib\ConvolutionalNodes.h" />
-    <ClInclude Include="..\ComputationNetworkLib\EvaluationCriterionNodes.h" />
     <ClInclude Include="BrainScript\BrainScriptEvaluator.h" />
     <ClInclude Include="BrainScript\BrainScriptParser.h" />
     <ClInclude Include="IExecutionEngine.h" />
@@ -197,7 +198,6 @@
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="SynchronousExecutionEngine.h" />
     <ClInclude Include="targetver.h" />
-    <ClInclude Include="..\ComputationNetworkLib\TrainingCriterionNodes.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Common\Config.cpp">

diff --git a/Source/CNTK/CNTK.vcxproj.filters b/Source/CNTK/CNTK.vcxproj.filters
@@ -175,9 +175,6 @@
     <ClInclude Include="..\SGDLib\DataReaderHelpers.h">
       <Filter>from ComputationNetworkLib\Network</Filter>
     </ClInclude>
-    <ClInclude Include="..\ComputationNetworkLib\EvaluationCriterionNodes.h">
-      <Filter>from ComputationNetworkLib\Nodes</Filter>
-    </ClInclude>
     <ClInclude Include="..\ComputationNetworkLib\InputAndParamNodes.h">
       <Filter>from ComputationNetworkLib\Nodes</Filter>
     </ClInclude>
@@ -190,7 +187,10 @@
     <ClInclude Include="..\ComputationNetworkLib\RecurrentNodes.h">
       <Filter>from ComputationNetworkLib\Nodes</Filter>
     </ClInclude>
-    <ClInclude Include="..\ComputationNetworkLib\TrainingCriterionNodes.h">
+    <ClInclude Include="..\ComputationNetworkLib\EvaluationNodes.h">
+      <Filter>from ComputationNetworkLib\Nodes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ComputationNetworkLib\TrainingNodes.h">
       <Filter>from ComputationNetworkLib\Nodes</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/Source/CNTK/NetworkDescriptionLanguage.cpp b/Source/CNTK/NetworkDescriptionLanguage.cpp
@@ -16,9 +16,9 @@
 #include "RecurrentNodes.h"
 #include "ReshapingNodes.h"
 #include "SpecialPurposeNodes.h"
-#include "TrainingCriterionNodes.h"
+#include "TrainingNodes.h"
 #include "PreComputeNodes.h"
-#include "EvaluationCriterionNodes.h"
+#include "EvaluationNodes.h"
 
 namespace Microsoft { namespace MSR { namespace CNTK {
 

diff --git a/Source/ComputationNetworkLib/ComputationNetwork.cpp b/Source/ComputationNetworkLib/ComputationNetwork.cpp
@@ -14,9 +14,9 @@
 #include "ConvolutionalNodes.h"
 #include "RecurrentNodes.h"
 #include "ReshapingNodes.h"
-#include "TrainingCriterionNodes.h"
+#include "TrainingNodes.h"
 #include "PreComputeNodes.h"
-#include "EvaluationCriterionNodes.h"
+#include "EvaluationNodes.h"
 #include "SpecialPurposeNodes.h"
 #include "MPIWrapper.h" // TODO: does not belong here
 #include <string>

diff --git a/Source/ComputationNetworkLib/ComputationNetworkBuilder.cpp b/Source/ComputationNetworkLib/ComputationNetworkBuilder.cpp
@@ -17,9 +17,9 @@
 #include "ConvolutionalNodes.h"
 #include "RecurrentNodes.h"
 #include "ReshapingNodes.h"
-#include "TrainingCriterionNodes.h"
 #include "PreComputeNodes.h"
-#include "EvaluationCriterionNodes.h"
+#include "TrainingNodes.h"
+#include "EvaluationNodes.h"
 #include "SpecialPurposeNodes.h"
 
 #include <string>
@@ -33,7 +33,7 @@ template <class ElemType, class... _Types>
 static shared_ptr<ComputationNode<ElemType>> CreateStandardNode(const std::wstring& nodeType, _Types&&... _Args)
 {
     // please keep this table sorted
-    if (nodeType == OperationNameOf(CRFNode))                              return New<CRFNode<ElemType>>(forward<_Types>(_Args)...);
+    if      (nodeType == OperationNameOf(CRFNode))                              return New<CRFNode<ElemType>>(forward<_Types>(_Args)...);
     else if (nodeType == OperationNameOf(ClassBasedCrossEntropyWithSoftmaxNode))return New<ClassBasedCrossEntropyWithSoftmaxNode<ElemType>>(forward<_Types>(_Args)...);
     else if (nodeType == OperationNameOf(CosDistanceNode))                      return New<CosDistanceNode<ElemType>>(forward<_Types>(_Args)...);
     else if (nodeType == OperationNameOf(CosDistanceWithNegativeSamplesNode))   return New<CosDistanceWithNegativeSamplesNode<ElemType>>(forward<_Types>(_Args)...);

diff --git a/Source/ComputationNetworkLib/ComputationNetworkBuilder.h b/Source/ComputationNetworkLib/ComputationNetworkBuilder.h
@@ -7,7 +7,7 @@
 #include "Basics.h"
 #include "ComputationNode.h"
 #include "ComputationNetwork.h"
-#include "TrainingCriterionNodes.h" // for NCEEvalMode
+#include "TrainingNodes.h" // for NCEEvalMode
 #include "ScriptableObjects.h"
 #include "TensorShape.h"
 #include <string>

diff --git a/Source/ComputationNetworkLib/ComputationNetworkEditing.cpp b/Source/ComputationNetworkLib/ComputationNetworkEditing.cpp
@@ -9,7 +9,7 @@
 #include "ComputationNode.h"
 #include "ComputationNetwork.h"
 #include "InputAndParamNodes.h"
-#include "ConvolutionalNodes.h"
+#include "TrainingNodes.h"
 #include <string>
 #include <vector>
 #include <list>

diff --git a/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj b/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
@@ -169,7 +169,7 @@
     <ClInclude Include="ConvolutionalNodes.h" />
     <ClInclude Include="PreComputeNodes.h" />
     <ClInclude Include="SpecialPurposeNodes.h" />
-    <ClInclude Include="EvaluationCriterionNodes.h" />
+    <ClInclude Include="EvaluationNodes.h" />
     <ClInclude Include="InputAndParamNodes.h" />
     <ClInclude Include="LinearAlgebraNodes.h" />
     <ClInclude Include="MatrixPool.h" />
@@ -178,7 +178,7 @@
     <ClInclude Include="ReshapingNodes.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
-    <ClInclude Include="TrainingCriterionNodes.h" />
+    <ClInclude Include="TrainingNodes.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Common\BestGpu.cpp" />

diff --git a/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj.filters b/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj.filters
@@ -66,12 +66,6 @@
     <ClInclude Include="..\Common\Include\BestGpu.h">
       <Filter>Common\Include</Filter>
     </ClInclude>
-    <ClInclude Include="EvaluationCriterionNodes.h">
-      <Filter>Nodes</Filter>
-    </ClInclude>
-    <ClInclude Include="TrainingCriterionNodes.h">
-      <Filter>Nodes</Filter>
-    </ClInclude>
     <ClInclude Include="NonlinearityNodes.h">
       <Filter>Nodes</Filter>
     </ClInclude>
@@ -123,6 +117,12 @@
     <ClInclude Include="PreComputeNodes.h">
       <Filter>Nodes</Filter>
     </ClInclude>
+    <ClInclude Include="EvaluationNodes.h">
+      <Filter>Nodes</Filter>
+    </ClInclude>
+    <ClInclude Include="TrainingNodes.h">
+      <Filter>Nodes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Common">