Factors out the Network Building functions (NDL and Standard Model) a…

…nd places them in the ComputationNetworkLib
naiduv · Mar 14, 2016 · e072eca · e072eca
1 parent 2f880a3
commit e072eca
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 40 deletions.
diff --git a/Source/CNTK/CNTK.vcxproj b/Source/CNTK/CNTK.vcxproj
@@ -176,18 +176,12 @@
     <ClInclude Include="..\ComputationNetworkLib\ConvolutionalNodes.h" />
     <ClInclude Include="BrainScript\BrainScriptEvaluator.h" />
     <ClInclude Include="BrainScript\BrainScriptParser.h" />
-    <ClInclude Include="IExecutionEngine.h" />
     <ClInclude Include="..\ComputationNetworkLib\InputAndParamNodes.h" />
     <ClInclude Include="..\ComputationNetworkLib\LinearAlgebraNodes.h" />
     <ClInclude Include="ModelEditLanguage.h" />
-    <ClInclude Include="NDLNetworkBuilder.h" />
-    <ClInclude Include="NDLUtil.h" />
-    <ClInclude Include="NetworkDescriptionLanguage.h" />
     <ClInclude Include="..\ComputationNetworkLib\NonlinearityNodes.h" />
     <ClInclude Include="..\ComputationNetworkLib\RecurrentNodes.h" />
-    <ClInclude Include="SimpleNetworkBuilder.h" />
     <ClInclude Include="stdafx.h" />
-    <ClInclude Include="SynchronousExecutionEngine.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
@@ -212,10 +206,7 @@
     <ClCompile Include="BrainScript\ExperimentalNetworkBuilder.cpp" />
     <ClCompile Include="CNTK.cpp" />
     <ClCompile Include="ModelEditLanguage.cpp" />
-    <ClCompile Include="NetworkDescriptionLanguage.cpp" />
-    <ClCompile Include="SimpleNetworkBuilder.cpp" />
     <ClCompile Include="stdafx.cpp" />
-    <ClCompile Include="SynchronousExecutionEngine.cpp" />
     <ClCompile Include="tests.cpp" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/CNTK/CNTK.vcxproj.filters b/Source/CNTK/CNTK.vcxproj.filters
@@ -26,15 +26,6 @@
       <Filter>Common</Filter>
     </ClCompile>
     <ClCompile Include="CNTK.cpp" />
-    <ClCompile Include="SynchronousExecutionEngine.cpp">
-      <Filter>Model Building, from old NDL</Filter>
-    </ClCompile>
-    <ClCompile Include="NetworkDescriptionLanguage.cpp">
-      <Filter>Model Building, from old NDL</Filter>
-    </ClCompile>
-    <ClCompile Include="SimpleNetworkBuilder.cpp">
-      <Filter>Model Building, Standard Models</Filter>
-    </ClCompile>
     <ClCompile Include="..\Common\MPIWrapper.cpp">
       <Filter>MPI Interfacing</Filter>
     </ClCompile>
@@ -73,15 +64,9 @@
     <ClInclude Include="..\Common\Include\DataWriter.h">
       <Filter>Common\Include</Filter>
     </ClInclude>
-    <ClInclude Include="IExecutionEngine.h">
-      <Filter>Model Building, from old NDL</Filter>
-    </ClInclude>
     <ClInclude Include="ModelEditLanguage.h">
       <Filter>Model Editing</Filter>
     </ClInclude>
-    <ClInclude Include="SynchronousExecutionEngine.h">
-      <Filter>Model Building, from old NDL</Filter>
-    </ClInclude>
     <ClInclude Include="stdafx.h">
       <Filter>Misc</Filter>
     </ClInclude>
@@ -106,18 +91,6 @@
     <ClInclude Include="..\Common\Include\Platform.h">
       <Filter>Common\Include</Filter>
     </ClInclude>
-    <ClInclude Include="NDLNetworkBuilder.h">
-      <Filter>Model Building, from old NDL</Filter>
-    </ClInclude>
-    <ClInclude Include="NDLUtil.h">
-      <Filter>Model Building, from old NDL</Filter>
-    </ClInclude>
-    <ClInclude Include="NetworkDescriptionLanguage.h">
-      <Filter>Model Building, from old NDL</Filter>
-    </ClInclude>
-    <ClInclude Include="SimpleNetworkBuilder.h">
-      <Filter>Model Building, Standard Models</Filter>
-    </ClInclude>
     <ClInclude Include="..\Math\Matrix.h">
       <Filter>from Math</Filter>
     </ClInclude>
@@ -239,9 +212,6 @@
     <Filter Include="from SGDLib\SGD">
       <UniqueIdentifier>{4f06ac18-7b30-490c-b801-128bdaa99450}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Model Building, from old NDL">
-      <UniqueIdentifier>{3ddfc109-3a90-45f5-91e8-1930759cfe9d}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Model Building, Standard Models">
       <UniqueIdentifier>{f474b73c-05f9-43e6-997f-3ec83805c655}</UniqueIdentifier>
     </Filter>

diff --git a/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj b/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
@@ -141,7 +141,12 @@
     <ClInclude Include="ComputationNetworkBuilder.h" />
     <ClInclude Include="ComputationNode.h" />
     <ClInclude Include="ConvolutionalNodes.h" />
+    <ClInclude Include="IExecutionEngine.h" />
+    <ClInclude Include="NDLNetworkBuilder.h" />
+    <ClInclude Include="NDLUtil.h" />
+    <ClInclude Include="NetworkDescriptionLanguage.h" />
     <ClInclude Include="PreComputeNodes.h" />
