Merge branch 'master' of https://github.com/Microsoft/CNTK

Source/CNTK/NDLUtil.h

@@ -173,4 +173,4 @@ class NDLUtil
 
 template class NDLUtil<float>;
 template class NDLUtil<double>;
-} } }
+} } }

Source/Common/Config.cpp

@@ -304,4 +304,4 @@ void TrimQuotes(std::string& str)
     if (str.front() == '"' && str.back() == '"')
         str = str.substr(1, str.size() - 2);
 }
-} } }
+} } }

Source/Common/DebugUtil.cpp

@@ -137,4 +137,4 @@ void DebugUtil::PrintCallStack()
     free(symbolList);
 #endif
 }
-} } }
+} } }

Source/Common/Include/latticesource.h

@@ -76,4 +76,4 @@ class latticesource
         denlattices.setverbosity(veb);
     }
 };
-} }
+} }

Source/EvalDll/CNTKEval.h

@@ -58,4 +58,4 @@ class CNTKEval : public IEvaluateModel<ElemType>
     virtual void Destroy();
     virtual void ResetState();
 };
-} } }
+} } }

Source/Math/MatrixQuantizerCPU.h

@@ -34,4 +34,4 @@ class MatrixQuantizerCPU final : public MatrixQuantizerImpl<ElemType>
     void UnquantizeAsync(QuantizedMatrix<ElemType>& inQMatrix, Matrix<ElemType>& outMatrix, bool add = false) override;
     void WaitUnquantizeAsyncDone() override;
 };
-} } }
+} } }

Source/Math/QuantizedMatrix.h

@@ -119,4 +119,4 @@ class MATH_API QuantizedMatrix
     template <typename T>
     friend class MatrixQuantizer;
 };
-} } }
+} } }

Source/Readers/BinaryReader/BinaryFile.cpp

@@ -1403,4 +1403,4 @@ bool SectionStats::AccumulateData(ElemType* dataSource, size_t numRecords, size_
     // done with data
     return false;
 }
-} } }
+} } }

Source/Readers/BinaryReader/BinaryReader.h

@@ -686,4 +686,4 @@ size_t RoundUp(size_t value, size_t size);
 // HIGH and LOW DWORD functions
 DWORD HIDWORD(size_t size);
 DWORD LODWORD(size_t size);
-} } }
+} } }

Source/Readers/BinaryReader/BinaryWriter.cpp

@@ -439,4 +439,4 @@ void BinaryWriter<ElemType>::SaveMapping(std::wstring saveId, const std::map<typ
 // instantiate all the combinations we expect to be used
 template class BinaryWriter<double>;
 template class BinaryWriter<float>;
-} } }
+} } }

Source/Readers/BinaryReader/Exports.cpp

@@ -43,4 +43,4 @@ extern "C" DATAWRITER_API void GetWriterD(IDataWriter<double>** pwriter)
 {
     GetWriter(pwriter);
 }
-} } }
+} } }

Source/Readers/HTKMLFReader/DataReader.cpp

@@ -58,4 +58,4 @@ void Trim(std::string& str)
         str.erase(found + 1);
 }
 #endif
-} } }
+} } }

Source/Readers/ImageReader/Exports.cpp

@@ -26,4 +26,4 @@ extern "C" DATAREADER_API void GetReaderD(IDataReader<double>** preader)
 {
     GetReader(preader);
 }
-} } }
+} } }

Source/Readers/Kaldi2Reader/htkfeatio_utils.h

@@ -37,4 +37,4 @@ inline std::string trimmed(std::string str)
         str.erase(found + 1);
 
     return str;
-} } }
+} } }

Source/Readers/LMSequenceReader/Exports.cpp

@@ -26,4 +26,4 @@ extern "C" DATAREADER_API void GetReaderD(IDataReader<double>** preader)
 {
     GetReader(preader);
 }
-} } }
+} } }

Source/Readers/LUSequenceReader/Exports.cpp

@@ -28,4 +28,4 @@ extern "C" DATAREADER_API void GetReaderD(IDataReader<double>** preader)
 {
     GetReader(preader);
 }
-} } }
+} } }

Source/Readers/LUSequenceReader/LUSequenceWriter.cpp

@@ -177,4 +177,4 @@ void LUSequenceWriter<ElemType>::Save(std::wstring& outputFile, const Matrix<Ele
 
 template class LUSequenceWriter<float>;
 template class LUSequenceWriter<double>;
-} } }
+} } }

Source/Readers/LUSequenceReader/LUSequenceWriter.h

@@ -60,4 +60,4 @@ class LUSequenceWriter : public IDataWriter<ElemType>
     virtual void Destroy();
     virtual bool SaveData(size_t recordStart, const std::map<std::wstring, void*, nocase_compare>& matrices, size_t numRecords, size_t datasetSize, size_t byteVariableSized);
 };
-} } }
+} } }

Source/Readers/UCIFastReader/Exports.cpp

@@ -26,4 +26,4 @@ extern "C" DATAREADER_API void GetReaderD(IDataReader<double>** preader)
 {
     GetReader(preader);
 }
-} } }
+} } }

Tests/UnitTests/FileTest/FileTest.cpp

@@ -236,4 +236,4 @@ File& operator>>(File& stream, FileTest& test)
     stream.GetMarker(fileMarkerEndSection, string("endFileTest"));
     return stream;
 }
-} } }
+} } }

Tests/UnitTests/FileTest/FileTest.h

@@ -39,4 +39,4 @@ class FileTest
 // operator overloading
 File& operator>>(File& stream, FileTest& test);
 File& operator<<(File& stream, FileTest& test);
-} } }
+} } }

Tests/UnitTests/MathTests/DebugUtil.cpp

@@ -66,4 +66,4 @@ void DebugUtil::PrintCallStack()
     free(symbolInfo);
 #endif // _WIN32
 }
-} } }
+} } }

Tests/UnitTests/ReaderTests/Common/ReaderTestHelper.h

@@ -266,4 +266,4 @@ struct ReaderFixture
     }
 };
 }
-} } }
+} } }