Merge branch 'master' of https://github.com/Microsoft/CNTK

jeffinstance · Jan 23, 2016 · 89a0c58 · 89a0c58
2 parents b597b89 + af97079
commit 89a0c58
Show file tree

Hide file tree

Showing 188 changed files with 6,549 additions and 15,818 deletions.
diff --git a/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Programmer_Chapter.lyx b/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Programmer_Chapter.lyx
@@ -2330,7 +2330,7 @@ void DoCommand(const ConfigParameters& config)
 
 \begin_layout Plain Layout
 
-        //get the configuration parameters that match the command
+        // get the configuration parameters that match the command
 \end_layout
 
 \begin_layout Plain Layout
@@ -3207,7 +3207,7 @@ unctionValues().GetNumCols());
 
 \begin_layout Plain Layout
 
-    //left Node must be a scalar             
+    // left Node must be a scalar             
 \end_layout
 
 \begin_layout Plain Layout
@@ -3420,12 +3420,12 @@ virtual void BackpropTo(const size_t inputIndex)
 
 \begin_layout Plain Layout
 
-    //left Node must be a scalar             
+    // left Node must be a scalar             
 \end_layout
 
 \begin_layout Plain Layout
 
-    if (inputIndex == 0)  //left derivative
+    if (inputIndex == 0)  // left derivative
 \end_layout
 
 \begin_layout Plain Layout
@@ -3504,12 +3504,12 @@ Seq)
 
 \begin_layout Plain Layout
 
-    //left Node must be a scalar             
+    // left Node must be a scalar             
 \end_layout
 
 \begin_layout Plain Layout
 
-    if (inputIndex == 0)  //left derivative             
+    if (inputIndex == 0)  // left derivative             
 \end_layout
 
 \begin_layout Plain Layout
@@ -3863,7 +3863,7 @@ ComputationNodePtr CreateComputationNode(const std::wstring nodeType, const
 
 \begin_layout Plain Layout
 
-    //other node types
+    // other node types
 \end_layout
 
 \begin_layout Plain Layout
@@ -3927,7 +3927,7 @@ ComputationNode<ElemType>* CreateNodeFromFile(const std::wstring nodeType,
 
 \begin_layout Plain Layout
 
-    //other node types
+    // other node types
 \end_layout
 
 \begin_layout Plain Layout
@@ -3943,7 +3943,7 @@ ComputationNode<ElemType>* CreateNodeFromFile(const std::wstring nodeType,
 
 \begin_layout Plain Layout
 
-    //other node types
+    // other node types
 \end_layout
 
 \begin_layout Plain Layout
@@ -4103,7 +4103,7 @@ bool CheckFunction(std::string& p_nodeType, bool* allowUndeterminedVariable)
 
 \begin_layout Plain Layout
 
-    //other node types    
+    // other node types    
 \end_layout
 
 \begin_layout Plain Layout
@@ -4118,7 +4118,7 @@ bool CheckFunction(std::string& p_nodeType, bool* allowUndeterminedVariable)
 
 \begin_layout Plain Layout
 
-    //other node types and codes
+    // other node types and codes
 \end_layout
 
 \begin_layout Plain Layout
@@ -4632,7 +4632,7 @@ while (trainSetDataReader->GetMinibatch(inputMatrices))
 
 \begin_layout Plain Layout
 
-    //update the time stamp of the input nodes for re-evaluation
+    // update the time stamp of the input nodes for re-evaluation
 \end_layout
 
 \begin_layout Plain Layout

diff --git a/Makefile b/Makefile
@@ -462,7 +462,7 @@ CNTK_SRC =\
 	$(SOURCEDIR)/ActionsLib/TrainActions.cpp \
 	$(SOURCEDIR)/ActionsLib/EvalActions.cpp \
 	$(SOURCEDIR)/ActionsLib/OtherActions.cpp \
-	$(SOURCEDIR)/ActionsLib/EsotericActions.cpp \
+	$(SOURCEDIR)/ActionsLib/SpecialPurposeActions.cpp \
 	$(SOURCEDIR)/SequenceTrainingLib/latticeforwardbackward.cpp \
 	$(SOURCEDIR)/SequenceTrainingLib/parallelforwardbackward.cpp \
 	$(SOURCEDIR)/CNTK/BrainScript/BrainScriptEvaluator.cpp \

diff --git a/Source/ActionsLib/Actions.h b/Source/ActionsLib/Actions.h
@@ -43,16 +43,6 @@ void DoWriteWordAndClassInfo(const ConfigParameters& config);
 template <typename ElemType>
 void DoTopologyPlot(const ConfigParameters& config);
 
-// deprecated (EsotericActions.cp)
+// special purpose (EsotericActions.cp)
 template <typename ElemType>
 void DoConvertFromDbn(const ConfigParameters& config);
-template <typename ElemType>
-void DoEvalUnroll(const ConfigParameters& config);
-template <typename ElemType>
-void DoEncoderDecoder(const ConfigParameters& config);
-template <typename ElemType>
-void DoBidirectionEncoderDecoder(const ConfigParameters& config);
-template <typename ElemType>
-void DoEvalEncodingBeamSearchDecoding(const ConfigParameters& config);
-template <typename ElemType>
-void DoBeamSearchDecoding(const ConfigParameters& config);
diff --git a/Source/ActionsLib/ActionsLib.vcxproj b/Source/ActionsLib/ActionsLib.vcxproj
@@ -170,7 +170,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\Common\TimerUtility.cpp" />
-    <ClCompile Include="EsotericActions.cpp" />
+    <ClCompile Include="SpecialPurposeActions.cpp" />
     <ClCompile Include="EvalActions.cpp" />
     <ClCompile Include="OtherActions.cpp" />
     <ClCompile Include="TrainActions.cpp" />

diff --git a/Source/ActionsLib/ActionsLib.vcxproj.filters b/Source/ActionsLib/ActionsLib.vcxproj.filters
@@ -13,15 +13,15 @@
     <ClCompile Include="TrainActions.cpp">
       <Filter>Actions</Filter>
     </ClCompile>
-    <ClCompile Include="EsotericActions.cpp">
-      <Filter>Actions</Filter>
-    </ClCompile>
     <ClCompile Include="EvalActions.cpp">
       <Filter>Actions</Filter>
     </ClCompile>
     <ClCompile Include="OtherActions.cpp">
       <Filter>Actions</Filter>
     </ClCompile>
+    <ClCompile Include="SpecialPurposeActions.cpp">
+      <Filter>Actions</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Common\Include\fileutil.h">