diff --git a/Common/BestGpu.cpp b/Common/BestGpu.cpp index 233ab7f14..df1b93089 100644 --- a/Common/BestGpu.cpp +++ b/Common/BestGpu.cpp @@ -16,7 +16,7 @@ #define _CRT_SECURE_NO_WARNINGS // "secure" CRT not available on all platforms --add this at the top of all CPP files that give "function or variable may be unsafe" warnings #include "Platform.h" #include "BestGpu.h" -#include "commandArgUtil.h" // for ConfigParameters +#include "Config.h" // for ConfigParameters #include "ScriptableObjects.h" #include "DebugUtil.h" #ifndef CPUONLY diff --git a/Common/ConfigFile.cpp b/Common/Config.cpp similarity index 99% rename from Common/ConfigFile.cpp rename to Common/Config.cpp index 56d03fd1e..b43d268c7 100644 --- a/Common/ConfigFile.cpp +++ b/Common/Config.cpp @@ -5,12 +5,13 @@ // // ConfigFile.cpp : Defines the configuration file loader. // + #ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS // "secure" CRT not available on all platforms --add this at the top of all CPP files that give "function or variable may be unsafe" warnings #endif #include "File.h" -#include "commandArgUtil.h" +#include "Config.h" #include "ScriptableObjects.h" namespace Microsoft { namespace MSR { namespace CNTK { diff --git a/Common/DataReader.cpp b/Common/DataReader.cpp index 526da420e..041143caa 100644 --- a/Common/DataReader.cpp +++ b/Common/DataReader.cpp @@ -10,7 +10,7 @@ #define DATAREADER_LOCAL #include "Basics.h" #include "DataReader.h" -#include "commandArgUtil.h" +#include "Config.h" #include "ScriptableObjects.h" using namespace std; diff --git a/Common/Include/BestGpu.h b/Common/Include/BestGpu.h index 25d9128cf..a972250df 100644 --- a/Common/Include/BestGpu.h +++ b/Common/Include/BestGpu.h @@ -9,7 +9,7 @@ // #define CPUONLY // #define this to build without GPU support nor needing the SDK installed #include "CommonMatrix.h" -// define IConfigRecord and ConfigParameters as incomplete types, in order to avoid having to include "ScriptableObjects.h" and "commandArgUtil.h", as that confuses some .CU code +// define IConfigRecord and ConfigParameters as incomplete types, in order to avoid having to include "ScriptableObjects.h" and "Config.h", as that confuses some .CU code namespace Microsoft { namespace MSR { namespace ScriptableObjects { struct IConfigRecord; }}} diff --git a/Common/Include/commandArgUtil.h b/Common/Include/Config.h similarity index 99% rename from Common/Include/commandArgUtil.h rename to Common/Include/Config.h index ebe6e6af6..1d9925216 100644 --- a/Common/Include/commandArgUtil.h +++ b/Common/Include/Config.h @@ -1,5 +1,5 @@ // -// +// // Copyright (c) Microsoft Corporation. All rights reserved. // // diff --git a/Common/Include/DataReader.h b/Common/Include/DataReader.h index d1b67ea2e..583ec011b 100644 --- a/Common/Include/DataReader.h +++ b/Common/Include/DataReader.h @@ -26,7 +26,7 @@ #include "Basics.h" #include "Matrix.h" #include "Sequences.h" -#include "commandArgUtil.h" // for ConfigParameters +#include "Config.h" // for ConfigParameters #include "ScriptableObjects.h" #include #include diff --git a/Common/Include/DataWriter.h b/Common/Include/DataWriter.h index 5438c13a6..2bd8b174e 100644 --- a/Common/Include/DataWriter.h +++ b/Common/Include/DataWriter.h @@ -25,7 +25,7 @@ #include "Basics.h" #include "Matrix.h" -#include "commandArgUtil.h" // for ConfigParameters +#include "Config.h" // for ConfigParameters #include "ScriptableObjects.h" #include #include diff --git a/DataReader/BinaryReader/BinaryReader.h b/DataReader/BinaryReader/BinaryReader.h index b3234a752..78c0e85d6 100644 --- a/DataReader/BinaryReader/BinaryReader.h +++ b/DataReader/BinaryReader/BinaryReader.h @@ -6,7 +6,7 @@ #pragma once #include "DataReader.h" #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include #include #include diff --git a/DataReader/BinaryReader/BinaryReader.vcxproj b/DataReader/BinaryReader/BinaryReader.vcxproj index 9a3d3c147..8fb941a96 100644 --- a/DataReader/BinaryReader/BinaryReader.vcxproj +++ b/DataReader/BinaryReader/BinaryReader.vcxproj @@ -108,14 +108,11 @@ + - - NotUsing - NotUsing - @@ -133,6 +130,10 @@ + + NotUsing + NotUsing + false diff --git a/DataReader/BinaryReader/BinaryReader.vcxproj.filters b/DataReader/BinaryReader/BinaryReader.vcxproj.filters index 514b92b49..893adb436 100644 --- a/DataReader/BinaryReader/BinaryReader.vcxproj.filters +++ b/DataReader/BinaryReader/BinaryReader.vcxproj.filters @@ -13,9 +13,6 @@ Common - - Common - Common @@ -25,6 +22,9 @@ Common + + Common + @@ -48,6 +48,9 @@ Common\Include + + Common\Include + diff --git a/DataReader/DSSMReader/DSSMReader.h b/DataReader/DSSMReader/DSSMReader.h index d7f0f2b6c..7f0a2dc52 100644 --- a/DataReader/DSSMReader/DSSMReader.h +++ b/DataReader/DSSMReader/DSSMReader.h @@ -7,7 +7,7 @@ #pragma once #include "DataReader.h" #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include "RandomOrdering.h" #include #include diff --git a/DataReader/DSSMReader/DSSMReader.vcxproj b/DataReader/DSSMReader/DSSMReader.vcxproj index c44bbf261..15d5693ba 100644 --- a/DataReader/DSSMReader/DSSMReader.vcxproj +++ b/DataReader/DSSMReader/DSSMReader.vcxproj @@ -118,15 +118,12 @@ false + - - NotUsing - NotUsing - NotUsing @@ -143,6 +140,7 @@ NotUsing NotUsing + diff --git a/DataReader/DSSMReader/DSSMReader.vcxproj.filters b/DataReader/DSSMReader/DSSMReader.vcxproj.filters index 2fcb6e2bd..c0c677c26 100644 --- a/DataReader/DSSMReader/DSSMReader.vcxproj.filters +++ b/DataReader/DSSMReader/DSSMReader.vcxproj.filters @@ -17,9 +17,6 @@ - - Common - Common @@ -47,6 +44,9 @@ Source Files + + Common + @@ -79,5 +79,8 @@ Common\Include + + Common\Include + \ No newline at end of file diff --git a/DataReader/HTKMLFReader/DataReader.cpp b/DataReader/HTKMLFReader/DataReader.cpp index fcfcbb0d0..6aa81645e 100644 --- a/DataReader/HTKMLFReader/DataReader.cpp +++ b/DataReader/HTKMLFReader/DataReader.cpp @@ -21,7 +21,7 @@ #define DATAREADER_EXPORTS #include "DataReader.h" #include "HTKMLFReader.h" -#include "commandArgUtil.h" +#include "Config.h" namespace Microsoft { namespace MSR { namespace CNTK { diff --git a/DataReader/HTKMLFReader/HTKMLFReader.cpp b/DataReader/HTKMLFReader/HTKMLFReader.cpp index cd8d1e82d..6573ddd26 100644 --- a/DataReader/HTKMLFReader/HTKMLFReader.cpp +++ b/DataReader/HTKMLFReader/HTKMLFReader.cpp @@ -23,7 +23,7 @@ #include "minibatchiterator.h" #define DATAREADER_EXPORTS // creating the exports here #include "DataReader.h" -#include "commandArgUtil.h" +#include "Config.h" #include "ScriptableObjects.h" #include "HTKMLFReader.h" #include "TimerUtility.h" diff --git a/DataReader/HTKMLFReader/HTKMLFReader.h b/DataReader/HTKMLFReader/HTKMLFReader.h index 037663313..f58268e81 100644 --- a/DataReader/HTKMLFReader/HTKMLFReader.h +++ b/DataReader/HTKMLFReader/HTKMLFReader.h @@ -6,7 +6,7 @@ // HTKMLFReader.h - Include file for the MTK and MLF format of features and samples #pragma once #include "DataReader.h" -#include "commandArgUtil.h" // for intargvector +#include "Config.h" // for intargvector #include "CUDAPageLockedMemAllocator.h" namespace Microsoft { namespace MSR { namespace CNTK { diff --git a/DataReader/HTKMLFReader/HTKMLFReader.vcxproj b/DataReader/HTKMLFReader/HTKMLFReader.vcxproj index 26ad018d0..f05ad8da7 100644 --- a/DataReader/HTKMLFReader/HTKMLFReader.vcxproj +++ b/DataReader/HTKMLFReader/HTKMLFReader.vcxproj @@ -105,6 +105,7 @@ + diff --git a/DataReader/HTKMLFReader/HTKMLFReader.vcxproj.filters b/DataReader/HTKMLFReader/HTKMLFReader.vcxproj.filters index 053da30a9..07a8fd657 100644 --- a/DataReader/HTKMLFReader/HTKMLFReader.vcxproj.filters +++ b/DataReader/HTKMLFReader/HTKMLFReader.vcxproj.filters @@ -50,6 +50,9 @@ Common\Include + + Common\Include + diff --git a/DataReader/HTKMLFReader/HTKMLFWriter.cpp b/DataReader/HTKMLFReader/HTKMLFWriter.cpp index df67fbf43..5c8d8558b 100644 --- a/DataReader/HTKMLFReader/HTKMLFWriter.cpp +++ b/DataReader/HTKMLFReader/HTKMLFWriter.cpp @@ -17,7 +17,7 @@ #define DATAWRITER_EXPORTS // creating the exports here #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include "HTKMLFWriter.h" #ifdef LEAKDETECT #include // for memory leak detection diff --git a/DataReader/ImageReader/ImageReader.cpp b/DataReader/ImageReader/ImageReader.cpp index 28bb5f0bd..f1beba110 100644 --- a/DataReader/ImageReader/ImageReader.cpp +++ b/DataReader/ImageReader/ImageReader.cpp @@ -8,7 +8,7 @@ #define DATAREADER_EXPORTS // creating the exports here #include "DataReader.h" #include "ImageReader.h" -#include "commandArgUtil.h" +#include "Config.h" #include "ScriptableObjects.h" #include "ConcStack.h" #include diff --git a/DataReader/ImageReader/ImageReader.vcxproj b/DataReader/ImageReader/ImageReader.vcxproj index 4cabc20bb..31c701769 100644 --- a/DataReader/ImageReader/ImageReader.vcxproj +++ b/DataReader/ImageReader/ImageReader.vcxproj @@ -108,14 +108,12 @@ + - - NotUsing - NotUsing @@ -126,6 +124,10 @@ NotUsing + + NotUsing + NotUsing + true @@ -141,7 +143,6 @@ - + \ No newline at end of file diff --git a/DataReader/ImageReader/ImageReader.vcxproj.filters b/DataReader/ImageReader/ImageReader.vcxproj.filters index b3600eb4c..d25a34912 100644 --- a/DataReader/ImageReader/ImageReader.vcxproj.filters +++ b/DataReader/ImageReader/ImageReader.vcxproj.filters @@ -6,9 +6,6 @@ Common - - Common - Common @@ -17,6 +14,12 @@ + + Common + + + Common + @@ -34,6 +37,9 @@ Common\Include + + Common\Include + diff --git a/DataReader/Kaldi2Reader/DataReader.cpp b/DataReader/Kaldi2Reader/DataReader.cpp index 93a5b72b1..3fc621e13 100644 --- a/DataReader/Kaldi2Reader/DataReader.cpp +++ b/DataReader/Kaldi2Reader/DataReader.cpp @@ -20,7 +20,7 @@ #define DATAREADER_EXPORTS #include "DataReader.h" #include "HTKMLFReader.h" -#include "commandArgUtil.h" +#include "Config.h" namespace Microsoft { namespace MSR { namespace CNTK { diff --git a/DataReader/Kaldi2Reader/HTKMLFReader.cpp b/DataReader/Kaldi2Reader/HTKMLFReader.cpp index e49561a97..b07c88a72 100644 --- a/DataReader/Kaldi2Reader/HTKMLFReader.cpp +++ b/DataReader/Kaldi2Reader/HTKMLFReader.cpp @@ -21,7 +21,7 @@ #define DATAREADER_EXPORTS // creating the exports here #include "DataReader.h" #include "HTKMLFReader.h" -#include "commandArgUtil.h" +#include "Config.h" #ifdef LEAKDETECT #include // for memory leak detection #endif diff --git a/DataReader/Kaldi2Reader/HTKMLFReader.h b/DataReader/Kaldi2Reader/HTKMLFReader.h index 51df19e91..a8aeb2420 100644 --- a/DataReader/Kaldi2Reader/HTKMLFReader.h +++ b/DataReader/Kaldi2Reader/HTKMLFReader.h @@ -8,7 +8,7 @@ #include "DataReader.h" #include "KaldiSequenceTrainingDerivative.h" #include "UtteranceDerivativeBuffer.h" -#include "commandArgUtil.h" // for intargvector +#include "Config.h" // for intargvector namespace Microsoft { namespace MSR { namespace CNTK { diff --git a/DataReader/Kaldi2Reader/HTKMLFWriter.cpp b/DataReader/Kaldi2Reader/HTKMLFWriter.cpp index 44588886f..acc7969fa 100644 --- a/DataReader/Kaldi2Reader/HTKMLFWriter.cpp +++ b/DataReader/Kaldi2Reader/HTKMLFWriter.cpp @@ -15,9 +15,9 @@ #define DATAWRITER_EXPORTS // creating the exports here #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include "HTKMLFWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #ifdef LEAKDETECT #include // for memory leak detection #endif diff --git a/DataReader/KaldiReader/DataReader.cpp b/DataReader/KaldiReader/DataReader.cpp index 80e696a74..7ddcd5fe2 100644 --- a/DataReader/KaldiReader/DataReader.cpp +++ b/DataReader/KaldiReader/DataReader.cpp @@ -24,7 +24,7 @@ #define DATAREADER_EXPORTS #include "DataReader.h" #include "HTKMLFReader.h" -#include "commandArgUtil.h" +#include "Config.h" namespace Microsoft { namespace MSR { namespace CNTK { diff --git a/DataReader/KaldiReader/HTKMLFReader.h b/DataReader/KaldiReader/HTKMLFReader.h index d12a41049..397af5253 100644 --- a/DataReader/KaldiReader/HTKMLFReader.h +++ b/DataReader/KaldiReader/HTKMLFReader.h @@ -6,7 +6,7 @@ // HTKMLFReader.h - Include file for the MTK and MLF format of features and samples #pragma once #include "DataReader.h" -#include "commandArgUtil.h" // for intargvector +#include "Config.h" // for intargvector namespace Microsoft { namespace MSR { namespace CNTK { diff --git a/DataReader/KaldiReader/HTKMLFWriter.cpp b/DataReader/KaldiReader/HTKMLFWriter.cpp index 5edadf8ed..89d87d659 100644 --- a/DataReader/KaldiReader/HTKMLFWriter.cpp +++ b/DataReader/KaldiReader/HTKMLFWriter.cpp @@ -26,10 +26,10 @@ #define DATAWRITER_EXPORTS // creating the exports here #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include "HTKMLFWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #ifdef LEAKDETECT #include // for memory leak detection #endif diff --git a/DataReader/LMSequenceReader/LMSequenceReader.vcxproj b/DataReader/LMSequenceReader/LMSequenceReader.vcxproj index 3e3d004cb..5fc1f8a0f 100644 --- a/DataReader/LMSequenceReader/LMSequenceReader.vcxproj +++ b/DataReader/LMSequenceReader/LMSequenceReader.vcxproj @@ -109,6 +109,7 @@ + @@ -116,10 +117,6 @@ - - NotUsing - NotUsing - @@ -134,6 +131,10 @@ NotUsing NotUsing + + NotUsing + NotUsing + false diff --git a/DataReader/LMSequenceReader/SequenceReader.h b/DataReader/LMSequenceReader/SequenceReader.h index ce0c6d33f..bb93fc256 100644 --- a/DataReader/LMSequenceReader/SequenceReader.h +++ b/DataReader/LMSequenceReader/SequenceReader.h @@ -9,7 +9,7 @@ #include "DataReader.h" #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include "SequenceParser.h" #include "RandomOrdering.h" #include diff --git a/DataReader/LMSequenceReader/SequenceWriter.cpp b/DataReader/LMSequenceReader/SequenceWriter.cpp index 6b2a2691f..915052c72 100644 --- a/DataReader/LMSequenceReader/SequenceWriter.cpp +++ b/DataReader/LMSequenceReader/SequenceWriter.cpp @@ -16,7 +16,7 @@ #include "DataWriter.h" #include "SequenceReader.h" #include "SequenceWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #ifdef LEAKDETECT #include // for memory leak detection #endif diff --git a/DataReader/LUSequenceReader/LUSequenceReader.h b/DataReader/LUSequenceReader/LUSequenceReader.h index 4aa0a97f4..1dcd51eb2 100644 --- a/DataReader/LUSequenceReader/LUSequenceReader.h +++ b/DataReader/LUSequenceReader/LUSequenceReader.h @@ -11,7 +11,7 @@ #include "DataReader.h" #include "DataWriter.h" #include "LUSequenceParser.h" -#include "commandArgUtil.h" // for intargvector +#include "Config.h" // for intargvector #include "ScriptableObjects.h" #include #include diff --git a/DataReader/LUSequenceReader/LUSequenceReader.vcxproj b/DataReader/LUSequenceReader/LUSequenceReader.vcxproj index f8fe14548..531646a90 100644 --- a/DataReader/LUSequenceReader/LUSequenceReader.vcxproj +++ b/DataReader/LUSequenceReader/LUSequenceReader.vcxproj @@ -108,6 +108,7 @@ + @@ -116,10 +117,6 @@ - - NotUsing - NotUsing - NotUsing @@ -133,6 +130,10 @@ NotUsing NotUsing + + NotUsing + NotUsing + diff --git a/DataReader/LUSequenceReader/LUSequenceReader.vcxproj.filters b/DataReader/LUSequenceReader/LUSequenceReader.vcxproj.filters index 53ddd62ae..8e0fb07c2 100644 --- a/DataReader/LUSequenceReader/LUSequenceReader.vcxproj.filters +++ b/DataReader/LUSequenceReader/LUSequenceReader.vcxproj.filters @@ -7,9 +7,6 @@ - - Common - Common @@ -22,6 +19,10 @@ Common + + + Common + @@ -47,6 +48,10 @@ Duplicates to remove + + + Common\Include + diff --git a/DataReader/LUSequenceReader/LUSequenceWriter.cpp b/DataReader/LUSequenceReader/LUSequenceWriter.cpp index c5208be84..3d45077c4 100644 --- a/DataReader/LUSequenceReader/LUSequenceWriter.cpp +++ b/DataReader/LUSequenceReader/LUSequenceWriter.cpp @@ -15,7 +15,7 @@ #define DATAWRITER_EXPORTS // creating the exports here #include "DataWriter.h" #include "LUSequenceWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #ifdef LEAKDETECT #include // for memory leak detection #endif diff --git a/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.h b/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.h index 3ba0d5e02..d23ef6a33 100644 --- a/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.h +++ b/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.h @@ -7,7 +7,7 @@ #pragma once #include "DataReader.h" #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include "RandomOrdering.h" #include #include diff --git a/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj b/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj index e512d3782..7af68f60d 100644 --- a/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj +++ b/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj @@ -110,15 +110,12 @@ + - - NotUsing - NotUsing - NotUsing @@ -137,6 +134,10 @@ NotUsing NotUsing + + NotUsing + NotUsing + NotUsing diff --git a/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj.filters b/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj.filters index e95378aef..b74a04832 100644 --- a/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj.filters +++ b/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj.filters @@ -13,9 +13,6 @@ - - Common - Common @@ -35,6 +32,9 @@ + + Common + @@ -61,5 +61,8 @@ Common\Include + + Common\Include + \ No newline at end of file diff --git a/DataReader/SparsePCReader/SparsePCReader.h b/DataReader/SparsePCReader/SparsePCReader.h index c921049c0..02eb07a27 100644 --- a/DataReader/SparsePCReader/SparsePCReader.h +++ b/DataReader/SparsePCReader/SparsePCReader.h @@ -7,7 +7,7 @@ #pragma once #include "DataReader.h" #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include "RandomOrdering.h" #include #include diff --git a/DataReader/SparsePCReader/SparsePCReader.vcxproj b/DataReader/SparsePCReader/SparsePCReader.vcxproj index d333e1be2..e3507927d 100644 --- a/DataReader/SparsePCReader/SparsePCReader.vcxproj +++ b/DataReader/SparsePCReader/SparsePCReader.vcxproj @@ -118,15 +118,12 @@ false + - - NotUsing - NotUsing - NotUsing @@ -143,6 +140,9 @@ NotUsing NotUsing + + NotUsing + Use diff --git a/DataReader/SparsePCReader/SparsePCReader.vcxproj.filters b/DataReader/SparsePCReader/SparsePCReader.vcxproj.filters index 2d5235872..be75c073d 100644 --- a/DataReader/SparsePCReader/SparsePCReader.vcxproj.filters +++ b/DataReader/SparsePCReader/SparsePCReader.vcxproj.filters @@ -21,9 +21,6 @@ - - Common - Common @@ -51,6 +48,9 @@ Source Files + + Common + @@ -83,5 +83,8 @@ Common\Include + + Common\Include + \ No newline at end of file diff --git a/DataReader/UCIFastReader/UCIFastReader.h b/DataReader/UCIFastReader/UCIFastReader.h index 5f4b16a05..5b3ea86c9 100644 --- a/DataReader/UCIFastReader/UCIFastReader.h +++ b/DataReader/UCIFastReader/UCIFastReader.h @@ -8,7 +8,7 @@ #include "stdafx.h" #include "DataReader.h" #include "DataWriter.h" -#include "commandArgUtil.h" +#include "Config.h" #include "RandomOrdering.h" #include "UCIParser.h" #include diff --git a/DataReader/UCIFastReader/UCIFastReader.vcxproj b/DataReader/UCIFastReader/UCIFastReader.vcxproj index 02cd08c59..8bb36a6b3 100644 --- a/DataReader/UCIFastReader/UCIFastReader.vcxproj +++ b/DataReader/UCIFastReader/UCIFastReader.vcxproj @@ -107,16 +107,13 @@ + - - NotUsing - NotUsing - @@ -131,6 +128,10 @@ NotUsing NotUsing + + NotUsing + NotUsing + false diff --git a/DataReader/UCIFastReader/UCIFastReader.vcxproj.filters b/DataReader/UCIFastReader/UCIFastReader.vcxproj.filters index 14d8d4e57..de594b0c2 100644 --- a/DataReader/UCIFastReader/UCIFastReader.vcxproj.filters +++ b/DataReader/UCIFastReader/UCIFastReader.vcxproj.filters @@ -6,9 +6,6 @@ - - Common - Common @@ -24,6 +21,9 @@ Common + + Common + @@ -48,6 +48,9 @@ Common\Include + + Common\Include + diff --git a/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Programmer_Chapter.lyx b/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Programmer_Chapter.lyx index 11b891766..f714f978d 100644 --- a/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Programmer_Chapter.lyx +++ b/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Programmer_Chapter.lyx @@ -2291,7 +2291,7 @@ status open \begin_layout Plain Layout -#include "commandArgUtil.h" +#include "Config.h" \end_layout \begin_layout Plain Layout diff --git a/MachineLearning/CNTK/CNTK.cpp b/MachineLearning/CNTK/CNTK.cpp index 2b9478fa8..1757c262d 100644 --- a/MachineLearning/CNTK/CNTK.cpp +++ b/MachineLearning/CNTK/CNTK.cpp @@ -41,7 +41,7 @@ #include "CPUMatrix.h" // used for SetNumThreads() #include "SGD.h" #include "MPIWrapper.h" -#include "commandArgUtil.h" +#include "Config.h" #include "MultiNetworksSGD.h" #include "SimpleEvaluator.h" #include "SimpleOutputWriter.h" diff --git a/MachineLearning/CNTK/CNTK.vcxproj b/MachineLearning/CNTK/CNTK.vcxproj index e055c96ce..ef9c755f0 100644 --- a/MachineLearning/CNTK/CNTK.vcxproj +++ b/MachineLearning/CNTK/CNTK.vcxproj @@ -214,7 +214,10 @@ - + + NotUsing + NotUsing + diff --git a/MachineLearning/CNTK/CNTK.vcxproj.filters b/MachineLearning/CNTK/CNTK.vcxproj.filters index 0201ef970..61b90883b 100644 --- a/MachineLearning/CNTK/CNTK.vcxproj.filters +++ b/MachineLearning/CNTK/CNTK.vcxproj.filters @@ -1,9 +1,6 @@  - - Common - Common @@ -59,6 +56,9 @@ Common\Include + + Common + diff --git a/MachineLearning/CNTK/ModelEditLanguage.h b/MachineLearning/CNTK/ModelEditLanguage.h index d5b42c747..65ba8173f 100644 --- a/MachineLearning/CNTK/ModelEditLanguage.h +++ b/MachineLearning/CNTK/ModelEditLanguage.h @@ -6,7 +6,7 @@ #pragma once #include "Basics.h" -#include "commandArgUtil.h" +#include "Config.h" #include "ComputationNetwork.h" #include "ComputationNetworkBuilder.h" #include "NetworkDescriptionLanguage.h" diff --git a/MachineLearning/CNTK/NDLNetworkBuilder.h b/MachineLearning/CNTK/NDLNetworkBuilder.h index 2ccc9eca9..ba350f182 100644 --- a/MachineLearning/CNTK/NDLNetworkBuilder.h +++ b/MachineLearning/CNTK/NDLNetworkBuilder.h @@ -9,7 +9,6 @@ #include "IExecutionEngine.h" #include "Basics.h" #include -//#include "commandArgUtil.h" #include "DataReader.h" #include "Matrix.h" #include "NDLUtil.h" diff --git a/MachineLearning/CNTK/NDLUtil.h b/MachineLearning/CNTK/NDLUtil.h index 9860a1e8c..ab8b4647d 100644 --- a/MachineLearning/CNTK/NDLUtil.h +++ b/MachineLearning/CNTK/NDLUtil.h @@ -11,7 +11,7 @@ #include "ComputationNetwork.h" #include "SynchronousExecutionEngine.h" #include -#include "commandArgUtil.h" +#include "Config.h" #include using namespace std; diff --git a/MachineLearning/CNTK/SimpleNetworkBuilder.h b/MachineLearning/CNTK/SimpleNetworkBuilder.h index 869cbd202..ccf257e3b 100644 --- a/MachineLearning/CNTK/SimpleNetworkBuilder.h +++ b/MachineLearning/CNTK/SimpleNetworkBuilder.h @@ -10,7 +10,7 @@ #include "BestGpu.h" #include "ComputationNetwork.h" -#include "commandArgUtil.h" +#include "Config.h" // TODO: giving up moving stuff for now, running out of time. The following #includes should not be necessary once the hard-working code in here gets moved to .cpp #include "InputAndParamNodes.h" diff --git a/MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj b/MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj index 5020210c5..47463d05d 100644 --- a/MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj +++ b/MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj @@ -155,6 +155,7 @@ + diff --git a/MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj.filters b/MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj.filters index 1237a8c52..1cf679f55 100644 --- a/MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj.filters +++ b/MachineLearning/CNTKComputationNetworkLib/CNTKComputationNetworkLib.vcxproj.filters @@ -126,6 +126,9 @@ Common\Include + + Common\Include + diff --git a/MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h b/MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h index c85d782a3..94e1b20c5 100644 --- a/MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h +++ b/MachineLearning/CNTKComputationNetworkLib/ComputationNetwork.h @@ -6,27 +6,10 @@ // #pragma once -// TODOs: -// - automatic inference of time window w.r.t. delay nodes (and related nodes such as a temporal pooling) -// - have overrides of RuntimeError etc. in ComputationNode, which prepend the error string with the node name and operation -// - code prettification: -// - sort all node implementations' methods into the same order; esp, ForwardProp() comes before partial -// - sort important nodes first; move unused/experimental nodes into source files named accordingly -// - renaming: -// Evaluate(), ComputeGradient() -// frameRange -> t // make it more lightweight -// - finish the job: -// - everywhere complete folding ForwardPropS() into ForwardProp(FrameRange()), same for partial -// - revise node constructors, merge by means of default parameters -// - known issues that need actual test cases to be fixed: -// - CRFNode::BackpropTo() fails for >1 parallel sequence due to DataFor() not being able to return whole sequences -// - implement reading of MB Layout in Binary, DSSM, and LivbSVM readers --is DSSM already done? - -// The basic idea of this implementation is learned from Brian Guenter - +#include "Basics.h" #include "File.h" #include "Matrix.h" -#include "commandArgUtil.h" // for nocase_compare +#include "Config.h" #include "ComputationNode.h" #include "ScriptableObjects.h" @@ -51,93 +34,6 @@ class ComputationNetwork : public ScriptableObjects::Object, public ScriptableOb { public: typedef shared_ptr ComputationNetworkPtr; -protected: - - // FlowControlNodes for internal use by this class: - - // ----------------------------------------------------------------------- - // SEQTraversalFlowControlNode -- FlowControlNode to traverse a (sub-)network time step by time step - // - // This is to implement recurrent loops. All nodes inside a loop are listed - // inside this node. This node's ForwardProp() function will execute - // them inside a loop over all time steps of the recurrence. - // For every time step, the entire chain of nodes is called, with the time index - // passed as a FrameRange object. - // ----------------------------------------------------------------------- - - class SEQTraversalFlowControlNode : public FlowControlNode - { - public: // m_nestedNodes needed public by ComputationNetwork::FindInRecurrentLoops(), which really should be part of SEQTraversalFlowControlNode - typedef FlowControlNode Base; using Base::m_nestedNodes; - public: - // next steps: - // - change m_recurrentInfo to use shared_ptrs to ComputationNodeBase - virtual const std::wstring OperationName() const override { return L"SEQTraversalFlowControlNode"; } - virtual void BeginForwardProp() override; - virtual void ForwardProp(const FrameRange &) override; - virtual void EndForwardProp() override; - virtual void BeginBackprop() override; - virtual void BackpropTo(const size_t inputIndex, const FrameRange &) override { NOT_IMPLEMENTED; } // ugh, call Backprop() instead - virtual void EndBackprop() override; - virtual void Backprop(const FrameRange & frameRange, bool childrenInThisLoop, bool childrenInOuterLoop) override; - virtual void RequestMatricesBeforeForwardProp(MatrixPool& matrixPool); - virtual void ReleaseMatricesAfterForwardProp(MatrixPool& matrixPool); - virtual void AllocateGradientMatricesForInputs(MatrixPool& matrixPool); - virtual void RequestMatricesBeforeBackprop(MatrixPool& matrixPool); - virtual void ReleaseMatricesAfterBackprop(MatrixPool& matrixPool); - virtual bool IsOutputOlderThanInputs() const override; - public: - //std::vector m_nestedNodes; // all nodes involved in this loop, in evaluation order - ComputationNodeBasePtr m_sourceNode; // one of the nodes of the loop --TODO: What is the special meaning of this node? It seems to always be a delay node. - int m_loopId; // the loop id (index in m_recurrentInfo array) - int m_steppingDirection; // +1 if left to right (t=0..T-1), -1 if rightt to left (t=T-1..0) - - SEQTraversalFlowControlNode(int loopId, ComputationNodeBasePtr cur) : - m_loopId(loopId), - m_sourceNode(cur) - { - SetNodeName(L"Loop_" + m_sourceNode->NodeName()); - } - }; - - // ----------------------------------------------------------------------- - // PARTraversalFlowControlNode -- FlowControlNode that traverses a (sub-)network - // - // This node contains a list of nodes in a (sub-)network. This node's - // ForwardProp() method will execute all those nodes once in PAR mode, - // that is, by passing a FrameRange object that represents to operate - // on all frames in the node simultaneously. - // - // The outermost network level is also represented by this node for execution. - // ----------------------------------------------------------------------- - - class PARTraversalFlowControlNode : public FlowControlNode - { - typedef FlowControlNode Base; using Base::m_nestedNodes; - public: - virtual const std::wstring OperationName() const override { return L"PARTraversalFlowControlNode"; } - virtual void BeginForwardProp() override { } - virtual void ForwardProp(const FrameRange &) override; - virtual void EndForwardProp() override { } - virtual void BeginBackprop() override { } - virtual void BackpropTo(const size_t inputIndex, const FrameRange &) override { NOT_IMPLEMENTED; } // ugh, call Backprop() instead - virtual void EndBackprop() override { } - virtual void Backprop(const FrameRange & frameRange, bool childrenInThisLoop, bool childrenInOuterLoop) override; - virtual void RequestMatricesBeforeForwardProp(MatrixPool& matrixPool); - virtual void ReleaseMatricesAfterForwardProp(MatrixPool& matrixPool); - virtual void AllocateGradientMatricesForInputs(MatrixPool& matrixPool); - virtual void RequestMatricesBeforeBackprop(MatrixPool& matrixPool); - virtual void ReleaseMatricesAfterBackprop(MatrixPool& matrixPool); - public: - // this special constructor constructs the top-level network node - // There is currently no other constructor for inner nested PAR-traversed sub-networks, but there will be. - PARTraversalFlowControlNode(/*const*/ std::vector> & recurrentInfo, const std::list & allNodes); - // Base::m_nestedNodes contains all top-level nodes, in evaluation order - }; - -public: - - // TODO: sort methods into functional groups; some methods are at random places // ----------------------------------------------------------------------- // construction @@ -516,6 +412,8 @@ public: static void UpdateEvalTimeStamps(const std::vector & nodes); void ResetEvalTimeStamp(); +protected: + class SEQTraversalFlowControlNode; private: static std::shared_ptr FindInRecurrentLoops(/*const*/ std::vector> & recurrentInfo, const ComputationNodeBasePtr& node); bool IsTypicalCriterionNode(ComputationNodeBasePtr nodePtr); @@ -874,12 +772,7 @@ public: return GetCalcOrder(rootNode, m_cacheGradientCalcOrders, false/*means for backprop*/, false/*skipPairNetwork*/); } - ComputationNodeBasePtr GetOuterLoopNode(const ComputationNodeBasePtr& rootNode) - { - if (m_cachedOuterLoopNodes.find(rootNode) == m_cachedOuterLoopNodes.end()) - m_cachedOuterLoopNodes[rootNode] = make_shared(m_recurrentInfo, GetEvalOrder(rootNode, false)); - return m_cachedOuterLoopNodes[rootNode]; - } + ComputationNodeBasePtr GetOuterLoopNode(const ComputationNodeBasePtr& rootNode); private: @@ -929,6 +822,92 @@ public: return vector(); } +protected: + + // FlowControlNodes for internal use by this class: + + // ----------------------------------------------------------------------- + // SEQTraversalFlowControlNode -- FlowControlNode to traverse a (sub-)network time step by time step + // + // This is to implement recurrent loops. All nodes inside a loop are listed + // inside this node. This node's ForwardProp() function will execute + // them inside a loop over all time steps of the recurrence. + // For every time step, the entire chain of nodes is called, with the time index + // passed as a FrameRange object. + // ----------------------------------------------------------------------- + + class SEQTraversalFlowControlNode : public FlowControlNode + { + public: // m_nestedNodes needed public by ComputationNetwork::FindInRecurrentLoops(), which really should be part of SEQTraversalFlowControlNode + typedef FlowControlNode Base; using Base::m_nestedNodes; + public: + // next steps: + // - change m_recurrentInfo to use shared_ptrs to ComputationNodeBase + virtual const std::wstring OperationName() const override { return L"SEQTraversalFlowControlNode"; } + virtual void BeginForwardProp() override; + virtual void ForwardProp(const FrameRange &) override; + virtual void EndForwardProp() override; + virtual void BeginBackprop() override; + virtual void BackpropTo(const size_t inputIndex, const FrameRange &) override { NOT_IMPLEMENTED; } // ugh, call Backprop() instead + virtual void EndBackprop() override; + virtual void Backprop(const FrameRange & frameRange, bool childrenInThisLoop, bool childrenInOuterLoop) override; + virtual void RequestMatricesBeforeForwardProp(MatrixPool& matrixPool); + virtual void ReleaseMatricesAfterForwardProp(MatrixPool& matrixPool); + virtual void AllocateGradientMatricesForInputs(MatrixPool& matrixPool); + virtual void RequestMatricesBeforeBackprop(MatrixPool& matrixPool); + virtual void ReleaseMatricesAfterBackprop(MatrixPool& matrixPool); + virtual bool IsOutputOlderThanInputs() const override; + public: + //std::vector m_nestedNodes; // all nodes involved in this loop, in evaluation order + ComputationNodeBasePtr m_sourceNode; // one of the nodes of the loop --TODO: What is the special meaning of this node? It seems to always be a delay node. + int m_loopId; // the loop id (index in m_recurrentInfo array) + int m_steppingDirection; // +1 if left to right (t=0..T-1), -1 if rightt to left (t=T-1..0) + + SEQTraversalFlowControlNode(int loopId, ComputationNodeBasePtr cur) : + m_loopId(loopId), + m_sourceNode(cur) + { + SetNodeName(L"Loop_" + m_sourceNode->NodeName()); + } + }; + + // ----------------------------------------------------------------------- + // PARTraversalFlowControlNode -- FlowControlNode that traverses a (sub-)network + // + // This node contains a list of nodes in a (sub-)network. This node's + // ForwardProp() method will execute all those nodes once in PAR mode, + // that is, by passing a FrameRange object that represents to operate + // on all frames in the node simultaneously. + // + // The outermost network level is also represented by this node for execution. + // ----------------------------------------------------------------------- + + class PARTraversalFlowControlNode : public FlowControlNode + { + typedef FlowControlNode Base; using Base::m_nestedNodes; + public: + virtual const std::wstring OperationName() const override { return L"PARTraversalFlowControlNode"; } + virtual void BeginForwardProp() override { } + virtual void ForwardProp(const FrameRange &) override; + virtual void EndForwardProp() override { } + virtual void BeginBackprop() override { } + virtual void BackpropTo(const size_t inputIndex, const FrameRange &) override { NOT_IMPLEMENTED; } // ugh, call Backprop() instead + virtual void EndBackprop() override { } + virtual void Backprop(const FrameRange & frameRange, bool childrenInThisLoop, bool childrenInOuterLoop) override; + virtual void RequestMatricesBeforeForwardProp(MatrixPool& matrixPool); + virtual void ReleaseMatricesAfterForwardProp(MatrixPool& matrixPool); + virtual void AllocateGradientMatricesForInputs(MatrixPool& matrixPool); + virtual void RequestMatricesBeforeBackprop(MatrixPool& matrixPool); + virtual void ReleaseMatricesAfterBackprop(MatrixPool& matrixPool); + public: + // this special constructor constructs the top-level network node + // There is currently no other constructor for inner nested PAR-traversed sub-networks, but there will be. + PARTraversalFlowControlNode(/*const*/ std::vector> & recurrentInfo, const std::list & allNodes); + // Base::m_nestedNodes contains all top-level nodes, in evaluation order + }; + +public: + protected: // ----------------------------------------------------------------------- @@ -979,4 +958,20 @@ private: // TODO: make all private that can be made private }; typedef ComputationNetwork::ComputationNetworkPtr ComputationNetworkPtr; +// TODOs: +// - automatic inference of time window w.r.t. delay nodes (and related nodes such as a temporal pooling) +// - have overrides of RuntimeError etc. in ComputationNode, which prepend the error string with the node name and operation +// - code prettification: +// - sort all node implementations' methods into the same order; esp, ForwardProp() comes before partial +// - sort important nodes first; move unused/experimental nodes into source files named accordingly +// - renaming: +// Evaluate(), ComputeGradient() +// frameRange -> t // make it more lightweight +// - finish the job: +// - everywhere complete folding ForwardPropS() into ForwardProp(FrameRange()), same for partial +// - revise node constructors, merge by means of default parameters +// - known issues that need actual test cases to be fixed: +// - CRFNode::BackpropTo() fails for >1 parallel sequence due to DataFor() not being able to return whole sequences +// - implement reading of MB Layout in Binary, DSSM, and LivbSVM readers --is DSSM already done? + }}} diff --git a/MachineLearning/CNTKComputationNetworkLib/ComputationNetworkEvaluation.cpp b/MachineLearning/CNTKComputationNetworkLib/ComputationNetworkEvaluation.cpp index 0c3680270..ab479d917 100644 --- a/MachineLearning/CNTKComputationNetworkLib/ComputationNetworkEvaluation.cpp +++ b/MachineLearning/CNTKComputationNetworkLib/ComputationNetworkEvaluation.cpp @@ -75,6 +75,13 @@ namespace Microsoft { namespace MSR { namespace CNTK { GetOuterLoopNode(rootNode)->Backprop(FrameRange(nullptr), true, true); } + ComputationNodeBasePtr ComputationNetwork::GetOuterLoopNode(const ComputationNodeBasePtr& rootNode) + { + if (m_cachedOuterLoopNodes.find(rootNode) == m_cachedOuterLoopNodes.end()) + m_cachedOuterLoopNodes[rootNode] = make_shared(m_recurrentInfo, GetEvalOrder(rootNode, false)); + return m_cachedOuterLoopNodes[rootNode]; + } + // ----------------------------------------------------------------------- // PARTraversalFlowControlNode methods -- implements PAR traversal // diff --git a/MachineLearning/CNTKEval/CNTKEval.vcxproj b/MachineLearning/CNTKEval/CNTKEval.vcxproj index 21c3627b5..47a061525 100644 --- a/MachineLearning/CNTKEval/CNTKEval.vcxproj +++ b/MachineLearning/CNTKEval/CNTKEval.vcxproj @@ -119,6 +119,7 @@ + @@ -131,9 +132,7 @@ - - NotUsing - + NotUsing diff --git a/MachineLearning/CNTKEval/CNTKEval.vcxproj.filters b/MachineLearning/CNTKEval/CNTKEval.vcxproj.filters index f74d13260..65ad6e184 100644 --- a/MachineLearning/CNTKEval/CNTKEval.vcxproj.filters +++ b/MachineLearning/CNTKEval/CNTKEval.vcxproj.filters @@ -2,9 +2,6 @@ - - Common - Common @@ -26,6 +23,9 @@ Misc + + Common + @@ -58,6 +58,9 @@ Misc + + Common\Include + diff --git a/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.cpp b/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.cpp index ffc3c0f16..6781005d2 100644 --- a/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.cpp +++ b/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include "Eval.h" #include "DataReader.h" -#include "commandArgUtil.h" +#include "Config.h" using namespace Microsoft::MSR::CNTK; // process the command diff --git a/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.vcxproj b/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.vcxproj index efa0d8ae7..cd46e38b9 100644 --- a/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.vcxproj +++ b/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.vcxproj @@ -93,7 +93,7 @@ - + NotUsing NotUsing diff --git a/MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj b/MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj index 0248929ba..b98fac88c 100644 --- a/MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj +++ b/MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj @@ -155,7 +155,7 @@ - + @@ -198,7 +198,10 @@ - + + NotUsing + NotUsing + diff --git a/MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj.filters b/MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj.filters index 769a5c4cb..9dc7df710 100644 --- a/MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj.filters +++ b/MachineLearning/CNTKSGDLib/CNTKSGDLib.vcxproj.filters @@ -1,9 +1,6 @@  - - Common - Common @@ -28,14 +25,14 @@ SGD + + Common + Common\Include - - Common\Include - Common\Include @@ -165,6 +162,9 @@ Common\Include + + Common\Include + diff --git a/MachineLearning/CNTKSGDLib/MultiNetworksSGD.h b/MachineLearning/CNTKSGDLib/MultiNetworksSGD.h index b21320524..90f2f478c 100644 --- a/MachineLearning/CNTKSGDLib/MultiNetworksSGD.h +++ b/MachineLearning/CNTKSGDLib/MultiNetworksSGD.h @@ -18,7 +18,7 @@ #include #include #include "fileutil.h" -#include "commandArgUtil.h" +#include "Config.h" #include #include #include "TimerUtility.h" diff --git a/MachineLearning/CNTKSGDLib/SGD.cpp b/MachineLearning/CNTKSGDLib/SGD.cpp index 277d0a0ea..252cff085 100644 --- a/MachineLearning/CNTKSGDLib/SGD.cpp +++ b/MachineLearning/CNTKSGDLib/SGD.cpp @@ -1840,7 +1840,7 @@ namespace Microsoft { namespace MSR { namespace CNTK { // We optionally break the minibatch into sub-minibatches. // This, when enabled, is used when a full minibatch does not fit into GPU RAM. - size_t actualNumSubminibatches = numSubminibatchesNeeded == 1 ? 1 : smbDispatcher.GetMinibatchIntoCache(*trainSetDataReader, *net, *inputMatrices, numSubminibatchesNeeded); + size_t actualNumSubminibatches = numSubminibatchesNeeded <= 1 ? 1 : smbDispatcher.GetMinibatchIntoCache(*trainSetDataReader, *net, *inputMatrices, numSubminibatchesNeeded); for (size_t ismb = 0; ismb < actualNumSubminibatches; ismb++) { if (actualNumSubminibatches > 1) diff --git a/MachineLearning/CNTKSGDLib/SGD.h b/MachineLearning/CNTKSGDLib/SGD.h index 5c20516ca..dacbf6dac 100644 --- a/MachineLearning/CNTKSGDLib/SGD.h +++ b/MachineLearning/CNTKSGDLib/SGD.h @@ -17,7 +17,7 @@ #include #include #include "fileutil.h" -#include "commandArgUtil.h" +#include "Config.h" #include #include #include "Profiler.h" diff --git a/Makefile b/Makefile index e4023d77a..33d836795 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ $(BUILDINFO): Scripts/genrate_build_info # Define all sources that need to be built COMMON_SRC =\ - Common/ConfigFile.cpp \ + Common/Config.cpp \ Common/DataReader.cpp \ Common/DataWriter.cpp \ Common/DebugUtil.cpp \ diff --git a/Tests/UnitTests/UCIFastReaderTests/DataReaderTests.cpp b/Tests/UnitTests/UCIFastReaderTests/DataReaderTests.cpp index ba2810252..a988bbbf7 100644 --- a/Tests/UnitTests/UCIFastReaderTests/DataReaderTests.cpp +++ b/Tests/UnitTests/UCIFastReaderTests/DataReaderTests.cpp @@ -5,7 +5,7 @@ // #include "stdafx.h" #include "Matrix.h" -#include "commandArgUtil.h" +#include "Config.h" #include "DataReader.h" #include "boost/filesystem.hpp" diff --git a/Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj b/Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj index ee6817a8b..aa885a07c 100644 --- a/Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj +++ b/Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj @@ -117,7 +117,7 @@ - + diff --git a/Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj.filters b/Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj.filters index 792ed3c30..d485dc27b 100644 --- a/Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj.filters +++ b/Tests/UnitTests/UCIFastReaderTests/UCIFastReaderTests.vcxproj.filters @@ -2,9 +2,6 @@ - - Common - Common @@ -24,6 +21,9 @@ Common + + Common +