Fix merge issues.

DataReader/ImageReader/ImageReader.h

@@ -32,8 +32,8 @@ public:
     bool GetMinibatch(std::map<std::wstring, Matrix<ElemType>*>& matrices) override;
     bool DataEnd(EndDataType endDataType) override;
 
-    size_t NumberSlicesInEachRecurrentIter() override { return 1; }
-    void SetSentenceSegBatch(Matrix<float>&, vector<MinibatchPackingFlag>&) override { };
+    size_t GetNumParallelSequences() override { return 1; }
+    void CopyMBLayoutTo(MBLayoutPtr) override {};
 
     void SetRandomSeed(unsigned int seed) override;
 

MachineLearning/CNTKComputationNetworkLib/EvaluationCriterionNodes.h

@@ -97,6 +97,11 @@ namespace Microsoft { namespace MSR { namespace CNTK {
                 {
                     LogicError("The Matrix dimension in the ErrorPrediction operation does not match.");
                 }       
+            if (((!(Inputs(0)->FunctionValues().GetNumRows() == Inputs(1)->FunctionValues().GetNumRows() &&  //match size
+                Inputs(0)->FunctionValues().GetNumCols() == Inputs(1)->FunctionValues().GetNumCols()))) && Inputs(0)->GetLoopId() < 0)
+            {
+                LogicError("The Matrix dimension in the ErrorPrediction operation does not match.");
+            }
 
             Resize(1,1);
             m_pMBLayout = nullptr;    // this node does not hold mini-batch data

Math/Math/CNTKMathCUDA.vcxproj

@@ -24,7 +24,7 @@
     </SccProvider>
     <ProjectName>CNTKMathCUDA</ProjectName>
     <CudaPath>$(CUDA_PATH_V7_0)</CudaPath>
-    <CudaToolkitCustomDir>$(CUDA_PATH)</CudaToolkitCustomDir>
+    <CudaToolkitCustomDir>$(CudaPath)</CudaToolkitCustomDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>