From 797c727dfbe38cf4f062123b9d10772cc27386ec Mon Sep 17 00:00:00 2001
From: Alexey Kamenev <alexeyk@microsoft.com>
Date: Mon, 21 Sep 2015 12:58:36 -0700
Subject: [PATCH] Fix merge issues.

---
 DataReader/ImageReader/ImageReader.h                         | 4 ++--
 .../CNTKComputationNetworkLib/EvaluationCriterionNodes.h     | 5 +++++
 Math/Math/CNTKMathCUDA.vcxproj                               | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/DataReader/ImageReader/ImageReader.h b/DataReader/ImageReader/ImageReader.h
index c4f0476ad..2a3614f46 100644
--- a/DataReader/ImageReader/ImageReader.h
+++ b/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;
 
diff --git a/MachineLearning/CNTKComputationNetworkLib/EvaluationCriterionNodes.h b/MachineLearning/CNTKComputationNetworkLib/EvaluationCriterionNodes.h
index 81d1019ba..541570453 100644
--- a/MachineLearning/CNTKComputationNetworkLib/EvaluationCriterionNodes.h
+++ b/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
diff --git a/Math/Math/CNTKMathCUDA.vcxproj b/Math/Math/CNTKMathCUDA.vcxproj
index 15e043e9c..006ff1c3e 100644
--- a/Math/Math/CNTKMathCUDA.vcxproj
+++ b/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>