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

…ga/htkmlfreader_allowlargeutterances
lixiaosi33 · Feb 23, 2016 · 0235291 · 0235291
2 parents fd6a076 + ee92cf1
commit 0235291
Show file tree

Hide file tree

Showing 41 changed files with 359 additions and 486 deletions.
diff --git a/Makefile b/Makefile
@@ -230,7 +230,7 @@ COMMON_SRC =\
 	$(SOURCEDIR)/Common/Config.cpp \
 	$(SOURCEDIR)/Common/DataReader.cpp \
 	$(SOURCEDIR)/Common/DataWriter.cpp \
-	$(SOURCEDIR)/Common/DebugUtil.cpp \
+	$(SOURCEDIR)/Common/ExceptionWithCallStack.cpp \
 	$(SOURCEDIR)/Common/Eval.cpp \
 	$(SOURCEDIR)/Common/File.cpp \
 	$(SOURCEDIR)/Common/TimerUtility.cpp \

diff --git a/Source/CNTK/CNTK.vcxproj b/Source/CNTK/CNTK.vcxproj
@@ -140,12 +140,12 @@
     <ClInclude Include="..\Common\Include\Basics.h" />
     <ClInclude Include="..\Common\Include\BestGpu.h" />
     <ClInclude Include="..\Common\Include\DataReader.h" />
+    <ClInclude Include="..\Common\Include\ExceptionWithCallStack.h" />
     <ClInclude Include="..\Common\Include\StringUtil.h" />
     <ClInclude Include="..\Common\Include\TensorShape.h" />
     <ClInclude Include="..\Common\Include\DataWriter.h" />
     <ClInclude Include="..\Common\Include\File.h" />
     <ClInclude Include="..\Common\Include\fileutil.h" />
-    <ClInclude Include="..\Common\Include\DebugUtil.h" />
     <ClInclude Include="..\Common\Include\hostname.h" />
     <ClInclude Include="..\Common\Include\Platform.h" />
     <ClInclude Include="..\Common\Include\ProgressTracing.h" />
@@ -188,16 +188,13 @@
     </ClCompile>
     <ClCompile Include="..\Common\DataReader.cpp" />
     <ClCompile Include="..\Common\DataWriter.cpp" />
+    <ClCompile Include="..\Common\ExceptionWithCallStack.cpp" />
     <ClCompile Include="..\Common\File.cpp">
       <PrecompiledHeader Condition="$(DebugBuild)">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\Common\fileutil.cpp">
       <PrecompiledHeader Condition="$(DebugBuild)">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\Common\DebugUtil.cpp">
-      <PrecompiledHeader Condition="$(DebugBuild)">
-      </PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="..\Common\Include\ConcStack.h" />
     <ClCompile Include="..\Common\TimerUtility.cpp" />
     <ClCompile Include="..\Common\MPIWrapper.cpp" />
@@ -219,4 +216,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>
diff --git a/Source/CNTK/CNTK.vcxproj.filters b/Source/CNTK/CNTK.vcxproj.filters
@@ -13,9 +13,6 @@
     <ClCompile Include="..\Common\fileutil.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\DebugUtil.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
     <ClCompile Include="ModelEditLanguage.cpp">
       <Filter>Model Editing</Filter>
     </ClCompile>
@@ -59,14 +56,14 @@
     <ClCompile Include="BrainScript\ExperimentalNetworkBuilder.cpp">
       <Filter>BrainScript</Filter>
     </ClCompile>
+    <ClCompile Include="..\Common\ExceptionWithCallStack.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Common\Include\fileutil.h">
       <Filter>Common\Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\Include\DebugUtil.h">
-      <Filter>Common\Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\Common\Include\File.h">
       <Filter>Common\Include</Filter>
     </ClInclude>
@@ -196,6 +193,9 @@
     <ClInclude Include="..\Common\Include\StringUtil.h">
       <Filter>Common\Include</Filter>
     </ClInclude>
+    <ClInclude Include="..\Common\Include\ExceptionWithCallStack.h">
+      <Filter>Common\Include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="modelEditor.txt">

diff --git a/Source/Common/BestGpu.cpp b/Source/Common/BestGpu.cpp
@@ -18,7 +18,6 @@
 #include "BestGpu.h"
 #include "Config.h" // for ConfigParameters
 #include "ScriptableObjects.h"
-#include "DebugUtil.h"
 #ifndef CPUONLY
 #pragma comment(lib, "cudart.lib")
 #include <cuda_runtime.h>

diff --git a/Source/Common/DebugUtil.cpp b/Source/Common/DebugUtil.cpp