Merge branch 'master' of https://git01.codeplex.com/cntk into dongyu/dev

henauy · Jun 19, 2015 · 60cab14 · 60cab14
2 parents 254c95e + 46da609
commit 60cab14
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/CheckInSuites/MNIST/mnistCheckIn.config b/CheckInSuites/MNIST/mnistCheckIn.config
@@ -284,8 +284,6 @@ mnistSimpleNetTest=[
 
     epochSize=10000
 	minibatchSize=100	
-
-    evalNodeNames=ErrorPrediction:CrossEntropyWithSoftmax
 
 	modelPath=$ExpFolder$\mnist_sn.cn
 

diff --git a/MachineLearning/CNTK/CNTK.cpp b/MachineLearning/CNTK/CNTK.cpp
@@ -1202,6 +1202,15 @@ void PrintBuiltInfo()
 }
 #endif
 
+void PrintUsageInfo()
+{
+    fprintf(stderr, "-------------------------------------------------------------------\n");
+    fprintf(stderr, "Usage: cntk configFile=yourConfigFile\n");
+    fprintf(stderr, "For detailed information please consult the CNTK book\n");
+    fprintf(stderr, "\"An Introduction to Computational Networks and the Computational Network Toolkit\"\n");    
+    fprintf(stderr, "-------------------------------------------------------------------\n");
+}
+
 int wmain(int argc, wchar_t* argv[])
 {
 
@@ -1315,17 +1324,13 @@ int wmain(int argc, wchar_t* argv[])
     catch (const std::exception &err)
     {
         fprintf(stderr, "EXCEPTION occurred: %s\n", err.what());
-#ifdef _DEBUG
-        DebugBreak();
-#endif
+        PrintUsageInfo();
         return EXIT_FAILURE;
     }
     catch (...)
     {
         fprintf(stderr, "Unknown ERROR occurred");
-#ifdef _DEBUG
-        DebugBreak();
-#endif
+        PrintUsageInfo();
         return EXIT_FAILURE;
     }
 #ifdef MPI_SUPPORT

diff --git a/Math/Math/NoGPU.cpp b/Math/Math/NoGPU.cpp
@@ -479,7 +479,7 @@ namespace Microsoft {
             //for each column of a, we add all rows of a to this starting from startIndex
             template<class ElemType> GPUMatrix<ElemType>& GPUMatrix<ElemType>::AddToRowSliceValuesOf(const GPUMatrix<ElemType>& /*a*/, const size_t startIndex, const size_t numRows) { return *this; }
             template<class ElemType> GPUMatrix<ElemType>& GPUMatrix<ElemType>::AddWithRowSliceValuesOf(const GPUMatrix<ElemType>& /*a*/, const size_t startIndex, const size_t numRows) { return *this; }
-            GPUMatrix<ElemType>&  AssignRowStackValuesOf(const std::vector<const GPUMatrix<ElemType>*>& inputMatrices, const size_t sliceStartCol, const size_t sliceNumCols) { return *this; }
+            template<class ElemType> GPUMatrix<ElemType>&  GPUMatrix<ElemType>::AssignRowStackValuesOf(const std::vector<const GPUMatrix<ElemType>*>& inputMatrices, const size_t sliceStartCol, const size_t sliceNumCols) { return *this; }
 
             template<class ElemType> GPUMatrix<ElemType>& GPUMatrix<ElemType>::AssignRepeatOf(const GPUMatrix<ElemType>& /*a*/, const size_t numRowRepeats, const size_t numColRepeats) { return *this; }
             template<class ElemType> GPUMatrix<ElemType>&  GPUMatrix<ElemType>::AssignPositiveAndShiftedNegSample(const GPUMatrix<ElemType>& a, const size_t posNumber, const size_t negNumber, const size_t shiftNumber) { return *this; }