Merge branch 'master' into wolfma/MatrixFileWriteReadTest

ana2s007 · Nov 10, 2015 · d43f9ab · d43f9ab
2 parents b354087 + d7eb051
commit d43f9ab
Show file tree

Hide file tree

Showing 9 changed files with 398 additions and 433 deletions.
diff --git a/Math/CNTKMathTest/CNTKMathTest.vcxproj b/Math/CNTKMathTest/CNTKMathTest.vcxproj
@@ -109,7 +109,6 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="GPUSparseMatrixUnitTests.cpp" />
     <ClCompile Include="GPUWatcherTests.cpp" />
     <ClCompile Include="MatrixBLASTests.cpp" />
     <ClCompile Include="MatrixDataSynchronizationTests.cpp" />