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*>& matrices) override; bool DataEnd(EndDataType endDataType) override; - size_t NumberSlicesInEachRecurrentIter() override { return 1; } - void SetSentenceSegBatch(Matrix&, vector&) 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 @@ CNTKMathCUDA $(CUDA_PATH_V7_0) - $(CUDA_PATH) + $(CudaPath)