+    <ClInclude Include="SimpleNetworkBuilder.h" />
     <ClInclude Include="SpecialPurposeNodes.h" />
     <ClInclude Include="EvaluationNodes.h" />
     <ClInclude Include="InputAndParamNodes.h" />
@@ -151,6 +156,7 @@
     <ClInclude Include="RecurrentNodes.h" />
     <ClInclude Include="ReshapingNodes.h" />
     <ClInclude Include="stdafx.h" />
+    <ClInclude Include="SynchronousExecutionEngine.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="TrainingNodes.h" />
   </ItemGroup>
@@ -170,8 +176,11 @@
     <ClCompile Include="ComputationNetworkEvaluation.cpp" />
     <ClCompile Include="ComputationNetworkScripting.cpp" />
     <ClCompile Include="ComputationNode.cpp" />
+    <ClCompile Include="NetworkDescriptionLanguage.cpp" />
+    <ClCompile Include="SimpleNetworkBuilder.cpp" />
     <ClCompile Include="stdafx.cpp" />
+    <ClCompile Include="SynchronousExecutionEngine.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>
diff --git a/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj.filters b/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj.filters
@@ -37,6 +37,15 @@
     <ClCompile Include="ComputationNetworkScripting.cpp">
       <Filter>Network</Filter>
     </ClCompile>
+    <ClCompile Include="NetworkDescriptionLanguage.cpp">
+      <Filter>Model Building - NDL</Filter>
+    </ClCompile>
+    <ClCompile Include="SynchronousExecutionEngine.cpp">
+      <Filter>Model Building - NDL</Filter>
+    </ClCompile>
+    <ClCompile Include="SimpleNetworkBuilder.cpp">
+      <Filter>Model Building - Standard Models</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Common\Include\fileutil.h">
@@ -123,6 +132,24 @@
     <ClInclude Include="TrainingNodes.h">
       <Filter>Nodes</Filter>
     </ClInclude>
+    <ClInclude Include="IExecutionEngine.h">
+      <Filter>Model Building - NDL</Filter>
+    </ClInclude>
+    <ClInclude Include="NDLNetworkBuilder.h">
+      <Filter>Model Building - NDL</Filter>
+    </ClInclude>
+    <ClInclude Include="NDLUtil.h">
+      <Filter>Model Building - NDL</Filter>
+    </ClInclude>
+    <ClInclude Include="NetworkDescriptionLanguage.h">
+      <Filter>Model Building - NDL</Filter>
+    </ClInclude>
+    <ClInclude Include="SynchronousExecutionEngine.h">
+      <Filter>Model Building - NDL</Filter>
+    </ClInclude>
+    <ClInclude Include="SimpleNetworkBuilder.h">
+      <Filter>Model Building - Standard Models</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Common">
@@ -146,5 +173,11 @@
     <Filter Include="from Math">
       <UniqueIdentifier>{7d838fa4-b5a1-4b8a-b37d-823fb026055b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Model Building - NDL">
+      <UniqueIdentifier>{168a899a-6bff-4e84-b0a2-7a12e15b31b7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Model Building - Standard Models">
+      <UniqueIdentifier>{bbe24ffc-d1a8-400c-a0e5-8f2062b35bcf}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
diff --git a/Source/CNTK/IExecutionEngine.h → .../ComputationNetworkLib/IExecutionEngine.h b/Source/CNTK/IExecutionEngine.h → .../ComputationNetworkLib/IExecutionEngine.h
diff --git a/Source/CNTK/NDLNetworkBuilder.h → ...ComputationNetworkLib/NDLNetworkBuilder.h b/Source/CNTK/NDLNetworkBuilder.h → ...ComputationNetworkLib/NDLNetworkBuilder.h
diff --git a/Source/CNTK/NDLUtil.h → Source/ComputationNetworkLib/NDLUtil.h b/Source/CNTK/NDLUtil.h → Source/ComputationNetworkLib/NDLUtil.h
diff --git a/Source/CNTK/NetworkDescriptionLanguage.cpp → ...NetworkLib/NetworkDescriptionLanguage.cpp b/Source/CNTK/NetworkDescriptionLanguage.cpp → ...NetworkLib/NetworkDescriptionLanguage.cpp
diff --git a/Source/CNTK/NetworkDescriptionLanguage.h → ...onNetworkLib/NetworkDescriptionLanguage.h b/Source/CNTK/NetworkDescriptionLanguage.h → ...onNetworkLib/NetworkDescriptionLanguage.h
diff --git a/Source/CNTK/SimpleNetworkBuilder.cpp → ...tationNetworkLib/SimpleNetworkBuilder.cpp b/Source/CNTK/SimpleNetworkBuilder.cpp → ...tationNetworkLib/SimpleNetworkBuilder.cpp
diff --git a/Source/CNTK/SimpleNetworkBuilder.h → ...putationNetworkLib/SimpleNetworkBuilder.h b/Source/CNTK/SimpleNetworkBuilder.h → ...putationNetworkLib/SimpleNetworkBuilder.h
diff --git a/Source/CNTK/SynchronousExecutionEngine.cpp → ...NetworkLib/SynchronousExecutionEngine.cpp b/Source/CNTK/SynchronousExecutionEngine.cpp → ...NetworkLib/SynchronousExecutionEngine.cpp
diff --git a/Source/CNTK/SynchronousExecutionEngine.h → ...onNetworkLib/SynchronousExecutionEngine.h b/Source/CNTK/SynchronousExecutionEngine.h → ...onNetworkLib/SynchronousExecutionEngine.h