diff --git a/CNTK.sln b/CNTK.sln index 3a3cb8f81..7aeef500f 100644 --- a/CNTK.sln +++ b/CNTK.sln @@ -105,7 +105,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QuickE2E", "QuickE2E", "{4B Tests\EndToEndTests\Speech\QuickE2E\baseline.gpu.txt = Tests\EndToEndTests\Speech\QuickE2E\baseline.gpu.txt Tests\EndToEndTests\Speech\QuickE2E\baseline.windows.cpu.txt = Tests\EndToEndTests\Speech\QuickE2E\baseline.windows.cpu.txt Tests\EndToEndTests\Speech\QuickE2E\baseline.windows.gpu.txt = Tests\EndToEndTests\Speech\QuickE2E\baseline.windows.gpu.txt - Tests\EndToEndTests\Speech\QuickE2E\cntk.config = Tests\EndToEndTests\Speech\QuickE2E\cntk.config + Tests\EndToEndTests\Speech\QuickE2E\cntk.cntk = Tests\EndToEndTests\Speech\QuickE2E\cntk.cntk Tests\EndToEndTests\Speech\QuickE2E\run-test = Tests\EndToEndTests\Speech\QuickE2E\run-test Tests\EndToEndTests\Speech\QuickE2E\testcases.yml = Tests\EndToEndTests\Speech\QuickE2E\testcases.yml EndProjectSection @@ -121,7 +121,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{5F733BBA-F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LSTM", "LSTM", "{19EE975B-232D-49F0-94C7-6F1C6424FB53}" ProjectSection(SolutionItems) = preProject - Tests\EndToEndTests\Speech\LSTM\cntk.config = Tests\EndToEndTests\Speech\LSTM\cntk.config + Tests\EndToEndTests\Speech\LSTM\cntk.cntk = Tests\EndToEndTests\Speech\LSTM\cntk.cntk Tests\EndToEndTests\Speech\LSTM\lstm.bs = Tests\EndToEndTests\Speech\LSTM\lstm.bs Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\macros.txt = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\macros.txt EndProjectSection @@ -139,7 +139,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SGDLib", "Source\SGDLib\SGD EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ParallelTraining", "ParallelTraining", "{5E666C53-2D82-49C9-9127-3FDDC321C741}" ProjectSection(SolutionItems) = preProject - Tests\EndToEndTests\ParallelTraining\SimpleMultiGPU.config = Tests\EndToEndTests\ParallelTraining\SimpleMultiGPU.config + Tests\EndToEndTests\ParallelTraining\SimpleMultiGPU.cntk = Tests\EndToEndTests\ParallelTraining\SimpleMultiGPU.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{6D1353D6-F196-466F-B886-F16D48759B20}" @@ -233,7 +233,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FullUtterance", "FullUttera EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DNN", "DNN", "{6994C86D-A672-4254-824A-51F4DFEB807F}" ProjectSection(SolutionItems) = preProject - Tests\EndToEndTests\Speech\DNN\cntk.config = Tests\EndToEndTests\Speech\DNN\cntk.config + Tests\EndToEndTests\Speech\DNN\cntk.cntk = Tests\EndToEndTests\Speech\DNN\cntk.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Parallel1BitQuantization", "Parallel1BitQuantization", "{FD88A77E-A839-4513-AC5C-AD92447BE229}" @@ -263,7 +263,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DiscriminativePreTraining", Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\baseline.gpu.txt = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\baseline.gpu.txt Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\baseline.windows.cpu.txt = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\baseline.windows.cpu.txt Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\baseline.windows.gpu.txt = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\baseline.windows.gpu.txt - Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\cntk_dpt.config = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\cntk_dpt.config + Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\cntk_dpt.cntk = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\cntk_dpt.cntk Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\dnn.txt = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\dnn.txt Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\dnn_1layer.txt = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\dnn_1layer.txt Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\macros.txt = Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining\macros.txt @@ -290,7 +290,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SequenceTraining", "Sequenc Tests\EndToEndTests\Speech\DNN\SequenceTraining\add_layer.mel = Tests\EndToEndTests\Speech\DNN\SequenceTraining\add_layer.mel Tests\EndToEndTests\Speech\DNN\SequenceTraining\baseline.gpu.txt = Tests\EndToEndTests\Speech\DNN\SequenceTraining\baseline.gpu.txt Tests\EndToEndTests\Speech\DNN\SequenceTraining\baseline.windows.gpu.txt = Tests\EndToEndTests\Speech\DNN\SequenceTraining\baseline.windows.gpu.txt - Tests\EndToEndTests\Speech\DNN\SequenceTraining\cntk_sequence.config = Tests\EndToEndTests\Speech\DNN\SequenceTraining\cntk_sequence.config + Tests\EndToEndTests\Speech\DNN\SequenceTraining\cntk_sequence.cntk = Tests\EndToEndTests\Speech\DNN\SequenceTraining\cntk_sequence.cntk Tests\EndToEndTests\Speech\DNN\SequenceTraining\dnn.txt = Tests\EndToEndTests\Speech\DNN\SequenceTraining\dnn.txt Tests\EndToEndTests\Speech\DNN\SequenceTraining\dnn_1layer.txt = Tests\EndToEndTests\Speech\DNN\SequenceTraining\dnn_1layer.txt Tests\EndToEndTests\Speech\DNN\SequenceTraining\macros.txt = Tests\EndToEndTests\Speech\DNN\SequenceTraining\macros.txt @@ -316,7 +316,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QuickE2E", "QuickE2E", "{2A Tests\EndToEndTests\Image\QuickE2E\baseline.windows.debug.gpu.txt = Tests\EndToEndTests\Image\QuickE2E\baseline.windows.debug.gpu.txt Tests\EndToEndTests\Image\QuickE2E\baseline.windows.release.cpu.txt = Tests\EndToEndTests\Image\QuickE2E\baseline.windows.release.cpu.txt Tests\EndToEndTests\Image\QuickE2E\baseline.windows.release.gpu.txt = Tests\EndToEndTests\Image\QuickE2E\baseline.windows.release.gpu.txt - Tests\EndToEndTests\Image\QuickE2E\cntk.config = Tests\EndToEndTests\Image\QuickE2E\cntk.config + Tests\EndToEndTests\Image\QuickE2E\cntk.cntk = Tests\EndToEndTests\Image\QuickE2E\cntk.cntk Tests\EndToEndTests\Image\QuickE2E\Convolution.ndl = Tests\EndToEndTests\Image\QuickE2E\Convolution.ndl Tests\EndToEndTests\Image\QuickE2E\Macros.ndl = Tests\EndToEndTests\Image\QuickE2E\Macros.ndl Tests\EndToEndTests\Image\QuickE2E\run-test = Tests\EndToEndTests\Image\QuickE2E\run-test @@ -329,7 +329,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SVD", "SVD", "{669B6203-967 Tests\EndToEndTests\Speech\SVD\baseline.gpu.txt = Tests\EndToEndTests\Speech\SVD\baseline.gpu.txt Tests\EndToEndTests\Speech\SVD\baseline.windows.cpu.txt = Tests\EndToEndTests\Speech\SVD\baseline.windows.cpu.txt Tests\EndToEndTests\Speech\SVD\baseline.windows.gpu.txt = Tests\EndToEndTests\Speech\SVD\baseline.windows.gpu.txt - Tests\EndToEndTests\Speech\SVD\cntk.config = Tests\EndToEndTests\Speech\SVD\cntk.config + Tests\EndToEndTests\Speech\SVD\cntk.cntk = Tests\EndToEndTests\Speech\SVD\cntk.cntk Tests\EndToEndTests\Speech\SVD\run-test = Tests\EndToEndTests\Speech\SVD\run-test Tests\EndToEndTests\Speech\SVD\testcases.yml = Tests\EndToEndTests\Speech\SVD\testcases.yml EndProjectSection @@ -340,7 +340,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{81AE01 Tests\EndToEndTests\Speech\Simple\baseline.gpu.txt = Tests\EndToEndTests\Speech\Simple\baseline.gpu.txt Tests\EndToEndTests\Speech\Simple\baseline.windows.cpu.txt = Tests\EndToEndTests\Speech\Simple\baseline.windows.cpu.txt Tests\EndToEndTests\Speech\Simple\baseline.windows.gpu.txt = Tests\EndToEndTests\Speech\Simple\baseline.windows.gpu.txt - Tests\EndToEndTests\Speech\Simple\cntk.config = Tests\EndToEndTests\Speech\Simple\cntk.config + Tests\EndToEndTests\Speech\Simple\cntk.cntk = Tests\EndToEndTests\Speech\Simple\cntk.cntk Tests\EndToEndTests\Speech\Simple\run-test = Tests\EndToEndTests\Speech\Simple\run-test Tests\EndToEndTests\Speech\Simple\testcases.yml = Tests\EndToEndTests\Speech\Simple\testcases.yml EndProjectSection @@ -443,13 +443,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RNNLM", "RNNLM", "{811924DE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CPU", "CPU", "{96012801-5187-4FAF-A54E-BF4B73C855F8}" ProjectSection(SolutionItems) = preProject - Tests\EndToEndTests\LM\RNNLM\CPU\global.config = Tests\EndToEndTests\LM\RNNLM\CPU\global.config - Tests\EndToEndTests\LM\RNNLM\CPU\rnnlm.config = Tests\EndToEndTests\LM\RNNLM\CPU\rnnlm.config + Tests\EndToEndTests\LM\RNNLM\CPU\global.cntk = Tests\EndToEndTests\LM\RNNLM\CPU\global.cntk + Tests\EndToEndTests\LM\RNNLM\CPU\rnnlm.cntk = Tests\EndToEndTests\LM\RNNLM\CPU\rnnlm.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GPU", "GPU", "{2A1F0FB0-2304-4F35-87B3-66230C6E58F0}" ProjectSection(SolutionItems) = preProject - Tests\EndToEndTests\LM\RNNLM\GPU\rnnlm.config = Tests\EndToEndTests\LM\RNNLM\GPU\rnnlm.config + Tests\EndToEndTests\LM\RNNLM\GPU\rnnlm.cntk = Tests\EndToEndTests\LM\RNNLM\GPU\rnnlm.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SLU", "SLU", "{BFBC6BE1-C33E-4A80-B8F3-A33410EC00FC}" @@ -457,13 +457,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SLU", "SLU", "{BFBC6BE1-C33 Tests\EndToEndTests\SLU\atis.dev.IOB.simple = Tests\EndToEndTests\SLU\atis.dev.IOB.simple Tests\EndToEndTests\SLU\atis.test.apos.pred.pos.head.IOB.simple = Tests\EndToEndTests\SLU\atis.test.apos.pred.pos.head.IOB.simple Tests\EndToEndTests\SLU\atis.train.apos.pred.pos.head.IOB.simple = Tests\EndToEndTests\SLU\atis.train.apos.pred.pos.head.IOB.simple - Tests\EndToEndTests\SLU\globals.config = Tests\EndToEndTests\SLU\globals.config + Tests\EndToEndTests\SLU\globals.cntk = Tests\EndToEndTests\SLU\globals.cntk Tests\EndToEndTests\SLU\input.txt = Tests\EndToEndTests\SLU\input.txt Tests\EndToEndTests\SLU\inputmap.txt = Tests\EndToEndTests\SLU\inputmap.txt Tests\EndToEndTests\SLU\lstmNDL.txt = Tests\EndToEndTests\SLU\lstmNDL.txt Tests\EndToEndTests\SLU\README.txt = Tests\EndToEndTests\SLU\README.txt - Tests\EndToEndTests\SLU\rnnlu.config = Tests\EndToEndTests\SLU\rnnlu.config - Tests\EndToEndTests\SLU\rnnlu.ndl.config = Tests\EndToEndTests\SLU\rnnlu.ndl.config + Tests\EndToEndTests\SLU\rnnlu.cntk = Tests\EndToEndTests\SLU\rnnlu.cntk + Tests\EndToEndTests\SLU\rnnlu.ndl.cntk = Tests\EndToEndTests\SLU\rnnlu.ndl.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MNIST", "MNIST", "{FA33A61E-95C7-4049-8111-22058CE361A3}" @@ -480,27 +480,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AdditionalFiles", "Addition EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{6E5A252C-ACCE-42E0-9819-FF4DEF6D739E}" ProjectSection(SolutionItems) = preProject - Examples\Image\MNIST\Config\01_OneHidden.config = Examples\Image\MNIST\Config\01_OneHidden.config + Examples\Image\MNIST\Config\01_OneHidden.cntk = Examples\Image\MNIST\Config\01_OneHidden.cntk Examples\Image\MNIST\Config\01_OneHidden.ndl = Examples\Image\MNIST\Config\01_OneHidden.ndl - Examples\Image\MNIST\Config\02_Convolution.config = Examples\Image\MNIST\Config\02_Convolution.config + Examples\Image\MNIST\Config\02_Convolution.cntk = Examples\Image\MNIST\Config\02_Convolution.cntk Examples\Image\MNIST\Config\02_Convolution.ndl = Examples\Image\MNIST\Config\02_Convolution.ndl - Examples\Image\MNIST\Config\03_ConvBatchNorm.config = Examples\Image\MNIST\Config\03_ConvBatchNorm.config + Examples\Image\MNIST\Config\03_ConvBatchNorm.cntk = Examples\Image\MNIST\Config\03_ConvBatchNorm.cntk Examples\Image\MNIST\Config\03_ConvBatchNorm.ndl = Examples\Image\MNIST\Config\03_ConvBatchNorm.ndl Examples\Image\MNIST\Config\Macros.ndl = Examples\Image\MNIST\Config\Macros.ndl EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CIFAR-10", "CIFAR-10", "{77125562-3BF2-45D2-9B73-72CA8E03C78C}" ProjectSection(SolutionItems) = preProject - Examples\Image\Miscellaneous\CIFAR-10\01_Conv.config = Examples\Image\Miscellaneous\CIFAR-10\01_Conv.config + Examples\Image\Miscellaneous\CIFAR-10\01_Conv.cntk = Examples\Image\Miscellaneous\CIFAR-10\01_Conv.cntk Examples\Image\Miscellaneous\CIFAR-10\01_Convolution.ndl = Examples\Image\Miscellaneous\CIFAR-10\01_Convolution.ndl - Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.config = Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.config + Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.cntk = Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.cntk Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.mel = Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.mel Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.ndl = Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.ndl Examples\Image\Miscellaneous\CIFAR-10\03_ProjWeightsGen.py = Examples\Image\Miscellaneous\CIFAR-10\03_ProjWeightsGen.py - Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.config = Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.config + Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.cntk = Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.cntk Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.mel = Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.mel Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.ndl = Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.ndl - Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.config = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.config + Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.cntk = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.cntk Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.ndl = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.ndl Examples\Image\Miscellaneous\CIFAR-10\16to32.txt = Examples\Image\Miscellaneous\CIFAR-10\16to32.txt Examples\Image\Miscellaneous\CIFAR-10\32to64.txt = Examples\Image\Miscellaneous\CIFAR-10\32to64.txt @@ -516,7 +516,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AlexNet", "AlexNet", "{D29DC402-98A3-40C7-B683-4CC84DEC5C18}" ProjectSection(SolutionItems) = preProject Examples\Image\Miscellaneous\ImageNet\AlexNet\add_top5_layer.mel = Examples\Image\Miscellaneous\ImageNet\AlexNet\add_top5_layer.mel - Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet.config = Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet.config + Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet.cntk = Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet.cntk Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet.ndl = Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet.ndl Examples\Image\Miscellaneous\ImageNet\AlexNet\Macros.ndl = Examples\Image\Miscellaneous\ImageNet\AlexNet\Macros.ndl EndProjectSection @@ -526,11 +526,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VGG", "VGG", "{BC0D6DFF-80C Examples\Image\Miscellaneous\ImageNet\VGG\add_top5_layer.mel = Examples\Image\Miscellaneous\ImageNet\VGG\add_top5_layer.mel Examples\Image\Miscellaneous\ImageNet\VGG\ImageNet1K_mean.xml = Examples\Image\Miscellaneous\ImageNet\VGG\ImageNet1K_mean.xml Examples\Image\Miscellaneous\ImageNet\VGG\Macros.ndl = Examples\Image\Miscellaneous\ImageNet\VGG\Macros.ndl - Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A.config = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A.config + Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A.cntk Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A.ndl = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A.ndl - Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E.config = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E.config + Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E.cntk Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E.ndl = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E.ndl - Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN.config = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN.config + Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN.cntk Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN.ndl = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN.ndl EndProjectSection EndProject @@ -548,8 +548,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NdlExamples", "NdlExamples" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{1E37CE40-556D-4693-B58C-F8D4CE349BB7}" ProjectSection(SolutionItems) = preProject - Examples\Other\Simple2d\Config\Multigpu.config = Examples\Other\Simple2d\Config\Multigpu.config - Examples\Other\Simple2d\Config\Simple.config = Examples\Other\Simple2d\Config\Simple.config + Examples\Other\Simple2d\Config\Multigpu.cntk = Examples\Other\Simple2d\Config\Multigpu.cntk + Examples\Other\Simple2d\Config\Simple.cntk = Examples\Other\Simple2d\Config\Simple.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Miscellaneous", "Miscellaneous", "{BF1A621D-528B-4B84-AAFC-EF1455FC6830}" @@ -563,8 +563,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AN4", "AN4", "{EDA80B25-B18 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{B3E3AF4A-FEF5-46AB-A72A-19AF4F1FDD49}" ProjectSection(SolutionItems) = preProject - Examples\Speech\AN4\Config\FeedForward.config = Examples\Speech\AN4\Config\FeedForward.config - Examples\Speech\AN4\Config\LSTM-NDL.config = Examples\Speech\AN4\Config\LSTM-NDL.config + Examples\Speech\AN4\Config\FeedForward.cntk = Examples\Speech\AN4\Config\FeedForward.cntk + Examples\Speech\AN4\Config\LSTM-NDL.cntk = Examples\Speech\AN4\Config\LSTM-NDL.cntk Examples\Speech\AN4\Config\lstmp-3layer-opt.ndl = Examples\Speech\AN4\Config\lstmp-3layer-opt.ndl EndProjectSection EndProject @@ -587,16 +587,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cntk_config", "cntk_config" ProjectSection(SolutionItems) = preProject Examples\Speech\Miscellaneous\AMI\cntk_config\40fbank.conf = Examples\Speech\Miscellaneous\AMI\cntk_config\40fbank.conf Examples\Speech\Miscellaneous\AMI\cntk_config\80fbank.conf = Examples\Speech\Miscellaneous\AMI\cntk_config\80fbank.conf - Examples\Speech\Miscellaneous\AMI\cntk_config\Align.config = Examples\Speech\Miscellaneous\AMI\cntk_config\Align.config - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK.config = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK.config - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2.config = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2.config - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn.config = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn.config + Examples\Speech\Miscellaneous\AMI\cntk_config\Align.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\Align.cntk + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK.cntk + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2.cntk + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn_smbr.mel = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn_smbr.mel - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp.config = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp.config - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp_smbr.config = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp_smbr.config - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_smbr.config = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_smbr.config - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_write.config = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_write.config - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK_write.config = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK_write.config + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp.cntk + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp_smbr.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp_smbr.cntk + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_smbr.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_smbr.cntk + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_write.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_write.cntk + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK_write.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK_write.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\default_macros.ndl = Examples\Speech\Miscellaneous\AMI\cntk_config\default_macros.ndl Examples\Speech\Miscellaneous\AMI\cntk_config\dnn_3layer.ndl = Examples\Speech\Miscellaneous\AMI\cntk_config\dnn_3layer.ndl Examples\Speech\Miscellaneous\AMI\cntk_config\dnn_6layer.ndl = Examples\Speech\Miscellaneous\AMI\cntk_config\dnn_6layer.ndl @@ -620,36 +620,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{1C7D22 Examples\Speech\Miscellaneous\TIMIT\config\classify.ndl = Examples\Speech\Miscellaneous\TIMIT\config\classify.ndl Examples\Speech\Miscellaneous\TIMIT\config\create_1layer.ndl = Examples\Speech\Miscellaneous\TIMIT\config\create_1layer.ndl Examples\Speech\Miscellaneous\TIMIT\config\default_macros.ndl = Examples\Speech\Miscellaneous\TIMIT\config\default_macros.ndl - Examples\Speech\Miscellaneous\TIMIT\config\globals.config = Examples\Speech\Miscellaneous\TIMIT\config\globals.config + Examples\Speech\Miscellaneous\TIMIT\config\globals.cntk = Examples\Speech\Miscellaneous\TIMIT\config\globals.cntk Examples\Speech\Miscellaneous\TIMIT\config\lstm.ndl = Examples\Speech\Miscellaneous\TIMIT\config\lstm.ndl Examples\Speech\Miscellaneous\TIMIT\config\mtl_fbank_mfcc.ndl = Examples\Speech\Miscellaneous\TIMIT\config\mtl_fbank_mfcc.ndl Examples\Speech\Miscellaneous\TIMIT\config\mtl_senones_dr.ndl = Examples\Speech\Miscellaneous\TIMIT\config\mtl_senones_dr.ndl Examples\Speech\Miscellaneous\TIMIT\config\PAC-RNN.ndl = Examples\Speech\Miscellaneous\TIMIT\config\PAC-RNN.ndl Examples\Speech\Miscellaneous\TIMIT\config\README.txt = Examples\Speech\Miscellaneous\TIMIT\config\README.txt - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_AdaptLearnRate.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_AdaptLearnRate.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_CrossValidateSimpleNetwork.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_CrossValidateSimpleNetwork.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_EvalSimpleNetwork.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_EvalSimpleNetwork.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainAutoEncoder.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainAutoEncoder.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainLSTM.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainLSTM.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainMultiInput.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainMultiInput.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainMultiTask.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainMultiTask.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainNDLNetwork.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainNDLNetwork.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainSimpleNetwork.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainSimpleNetwork.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainWithPreTrain.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainWithPreTrain.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_WriteBottleneck.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_WriteBottleneck.config - Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_WriteScaledLogLike.config = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_WriteScaledLogLike.config + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_AdaptLearnRate.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_AdaptLearnRate.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_CrossValidateSimpleNetwork.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_CrossValidateSimpleNetwork.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_EvalSimpleNetwork.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_EvalSimpleNetwork.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainAutoEncoder.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainAutoEncoder.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainLSTM.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainLSTM.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainMultiInput.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainMultiInput.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainMultiTask.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainMultiTask.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainNDLNetwork.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainNDLNetwork.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainSimpleNetwork.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainSimpleNetwork.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainWithPreTrain.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_TrainWithPreTrain.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_WriteBottleneck.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_WriteBottleneck.cntk + Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_WriteScaledLogLike.cntk = Examples\Speech\Miscellaneous\TIMIT\config\TIMIT_WriteScaledLogLike.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CPU", "CPU", "{5ED4F5DC-E016-4E10-BACD-6A760A0CDE89}" ProjectSection(SolutionItems) = preProject - Examples\Speech\Miscellaneous\TIMIT\CPU\TIMIT_DNN.config = Examples\Speech\Miscellaneous\TIMIT\CPU\TIMIT_DNN.config - Examples\Speech\Miscellaneous\TIMIT\CPU\TIMIT_LSTM.config = Examples\Speech\Miscellaneous\TIMIT\CPU\TIMIT_LSTM.config + Examples\Speech\Miscellaneous\TIMIT\CPU\TIMIT_DNN.cntk = Examples\Speech\Miscellaneous\TIMIT\CPU\TIMIT_DNN.cntk + Examples\Speech\Miscellaneous\TIMIT\CPU\TIMIT_LSTM.cntk = Examples\Speech\Miscellaneous\TIMIT\CPU\TIMIT_LSTM.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GPU", "GPU", "{35CFD8E3-7206-4243-AB5C-AAF610109A5C}" ProjectSection(SolutionItems) = preProject - Examples\Speech\Miscellaneous\TIMIT\GPU\TIMIT_DNN.config = Examples\Speech\Miscellaneous\TIMIT\GPU\TIMIT_DNN.config - Examples\Speech\Miscellaneous\TIMIT\GPU\TIMIT_LSTM.config = Examples\Speech\Miscellaneous\TIMIT\GPU\TIMIT_LSTM.config + Examples\Speech\Miscellaneous\TIMIT\GPU\TIMIT_DNN.cntk = Examples\Speech\Miscellaneous\TIMIT\GPU\TIMIT_DNN.cntk + Examples\Speech\Miscellaneous\TIMIT\GPU\TIMIT_LSTM.cntk = Examples\Speech\Miscellaneous\TIMIT\GPU\TIMIT_LSTM.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PennTreebank", "PennTreebank", "{6F4125B5-220F-4FB7-B6C4-85A966A0268C}" @@ -659,14 +659,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PennTreebank", "PennTreeban EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{850008BC-36B0-4A0A-BD0C-B6D5C2184227}" ProjectSection(SolutionItems) = preProject - Examples\Text\PennTreebank\Config\rnn.config = Examples\Text\PennTreebank\Config\rnn.config + Examples\Text\PennTreebank\Config\rnn.cntk = Examples\Text\PennTreebank\Config\rnn.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SLU", "SLU", "{E6DC3B7D-303D-4A54-B040-D8DCF8C56E17}" ProjectSection(SolutionItems) = preProject Examples\Text\Miscellaneous\SLU\lstmNDL.txt = Examples\Text\Miscellaneous\SLU\lstmNDL.txt Examples\Text\Miscellaneous\SLU\README.txt = Examples\Text\Miscellaneous\SLU\README.txt - Examples\Text\Miscellaneous\SLU\rnnlu.config = Examples\Text\Miscellaneous\SLU\rnnlu.config + Examples\Text\Miscellaneous\SLU\rnnlu.cntk = Examples\Text\Miscellaneous\SLU\rnnlu.cntk Examples\Text\Miscellaneous\SLU\rnnluModelEditor.txt = Examples\Text\Miscellaneous\SLU\rnnluModelEditor.txt EndProjectSection EndProject @@ -683,11 +683,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResNet", "ResNet", "{06D2C6 Examples\Image\Miscellaneous\ImageNet\ResNet\create_eval_model.mel = Examples\Image\Miscellaneous\ImageNet\ResNet\create_eval_model.mel Examples\Image\Miscellaneous\ImageNet\ResNet\Macros.ndl = Examples\Image\Miscellaneous\ImageNet\ResNet\Macros.ndl Examples\Image\Miscellaneous\ImageNet\ResNet\ProjWeightsGen.py = Examples\Image\Miscellaneous\ImageNet\ResNet\ProjWeightsGen.py - Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152.config = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152.config + Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152.cntk Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152.ndl = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152.ndl - Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34.config = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34.config + Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34.cntk Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34.ndl = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34.ndl - Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50.config = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50.config + Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50.cntk Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50.ndl = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50.ndl EndProjectSection EndProject diff --git a/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Chapter.lyx b/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Chapter.lyx index 398d81b24..e6d8bdbca 100644 --- a/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Chapter.lyx +++ b/Documentation/CNTK-TechReport/lyx/CNTKBook_CNTK_Chapter.lyx @@ -125,12 +125,12 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp.config +cntk configFile=yourExp.cntk \end_layout \end_inset -where yourExp.config is a CNTK configuration file, which typically contains +where yourExp.cntk is a CNTK configuration file, which typically contains several command blocks. A command block is a top level block of the configuration. Each command block must specify what action to be carried out with related @@ -5668,7 +5668,7 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp.config +cntk configFile=yourExp.cntk \end_layout \end_inset @@ -5788,7 +5788,7 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp.config stderr="c: +cntk configFile=yourExp.cntk stderr="c: \backslash temp \backslash @@ -5816,7 +5816,7 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp.config mnistTrain=[minibatchSize=256] +cntk configFile=yourExp.cntk mnistTrain=[minibatchSize=256] \end_layout \end_inset @@ -5831,7 +5831,7 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp.config mnistTrain=[reader=[file="mynewfile.txt"]] +cntk configFile=yourExp.cntk mnistTrain=[reader=[file="mynewfile.txt"]] \end_layout @@ -5877,12 +5877,12 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp1.config+yourExp2.config +cntk configFile=yourExp1.cntk+yourExp2.cntk \end_layout \begin_layout Plain Layout -cntk configFile=yourExp1.config configFile=yourExp2.config +cntk configFile=yourExp1.cntk configFile=yourExp2.cntk \end_layout \end_inset @@ -5891,7 +5891,7 @@ cntk configFile=yourExp1.config configFile=yourExp2.config \end_layout \begin_layout Standard -If yourExp2.config only contains the string "mnistTrain=[reader=[file=mynewfile.tx +If yourExp2.cntk only contains the string "mnistTrain=[reader=[file=mynewfile.tx t]]", then both of these commands would be equivalent to: \end_layout @@ -5902,7 +5902,7 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp1.config mnistTrain=[reader=[file="mynewfile.txt"]] +cntk configFile=yourExp1.cntk mnistTrain=[reader=[file="mynewfile.txt"]] \end_layout @@ -5926,7 +5926,7 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp1.config+yourExp2.config var1=value configFile=yourExp3.conf +cntk configFile=yourExp1.cntk+yourExp2.cntk var1=value configFile=yourExp3.conf ig \end_layout @@ -5943,7 +5943,7 @@ In addition being able to specify multiple configuration files at the command include \emph default one configuration file within another. - For example, if the first line of yourExp2.config was + For example, if the first line of yourExp2.cntk was \end_layout \begin_layout Standard @@ -5953,7 +5953,7 @@ status open \begin_layout Plain Layout -include=yourExp1.config +include=yourExp1.cntk \end_layout \end_inset @@ -5968,7 +5968,7 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp2.config +cntk configFile=yourExp2.cntk \end_layout \end_inset @@ -5983,12 +5983,12 @@ status open \begin_layout Plain Layout -cntk configFile=yourExp1.config+yourExp2.config +cntk configFile=yourExp1.cntk+yourExp2.cntk \end_layout \end_inset -where in this latter case, yourExp2.config doesn't contain the +where in this latter case, yourExp2.cntk doesn't contain the \emph on include \emph default @@ -6007,9 +6007,9 @@ included Including a configuration file is equivalent to pasting the contents of that file at the location of the include statement. Include statements are resolved recursively (using a depth-first search), - meaning that if yourExpA.config includes yourExpB.config, and yourExpB.config - includes yourExpC.config, then the full chain will be resolved, and yourExpC.conf -ig will effectively be included in yourExpA.config. + meaning that if yourExpA.cntk includes yourExpB.cntk, and yourExpB.cntk + includes yourExpC.cntk, then the full chain will be resolved, and yourExpC.conf +ig will effectively be included in yourExpA.cntk. If a configuration file is included multiple times (eg, 'A' includes 'B' and 'C', and 'B' also includes 'C'), then it will effectively only be included the first time it is encountered. diff --git a/Documentation/CNTK-TechReport/lyx/CNTKBook_ExampleSetup_Chapter.lyx b/Documentation/CNTK-TechReport/lyx/CNTKBook_ExampleSetup_Chapter.lyx index a3aac49ce..eb307d07a 100644 --- a/Documentation/CNTK-TechReport/lyx/CNTKBook_ExampleSetup_Chapter.lyx +++ b/Documentation/CNTK-TechReport/lyx/CNTKBook_ExampleSetup_Chapter.lyx @@ -3920,7 +3920,7 @@ One of the important tasks in spoken language understanding is labeling \backslash SLU \backslash -rnnlu.config. +rnnlu.cntk. The data is ATIS, which consists of 944 unique words, including , in the training/dev set. Output has 127 dimension, each corresponding to a semantic tag in ATIS. diff --git a/Documentation/CNTK-TechReport/lyx/CNTKBook_Introduction.lyx b/Documentation/CNTK-TechReport/lyx/CNTKBook_Introduction.lyx index 51e6966a1..8cd86e1ef 100644 --- a/Documentation/CNTK-TechReport/lyx/CNTKBook_Introduction.lyx +++ b/Documentation/CNTK-TechReport/lyx/CNTKBook_Introduction.lyx @@ -834,7 +834,7 @@ status open \begin_layout Plain Layout -cntk configFile=Simple.config +cntk configFile=Simple.cntk \end_layout \end_inset @@ -853,7 +853,7 @@ status open \begin_layout Plain Layout -cntk configFile=Simple.config +cntk configFile=Simple.cntk \end_layout \end_inset diff --git a/Examples/Image/MNIST/Config/01_OneHidden.config b/Examples/Image/MNIST/Config/01_OneHidden.cntk similarity index 100% rename from Examples/Image/MNIST/Config/01_OneHidden.config rename to Examples/Image/MNIST/Config/01_OneHidden.cntk diff --git a/Examples/Image/MNIST/Config/02_Convolution.config b/Examples/Image/MNIST/Config/02_Convolution.cntk similarity index 100% rename from Examples/Image/MNIST/Config/02_Convolution.config rename to Examples/Image/MNIST/Config/02_Convolution.cntk diff --git a/Examples/Image/MNIST/Config/03_ConvBatchNorm.config b/Examples/Image/MNIST/Config/03_ConvBatchNorm.cntk similarity index 100% rename from Examples/Image/MNIST/Config/03_ConvBatchNorm.config rename to Examples/Image/MNIST/Config/03_ConvBatchNorm.cntk diff --git a/Examples/Image/MNIST/README.md b/Examples/Image/MNIST/README.md index 93a653307..f5c7d211e 100644 --- a/Examples/Image/MNIST/README.md +++ b/Examples/Image/MNIST/README.md @@ -44,12 +44,12 @@ or prefix the call to the cntk executable with the corresponding folder. Run the example from the Image/MNIST/Data folder using: -`cntk configFile=../Config/01_OneHidden.config` +`cntk configFile=../Config/01_OneHidden.cntk` or run from any folder and specify the Data folder as the `currentDirectory`, e.g. running from the Image/MNIST folder using: -`cntk configFile=Config/01_OneHidden.config currentDirectory=Data` +`cntk configFile=Config/01_OneHidden.cntk currentDirectory=Data` The output folder will be created inside Image/MNIST/. @@ -61,21 +61,21 @@ There are three config files and corresponding network description files in the 1. 01_OneHidden.ndl is a simple, one hidden layer network that produces 2.3% of error. To run the sample, navigate to the Data folder and run the following command: -`cntk configFile=../Config/01_OneHidden.config` +`cntk configFile=../Config/01_OneHidden.cntk` 2. 02_Convolution.ndl is more interesting, convolutional network which has 2 convolutional and 2 max pooling layers. The network produces 0.87% of error after training for about 2 minutes on GPU. To run the sample, navigate to the Data folder and run the following command: -`cntk configFile=../Config/02_Convolution.config` +`cntk configFile=../Config/02_Convolution.cntk` 3. 03_ConvBatchNorm.ndl is almost identical to 02_Convolution.ndl except that it uses batch normalization for the fully connected layer h1. Note that batch normalization is implemented using just NDL (see Macros.ndl for details). As a result, it uses less epochs (8 vs 15 in 02_Convolution) to achieve the same accuracy. To run the sample, navigate to the Data folder and run the following command: -`cntk configFile=../Config/03_ConvBatchNorm.config` +`cntk configFile=../Config/03_ConvBatchNorm.cntk` -For more details, refer to .ndl and corresponding .config files. +For more details, refer to .ndl and corresponding .cntk files. ### Additional files diff --git a/Examples/Image/Miscellaneous/CIFAR-10/01_Conv.config b/Examples/Image/Miscellaneous/CIFAR-10/01_Conv.cntk similarity index 100% rename from Examples/Image/Miscellaneous/CIFAR-10/01_Conv.config rename to Examples/Image/Miscellaneous/CIFAR-10/01_Conv.cntk diff --git a/Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv.config b/Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv.cntk similarity index 100% rename from Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv.config rename to Examples/Image/Miscellaneous/CIFAR-10/02_BatchNormConv.cntk diff --git a/Examples/Image/Miscellaneous/CIFAR-10/03_ResNet.config b/Examples/Image/Miscellaneous/CIFAR-10/03_ResNet.cntk similarity index 100% rename from Examples/Image/Miscellaneous/CIFAR-10/03_ResNet.config rename to Examples/Image/Miscellaneous/CIFAR-10/03_ResNet.cntk diff --git a/Examples/Image/Miscellaneous/CIFAR-10/04_ResNet_56.config b/Examples/Image/Miscellaneous/CIFAR-10/04_ResNet_56.cntk similarity index 100% rename from Examples/Image/Miscellaneous/CIFAR-10/04_ResNet_56.config rename to Examples/Image/Miscellaneous/CIFAR-10/04_ResNet_56.cntk diff --git a/Examples/Image/Miscellaneous/CIFAR-10/readme.txt b/Examples/Image/Miscellaneous/CIFAR-10/readme.txt index f9359dcd2..bb9533914 100644 --- a/Examples/Image/Miscellaneous/CIFAR-10/readme.txt +++ b/Examples/Image/Miscellaneous/CIFAR-10/readme.txt @@ -17,12 +17,12 @@ https://code.google.com/p/cuda-convnet/source/browse/trunk/example-layers/layers (main differences are usage of max pooling layers everywhere rather than mix of max and average pooling, as well as dropout in fully-connected layer). The network produces 21% of error after training for about 3 minutes on GPU. To run the sample, navigate to this folder and run the following command: - configFile=01_Conv.config configName=01_Conv + configFile=01_Conv.cntk configName=01_Conv 02_BatchNormConv.ndl is a convolutional network which uses batch normalization technique (http://arxiv.org/abs/1502.03167). 03_ResNet.ndl and 04_ResNet_56.ndl are very deep convolutional networks that use ResNet architecture and have 20 and 56 layers respectively (http://arxiv.org/abs/1512.03385). -With 03_ResNet.config you should get around 8.2% of error after training for about 50 minutes (see log files in the Output directory). +With 03_ResNet.cntk you should get around 8.2% of error after training for about 50 minutes (see log files in the Output directory). -For more details, refer to .ndl and corresponding .config files. +For more details, refer to .ndl and corresponding .cntk files. diff --git a/Examples/Image/Miscellaneous/ImageNet/AlexNet/AlexNet.config b/Examples/Image/Miscellaneous/ImageNet/AlexNet/AlexNet.cntk similarity index 100% rename from Examples/Image/Miscellaneous/ImageNet/AlexNet/AlexNet.config rename to Examples/Image/Miscellaneous/ImageNet/AlexNet/AlexNet.cntk diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_152.config b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_152.cntk similarity index 100% rename from Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_152.config rename to Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_152.cntk diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_34.config b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_34.cntk similarity index 100% rename from Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_34.config rename to Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_34.cntk diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_50.config b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_50.cntk similarity index 100% rename from Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_50.config rename to Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_50.cntk diff --git a/Examples/Image/Miscellaneous/ImageNet/VGG/VGG_A.config b/Examples/Image/Miscellaneous/ImageNet/VGG/VGG_A.cntk similarity index 100% rename from Examples/Image/Miscellaneous/ImageNet/VGG/VGG_A.config rename to Examples/Image/Miscellaneous/ImageNet/VGG/VGG_A.cntk diff --git a/Examples/Image/Miscellaneous/ImageNet/VGG/VGG_E.config b/Examples/Image/Miscellaneous/ImageNet/VGG/VGG_E.cntk similarity index 100% rename from Examples/Image/Miscellaneous/ImageNet/VGG/VGG_E.config rename to Examples/Image/Miscellaneous/ImageNet/VGG/VGG_E.cntk diff --git a/Examples/Image/Miscellaneous/ImageNet/VGG/VGG_E_BN.config b/Examples/Image/Miscellaneous/ImageNet/VGG/VGG_E_BN.cntk similarity index 100% rename from Examples/Image/Miscellaneous/ImageNet/VGG/VGG_E_BN.config rename to Examples/Image/Miscellaneous/ImageNet/VGG/VGG_E_BN.cntk diff --git a/Examples/Other/Simple2d/Config/Multigpu.config b/Examples/Other/Simple2d/Config/Multigpu.cntk similarity index 97% rename from Examples/Other/Simple2d/Config/Multigpu.config rename to Examples/Other/Simple2d/Config/Multigpu.cntk index ff6ebf211..a745fd1eb 100644 --- a/Examples/Other/Simple2d/Config/Multigpu.config +++ b/Examples/Other/Simple2d/Config/Multigpu.cntk @@ -1,5 +1,5 @@ # This is a configuration for parallel training of a simple feed-forward neural network using data-parallel SGD. -# The configuration is identical to the Simple.config except for the few additional parallelism related options. +# The configuration is identical to the Simple.cntk except for the few additional parallelism related options. # Parameters can be overwritten on the command line # for example: cntk configFile=myConfigFile RootDir=../.. diff --git a/Examples/Other/Simple2d/Config/Simple.config b/Examples/Other/Simple2d/Config/Simple.cntk similarity index 100% rename from Examples/Other/Simple2d/Config/Simple.config rename to Examples/Other/Simple2d/Config/Simple.cntk diff --git a/Examples/Other/Simple2d/README.md b/Examples/Other/Simple2d/README.md index ef9143177..7d428721e 100644 --- a/Examples/Other/Simple2d/README.md +++ b/Examples/Other/Simple2d/README.md @@ -7,7 +7,7 @@ |Purpose |Showcase how to train a simple CNTK network (CPU and GPU) and how to use it for scoring (decoding) |Network |SimpleNetworkBuilder, 2 hidden layers with 50 sigmoid nodes each, cross entropy with softmax |Training |Stochastic gradient descent with momentum -|Comments |There are two config files: Simple.config uses a single CPU or GPU, Multigpu.config uses data-parallel SGD for training on multiple GPUs +|Comments |There are two config files: Simple.cntk uses a single CPU or GPU, Multigpu.cntk uses data-parallel SGD for training on multiple GPUs ## Running the example @@ -31,12 +31,12 @@ or prefix the call to the cntk executable with the corresponding folder. Run the example from the Simple2d/Data folder using: -`cntk configFile=../Config/Simple.config` +`cntk configFile=../Config/Simple.cntk` or run from any folder and specify the Data folder as the `currentDirectory`, e.g. running from the Simple2d folder using: -`cntk configFile=Config/Simple.config currentDirectory=Data` +`cntk configFile=Config/Simple.cntk currentDirectory=Data` The output folder will be created inside Simple2d/. @@ -51,7 +51,7 @@ __It is therefore recommended to generally use `ConfigDir` and `ModelDir` in all To run on CPU set `deviceId = -1`, to run on GPU set deviceId to "auto" or a specific value >= 0. Both config files are nearly identical. -Multigpu.config has some additional parameters for parallel training (see parallelTrain in the file). +Multigpu.cntk has some additional parameters for parallel training (see parallelTrain in the file). Both files define the following three commands: train, test and output. By default only train and test are executed: diff --git a/Examples/Speech/AN4/Config/FeedForward.config b/Examples/Speech/AN4/Config/FeedForward.cntk similarity index 100% rename from Examples/Speech/AN4/Config/FeedForward.config rename to Examples/Speech/AN4/Config/FeedForward.cntk diff --git a/Examples/Speech/AN4/Config/LSTM-NDL.config b/Examples/Speech/AN4/Config/LSTM-NDL.cntk similarity index 100% rename from Examples/Speech/AN4/Config/LSTM-NDL.config rename to Examples/Speech/AN4/Config/LSTM-NDL.cntk diff --git a/Examples/Speech/AN4/README.md b/Examples/Speech/AN4/README.md index 3c50f0697..9dc20d142 100644 --- a/Examples/Speech/AN4/README.md +++ b/Examples/Speech/AN4/README.md @@ -16,7 +16,7 @@ See License.md in the root level folder of the CNTK repository for full license |Purpose: |Showcase how to train feed forward and LSTM networks for speech data |Network: |SimpleNetworkBuilder for 2-layer FF, NdlNetworkBuilder for 3-layer LSTM network |Training: |Data-parallel 1-Bit SGD with automatic mini batch rescaling (FF) -|Comments: |There are two config files: FeedForward.config and LSTM-NDL.config for FF and LSTM training respectively +|Comments: |There are two config files: FeedForward.cntk and LSTM-NDL.cntk for FF and LSTM training respectively ## Running the example @@ -40,12 +40,12 @@ or prefix the call to the cntk executable with the corresponding folder. Run the example from the Speech/Data folder using: -`cntk configFile=../Config/FeedForward.config` +`cntk configFile=../Config/FeedForward.cntk` or run from any folder and specify the Data folder as the `currentDirectory`, e.g. running from the Speech folder using: -`cntk configFile=Config/FeedForward.config currentDirectory=Data` +`cntk configFile=Config/FeedForward.cntk currentDirectory=Data` The output folder will be created inside Speech/. @@ -59,9 +59,9 @@ These variables will be overwritten when running on the Philly cluster. __It is therefore recommended to generally use `ConfigDir` and `ModelDir` in all config files.__ To run on CPU set `deviceId = -1`, to run on GPU set deviceId to "auto" or a specific value >= 0. -The FeedForward.config file uses the SimpleNetworkBuilder to create a 2-layer +The FeedForward.cntk file uses the SimpleNetworkBuilder to create a 2-layer feed forward network with sigmoid nodes and a softmax layer. -The LSTM-NDL.config file uses the NdlNetworkBuilder and refers to the lstmp-3layer-opt.ndl file. +The LSTM-NDL.cntk file uses the NdlNetworkBuilder and refers to the lstmp-3layer-opt.ndl file. In the ndl file an LSTM component is defined and used to create a 3-layer LSTM network with a softmax layer. Both configuration only define and execute a single training task: diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/Align.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/Align.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/Align.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/Align.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_dnn.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_dnn.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_dnn.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_dnn.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_lstmp.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_lstmp.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_lstmp.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_lstmp.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_lstmp_smbr.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_lstmp_smbr.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_lstmp_smbr.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_lstmp_smbr.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_smbr.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_smbr.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_smbr.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_smbr.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_write.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_write.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_write.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK2_write.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK_write.config b/Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK_write.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK_write.config rename to Examples/Speech/Miscellaneous/AMI/cntk_config/CNTK_write.cntk diff --git a/Examples/Speech/Miscellaneous/AMI/run_sdm_cntk.sh b/Examples/Speech/Miscellaneous/AMI/run_sdm_cntk.sh index ac92d58ad..2345d2e0c 100644 --- a/Examples/Speech/Miscellaneous/AMI/run_sdm_cntk.sh +++ b/Examples/Speech/Miscellaneous/AMI/run_sdm_cntk.sh @@ -61,7 +61,7 @@ scripts/train_nnet.sh --num-threads 1 --device 0 --cmd "$cuda_cmd" \ --feat-dim $feat_dim --cntk-train-opts "$cntk_train_opts" \ --learning-rate "0.1:1" --momentum "0:0.9" \ --max-epochs 50 --minibatch-size 256 --evaluate-period 100 \ - --cntk-config cntk_config/CNTK2_dnn.config \ + --cntk-config cntk_config/CNTK2_dnn.cntk \ --default-macros cntk_config/default_macros.ndl \ --model-ndl cntk_config/dnn_6layer.ndl \ data/sdm1/train_120fbank exp/sdm1/tri3a_ali exp_cntk/sdm1/dnn @@ -70,7 +70,7 @@ scripts/train_nnet.sh --num-threads 1 --device 0 --cmd "$cuda_cmd" \ device=-1 scripts/align.sh --num-threads 1 --nj 60 --cmd "$decode_cmd" \ --feat-dim $feat_dim --device $device \ - --cntk-config cntk_config/Align.config \ + --cntk-config cntk_config/Align.cntk \ data/sdm1/train_120fbank data/lang \ exp_cntk/sdm1/dnn exp_cntk/sdm1/dnn_ali @@ -92,7 +92,7 @@ scripts/train_nnet.sh --num-threads 1 --device 0 --cmd "$cuda_cmd" \ --learning-rate "0.2:1" --momentum "0:0.9" \ --max-epochs 50 --minibatch-size 20 --evaluate-period 100 \ --clipping-per-sample 0.05 --l2-reg-weight 0.00001 --dropout-rate "0.1*5:0.8"\ - --cntk-config cntk_config/CNTK2_lstmp.config \ + --cntk-config cntk_config/CNTK2_lstmp.cntk \ --default-macros cntk_config/default_macros.ndl \ --model-ndl cntk_config/lstmp-3layer-highway-dropout.ndl \ data/sdm1/train_80fbank exp_cntk/sdm1/dnn_ali exp_cntk/sdm1/hlstmp @@ -110,7 +110,7 @@ device=-1 alidir=${srcdir}_ali scripts/align.sh --num-threads 1 --nj 60 --cmd "$decode_cmd" \ --feat-dim $feat_dim --device $device \ - --cntk-config cntk_config/Align.config \ + --cntk-config cntk_config/Align.cntk \ $data data/lang $srcdir $alidir || exit 1; # Denominator lattices. @@ -118,7 +118,7 @@ device=-1 denlatdir=${srcdir}_denlats scripts/make_denlats.sh --num-threads 1 --nj 20 --sub-split 60 \ --feat-dim $feat_dim --cmd "$decode_cmd" --acwt $acwt \ - --device $device --cntk-config cntk_config/Align.config \ + --device $device --cntk-config cntk_config/Align.cntk \ --ngram-order 2 \ $data data/lang $srcdir $denlatdir || exit 1; @@ -134,7 +134,7 @@ scripts/train_nnet_sequence.sh --num-threads 1 --cmd "$cuda_cmd" --momentum 0.9\ --minibatch-size 20 --cntk-train-opts "$cntk_train_opts" \ --clipping-per-sample 0.05 --smooth-factor 0.1 \ --l2-reg-weight 0.00001 --one-silence-class false --dropout-rate 0 \ - --cntk-config cntk_config/CNTK2_lstmp_smbr.config \ + --cntk-config cntk_config/CNTK2_lstmp_smbr.cntk \ --model-mel cntk_config/lstmp-smbr.mel \ --model-ndl cntk_config/lstmp-3layer-highway-dropout.ndl \ --default-macros cntk_config/default_macros.ndl \ diff --git a/Examples/Speech/Miscellaneous/AMI/scripts/align.sh b/Examples/Speech/Miscellaneous/AMI/scripts/align.sh index 6d7472a79..39aeccc02 100644 --- a/Examples/Speech/Miscellaneous/AMI/scripts/align.sh +++ b/Examples/Speech/Miscellaneous/AMI/scripts/align.sh @@ -70,7 +70,7 @@ cp -L $cntk_model $dir || exit 1; cp -L $kaldi_model $dir || exit 1; mkdir $dir/configs -cp -f $cntk_config $dir/configs/Align.config +cp -f $cntk_config $dir/configs/Align.cntk # Features to be fed to CNTK. feats="scp:$sdata/JOB/feats.scp" diff --git a/Examples/Speech/Miscellaneous/AMI/scripts/train_dnn_cntk.sh b/Examples/Speech/Miscellaneous/AMI/scripts/train_dnn_cntk.sh index 95632bb2e..a2a10310e 100644 --- a/Examples/Speech/Miscellaneous/AMI/scripts/train_dnn_cntk.sh +++ b/Examples/Speech/Miscellaneous/AMI/scripts/train_dnn_cntk.sh @@ -104,7 +104,7 @@ echo "$0 create cntk files" for i in `seq 1 $labelDim` ; do echo $i ; done > $labelMapping # echo $cn_gpu # $cuda_cmd $dir/log/train_cntk.log \ - $cn_gpu configFile=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/cntk_config/CNTK.config modelName=cntkSpeech.dnn DeviceNumber=0 ExpDir=$dir logFile=$logFile labelMapping=$labelMapping ndlfile=$ndlfile inputFeat=$inputFeat trainMLF=$trainMLF labelDim=$labelDim cvInputFeat=$cvInputFeat featDim=600 action=TrainDNN phnLabel=no phnDim=no phnMapping=no inputSCP=no outputSCP=no + $cn_gpu configFile=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/cntk_config/CNTK.cntk modelName=cntkSpeech.dnn DeviceNumber=0 ExpDir=$dir logFile=$logFile labelMapping=$labelMapping ndlfile=$ndlfile inputFeat=$inputFeat trainMLF=$trainMLF labelDim=$labelDim cvInputFeat=$cvInputFeat featDim=600 action=TrainDNN phnLabel=no phnDim=no phnMapping=no inputSCP=no outputSCP=no fi exit 0; @@ -121,7 +121,7 @@ if [ $stage -le 7 ]; then cnmodel=$dir/cntkSpeech.dnn.16 graphdir=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/exp/ihm/tri4a/graph_ami_fsh.o3g.kn.pr1-7 class_frame_counts=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/exp/ihm/dnn5b_pretrain-dbn_dnn_realign/ali_train_pdf.counts - cntk_string="$cn_gpu configFile=cntk_config/CNTK_write.config DeviceNumber=1 modelName=$cnmodel labelDim=$labelDim featDim=$featDim action=$action" + cntk_string="$cn_gpu configFile=cntk_config/CNTK_write.cntk DeviceNumber=1 modelName=$cnmodel labelDim=$labelDim featDim=$featDim action=$action" scripts/decode_cntk.sh --nj 1 --acwt 0.0833 --class-frame-counts "$class_frame_counts" \ $graphdir $data_fmllr/eval $dir/decode_ami_fsh.o3g.kn.pr1-7 "$cntk_string" || exit 1; fi diff --git a/Examples/Speech/Miscellaneous/AMI/scripts/train_nnet.sh b/Examples/Speech/Miscellaneous/AMI/scripts/train_nnet.sh index 0842c9761..99e214591 100644 --- a/Examples/Speech/Miscellaneous/AMI/scripts/train_nnet.sh +++ b/Examples/Speech/Miscellaneous/AMI/scripts/train_nnet.sh @@ -14,7 +14,7 @@ minibatch_size=20 evaluate_period=100 cntk_train_opts= -cntk_config=cntk_config/CNTK2_lstmp.config +cntk_config=cntk_config/CNTK2_lstmp.cntk default_macros=cntk_config/default_macros.ndl model_ndl=cntk_config/lstmp-3layer.ndl device=-1 diff --git a/Examples/Speech/Miscellaneous/AMI/scripts/train_nnet_sequence.sh b/Examples/Speech/Miscellaneous/AMI/scripts/train_nnet_sequence.sh index 49a1f5029..32091ccac 100644 --- a/Examples/Speech/Miscellaneous/AMI/scripts/train_nnet_sequence.sh +++ b/Examples/Speech/Miscellaneous/AMI/scripts/train_nnet_sequence.sh @@ -24,7 +24,7 @@ evaluate_period=100 one_silence_class=true cntk_train_opts= -cntk_config=cntk_config/CNTK2_lstmp_smbr.config +cntk_config=cntk_config/CNTK2_lstmp_smbr.cntk default_macros=cntk_config/default_macros.ndl model_ndl=cntk_config/lstmp-3layer.ndl model_mel=cntk_config/lstmp-3layer-smbr.mel diff --git a/Examples/Speech/Miscellaneous/AMI/train_cntk2.sh b/Examples/Speech/Miscellaneous/AMI/train_cntk2.sh index 3353f9b0e..f64463186 100644 --- a/Examples/Speech/Miscellaneous/AMI/train_cntk2.sh +++ b/Examples/Speech/Miscellaneous/AMI/train_cntk2.sh @@ -43,7 +43,7 @@ fi if [ $stage -le 1 ] ; then ### setup the configuration files for training CNTK models ### -cp cntk_config/CNTK2.config $expdir/CNTK2.config +cp cntk_config/CNTK2.cntk $expdir/CNTK2.cntk cp cntk_config/default_macros.ndl $expdir/default_macros.ndl cp cntk_config/dnn_6layer.ndl $expdir/dnn_6layer.ndl ndlfile=$expdir/dnn_6layer.ndl @@ -68,7 +68,7 @@ cvInputLabels=${expdir}/cntk_valid.labels EOF ## training command ## -$cn_gpu configFile=${expdir}/Base.config configFile=${expdir}/CNTK2.config DeviceNumber=0 action=TrainDNN ndlfile=$ndlfile +$cn_gpu configFile=${expdir}/Base.config configFile=${expdir}/CNTK2.cntk DeviceNumber=0 action=TrainDNN ndlfile=$ndlfile echo "$0 successfuly finished.. $dir" @@ -77,7 +77,7 @@ fi if [ $stage -le 2 ] ; then -config_write=cntk_config/CNTK2_write.config +config_write=cntk_config/CNTK2_write.cntk cnmodel=$expdir/cntk.dnn.16 action=write graphdir=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/exp/$mic/tri4a/graph_ami_fsh.o3g.kn.pr1-7 diff --git a/Examples/Speech/Miscellaneous/AMI/train_cntk2_smbr.sh b/Examples/Speech/Miscellaneous/AMI/train_cntk2_smbr.sh index ae6bb3e71..5292f8e71 100644 --- a/Examples/Speech/Miscellaneous/AMI/train_cntk2_smbr.sh +++ b/Examples/Speech/Miscellaneous/AMI/train_cntk2_smbr.sh @@ -21,17 +21,17 @@ srcdir=${srcdir%/} device=-1 alidir=${srcdir}_ali mkdir -p $alidir/configs -cp -f cntk_config/Align.config $alidir/configs/Align.config +cp -f cntk_config/Align.cntk $alidir/configs/Align.cntk scripts/align.sh --num-threads 1 --nj 30 --cmd "$decode_cmd" \ --feat-dim $feat_dim --device $device \ - --cntk-config $alidir/configs/Align.config \ + --cntk-config $alidir/configs/Align.cntk \ $data_fmllr/train data/lang $srcdir $alidir || exit 1; # Denominator lattices. device=-1 denlatdir=${srcdir}_denlats mkdir -p $denlatdir/configs -cp -f cntk_config/Align.config $denlatdir/configs/Decode.config +cp -f cntk_config/Align.cntk $denlatdir/configs/Decode.config scripts/make_denlats.sh --num-threads 1 --nj 20 --sub-split 15 \ --feat-dim $feat_dim --cmd "$decode_cmd" --acwt $acwt \ --device $device --cntk-config $denlatdir/configs/Decode.config \ @@ -44,7 +44,7 @@ scripts/make_denlats.sh --num-threads 1 --nj 20 --sub-split 15 \ device=0 smbrdir=${srcdir}_smbr mkdir -p $smbrdir/configs -cp -f cntk_config/CNTK2_smbr.config $smbrdir/configs/Train.config +cp -f cntk_config/CNTK2_smbr.cntk $smbrdir/configs/Train.config cp -f cntk_config/dnn_6layer_smbr.ndl $smbrdir/configs/model.ndl cp -f cntk_config/default_macros.ndl $smbrdir/configs/default_macros.ndl scripts/train_sequence.sh --num-threads 1 --cmd "$cuda_cmd" \ diff --git a/Examples/Speech/Miscellaneous/AMI/train_dnn_cntk.sh b/Examples/Speech/Miscellaneous/AMI/train_dnn_cntk.sh index da8769bb3..65929b845 100644 --- a/Examples/Speech/Miscellaneous/AMI/train_dnn_cntk.sh +++ b/Examples/Speech/Miscellaneous/AMI/train_dnn_cntk.sh @@ -105,7 +105,7 @@ echo "$0 create cntk files" # You can either submit your jobs to your cluser, or run it in your local GPU machine # $cuda_cmd $dir/log/train_cntk.log \ - $cn_gpu configFile=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/cntk_config/CNTK.config modelName=cntkSpeech.dnn DeviceNumber=0 ExpDir=$dir logFile=$logFile labelMapping=$labelMapping ndlfile=$ndlfile inputFeat=$inputFeat trainMLF=$trainMLF labelDim=$labelDim cvInputFeat=$cvInputFeat featDim=600 action=TrainDNN phnLabel=no phnDim=no phnMapping=no inputSCP=no outputSCP=no + $cn_gpu configFile=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/cntk_config/CNTK.cntk modelName=cntkSpeech.dnn DeviceNumber=0 ExpDir=$dir logFile=$logFile labelMapping=$labelMapping ndlfile=$ndlfile inputFeat=$inputFeat trainMLF=$trainMLF labelDim=$labelDim cvInputFeat=$cvInputFeat featDim=600 action=TrainDNN phnLabel=no phnDim=no phnMapping=no inputSCP=no outputSCP=no fi if [ $stage -le 6 ] ; then @@ -120,7 +120,7 @@ if [ $stage -le 7 ]; then cnmodel=$dir/cntkSpeech.dnn.17 graphdir=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/exp/$mic/tri4a/graph_ami_fsh.o3g.kn.pr1-7 class_frame_counts=/exports/work/inf_hcrc_cstr_nst/llu/ami/s5b/exp/ihm/dnn5b_pretrain-dbn_dnn_realign/ali_train_pdf.counts - cntk_string="$cn_gpu configFile=cntk_config/CNTK_write.config DeviceNumber=1 modelName=$cnmodel labelDim=$labelDim featDim=$featDim action=$action" + cntk_string="$cn_gpu configFile=cntk_config/CNTK_write.cntk DeviceNumber=1 modelName=$cnmodel labelDim=$labelDim featDim=$featDim action=$action" scripts/decode_cntk.sh --nj 16 --cmd "$decode_cmd" --acwt 0.0833 --class-frame-counts "$class_frame_counts" \ $graphdir $data_fmllr/eval $dir/decode_ami_fsh.o3g.kn.pr1-7 "$cntk_string" || exit 1; fi diff --git a/Examples/Speech/Miscellaneous/TIMIT/AdditionalFiles/TrainSimpleTimit.config b/Examples/Speech/Miscellaneous/TIMIT/AdditionalFiles/TrainSimpleTimit.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/AdditionalFiles/TrainSimpleTimit.config rename to Examples/Speech/Miscellaneous/TIMIT/AdditionalFiles/TrainSimpleTimit.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/AdditionalFiles/TrainSimpleTimit.sh b/Examples/Speech/Miscellaneous/TIMIT/AdditionalFiles/TrainSimpleTimit.sh index b95afc730..708caa321 100644 --- a/Examples/Speech/Miscellaneous/TIMIT/AdditionalFiles/TrainSimpleTimit.sh +++ b/Examples/Speech/Miscellaneous/TIMIT/AdditionalFiles/TrainSimpleTimit.sh @@ -13,5 +13,5 @@ $HTK/hcopy.exe -C $HCopyConfig -S $HCopyScript CNdir=../../../ rm -f Models/TrainSimple.dnn* -time $CNdir/cn.exe configFile=TrainSimpleTimit.config +time $CNdir/cn.exe configFile=TrainSimpleTimit.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/CPU/TIMIT_DNN.config b/Examples/Speech/Miscellaneous/TIMIT/CPU/TIMIT_DNN.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/CPU/TIMIT_DNN.config rename to Examples/Speech/Miscellaneous/TIMIT/CPU/TIMIT_DNN.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/CPU/TIMIT_LSTM.config b/Examples/Speech/Miscellaneous/TIMIT/CPU/TIMIT_LSTM.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/CPU/TIMIT_LSTM.config rename to Examples/Speech/Miscellaneous/TIMIT/CPU/TIMIT_LSTM.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/GPU/TIMIT_DNN.config b/Examples/Speech/Miscellaneous/TIMIT/GPU/TIMIT_DNN.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/GPU/TIMIT_DNN.config rename to Examples/Speech/Miscellaneous/TIMIT/GPU/TIMIT_DNN.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/GPU/TIMIT_LSTM.config b/Examples/Speech/Miscellaneous/TIMIT/GPU/TIMIT_LSTM.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/GPU/TIMIT_LSTM.config rename to Examples/Speech/Miscellaneous/TIMIT/GPU/TIMIT_LSTM.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/README.txt b/Examples/Speech/Miscellaneous/TIMIT/config/README.txt index 6fd15308c..78bc4a4a7 100644 --- a/Examples/Speech/Miscellaneous/TIMIT/config/README.txt +++ b/Examples/Speech/Miscellaneous/TIMIT/config/README.txt @@ -7,38 +7,38 @@ Below is a brief description of the examples. To Use: ======= Modify the following files: -* globals.config in "configs" to reflect your current experimental setup) -* modify "DeviceNumber" in globals.config to specify CPU (<0) or GPU (>=0) +* globals.cntk in "configs" to reflect your current experimental setup) +* modify "DeviceNumber" in globals.cntk to specify CPU (<0) or GPU (>=0) * all SCP files (lists of files) in "lib/scp" to point to your feature files -Run the command line with both globals.config and the desired config, separated by a + -* for example: cntk configFile=globals.config+TIMIT_TrainSimpleNetwork.config +Run the command line with both globals.cntk and the desired config, separated by a + +* for example: cntk configFile=globals.cntk+TIMIT_TrainSimpleNetwork.cntk * note that full paths to config files need to be provided if you are not inside the config directory Path Definitions: ================= -* globals.config [defines paths to feature and label files and experiments] +* globals.cntk [defines paths to feature and label files and experiments] Network Training Examples: ========================== -* TIMIT_TrainSimpleNetwork.config [train basic feedforward fully connected neural network] -* TIMIT_TrainNDLNetwork.config [train a neural network defined using NDL] -* TIMIT_TrainAdaptLearnRate.config [similar to simple network example, but learning rate adapted based on dev set] -* TIMIT_TrainAutoEncoder.config [train autoencoder with bottleneck layer] -* TIMIT_TrainWithPreTrain.config [pre-train using layerwise discriminative pre-training, then do full network training] -* TIMIT_TrainMultiTask.config [train with multi-task learning with joint prediciton of senone labels and dialect region] -* TIMIT_TrainMultiInput.config [train with 2 different inputs: fbank and mfcc] -* TIMIT_TrainLSTM.config [train single layer LSTM network] +* TIMIT_TrainSimpleNetwork.cntk [train basic feedforward fully connected neural network] +* TIMIT_TrainNDLNetwork.cntk [train a neural network defined using NDL] +* TIMIT_AdaptLearnRate.cntk [similar to simple network example, but learning rate adapted based on dev set] +* TIMIT_TrainAutoEncoder.cntk [train autoencoder with bottleneck layer] +* TIMIT_TrainWithPreTrain.cntk [pre-train using layerwise discriminative pre-training, then do full network training] +* TIMIT_TrainMultiTask.cntk [train with multi-task learning with joint prediction of senone labels and dialect region] +* TIMIT_TrainMultiInput.cntk [train with 2 different inputs: fbank and mfcc] +* TIMIT_TrainLSTM.cntk [train single layer LSTM network] Network Evaluation Examples: ============================ -* TIMIT_CrossValidateSimpleNetwork.config [evaluate the models at all or some epochs and report best performing model] -* TIMIT_EvalSimpleNetwork.config [evaluate a network] +* TIMIT_CrossValidateSimpleNetwork.cntk [evaluate the models at all or some epochs and report best performing model] +* TIMIT_EvalSimpleNetwork.cntk [evaluate a network] Network Output Writing: ======================= -* TIMIT_WriteBottleneck.config [write bottleneck features from autoencoder model] -* TIMIT_WriteScaledLogLike.config [write scaled likelihoods from simple model] +* TIMIT_WriteBottleneck.cntk [write bottleneck features from autoencoder model] +* TIMIT_WriteScaledLogLike.cntk [write scaled likelihoods from simple model] Network Description Language (NDL) & Model Editing Language (MEL) files for experiments: ======================================================================================= diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_AdaptLearnRate.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_AdaptLearnRate.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_AdaptLearnRate.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_AdaptLearnRate.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_CrossValidateSimpleNetwork.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_CrossValidateSimpleNetwork.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_CrossValidateSimpleNetwork.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_CrossValidateSimpleNetwork.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_EvalSimpleNetwork.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_EvalSimpleNetwork.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_EvalSimpleNetwork.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_EvalSimpleNetwork.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainAutoEncoder.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainAutoEncoder.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainAutoEncoder.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainAutoEncoder.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainLSTM.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainLSTM.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainLSTM.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainLSTM.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainMultiInput.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainMultiInput.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainMultiInput.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainMultiInput.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainMultiTask.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainMultiTask.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainMultiTask.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainMultiTask.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainNDLNetwork.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainNDLNetwork.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainNDLNetwork.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainNDLNetwork.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainSimpleNetwork.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainSimpleNetwork.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainSimpleNetwork.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainSimpleNetwork.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainWithPreTrain.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainWithPreTrain.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainWithPreTrain.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_TrainWithPreTrain.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_WriteBottleneck.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_WriteBottleneck.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_WriteBottleneck.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_WriteBottleneck.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_WriteScaledLogLike.config b/Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_WriteScaledLogLike.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_WriteScaledLogLike.config rename to Examples/Speech/Miscellaneous/TIMIT/config/TIMIT_WriteScaledLogLike.cntk diff --git a/Examples/Speech/Miscellaneous/TIMIT/config/globals.config b/Examples/Speech/Miscellaneous/TIMIT/config/globals.cntk similarity index 100% rename from Examples/Speech/Miscellaneous/TIMIT/config/globals.config rename to Examples/Speech/Miscellaneous/TIMIT/config/globals.cntk diff --git a/Examples/Text/Miscellaneous/SLU/README.txt b/Examples/Text/Miscellaneous/SLU/README.txt index 1edceaaea..ec3a448ff 100644 --- a/Examples/Text/Miscellaneous/SLU/README.txt +++ b/Examples/Text/Miscellaneous/SLU/README.txt @@ -7,16 +7,16 @@ Below is a brief description of the examples. To Use: ======= Modify the following files: -* globals.config in "configs" to reflect your current experimental setup) -* modify "DeviceNumber" in globals.config to specify CPU (<0) or GPU (>=0) +* globals.cntk in "configs" to reflect your current experimental setup) +* modify "DeviceNumber" in globals.cntk to specify CPU (<0) or GPU (>=0) * all SCP files (lists of files) in "lib/scp" to point to your feature files -Run the command line with both globals.config and the desired config, separated by a + -* for example: cntk configFile=globals.config+rnnlu.config +Run the command line with both globals.cntk and the desired config, separated by a + +* for example: cntk configFile=globals.cntk+rnnlu.cntk * note that full paths to config files need to be provided if you are not inside the config directory * for example -* C:\dev\cntk5\x64\release\CNTK.exe configFile=C:\dev\cntk5\ExampleSetups\SLU\globals.config+C:\dev\cntk5\ExampleSetups\SLU\rnnlu.config +* C:\dev\cntk5\x64\release\CNTK.exe configFile=C:\dev\cntk5\ExampleSetups\SLU\globals.cntk+C:\dev\cntk5\ExampleSetups\SLU\rnnlu.cntk Scoring * ./score.sh @@ -25,7 +25,7 @@ Scoring Path Definitions: ================= -* globals.config [defines paths to feature and label files and experiments] +* globals.cntk [defines paths to feature and label files and experiments] Check training loss ========================== @@ -38,7 +38,7 @@ Finished Epoch[1]: [Validation Set] Train Loss Per Sample = 0.2035009 EvalErr P -------------------------------------------------------------- Network Training Examples: ========================== -* rnnlu.config +* rnnlu.cntk # iter 10, learning rate 0.1 accuracy: 98.01%; precision: 93.75%; recall: 94.04%; FB1: 93.89 diff --git a/Examples/Text/Miscellaneous/SLU/globals.config b/Examples/Text/Miscellaneous/SLU/globals.cntk similarity index 100% rename from Examples/Text/Miscellaneous/SLU/globals.config rename to Examples/Text/Miscellaneous/SLU/globals.cntk diff --git a/Examples/Text/Miscellaneous/SLU/rnnlu.config b/Examples/Text/Miscellaneous/SLU/rnnlu.cntk similarity index 100% rename from Examples/Text/Miscellaneous/SLU/rnnlu.config rename to Examples/Text/Miscellaneous/SLU/rnnlu.cntk diff --git a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/fnnlm.config b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/fnnlm.cntk similarity index 100% rename from Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/fnnlm.config rename to Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/fnnlm.cntk diff --git a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/global.config b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/global.cntk similarity index 100% rename from Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/global.config rename to Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/global.cntk diff --git a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/rnnlm.config b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/rnnlm.cntk similarity index 100% rename from Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/rnnlm.config rename to Examples/Text/PennTreebank/AdditionalFiles/RNNLM/CPU/rnnlm.cntk diff --git a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/ExpectedOutputs.txt b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/ExpectedOutputs.txt index efe870e01..88d85480e 100644 --- a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/ExpectedOutputs.txt +++ b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/ExpectedOutputs.txt @@ -1,4 +1,4 @@ -cn.exe configFile=global.config+rnnlm.gpu.config train=[SGD=[momentumPerMB=0.9]] ExpFolder=c:\exp\gpurnnlm +cn.exe configFile=global.cntk+rnnlm.gpu.cntk train=[SGD=[momentumPerMB=0.9]] ExpFolder=c:\exp\gpurnnlm Training phase: Finished Epoch[1]: [Training Set] Train Loss Per Sample = 6.168982 EvalErr Per Sample = 6.168982 Ave Learn Rate Per Sample = 0.009999999776 Epoch Time=535.896 diff --git a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/fnnlm.config b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/fnnlm.cntk similarity index 100% rename from Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/fnnlm.config rename to Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/fnnlm.cntk diff --git a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/global.config b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/global.cntk similarity index 100% rename from Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/global.config rename to Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/global.cntk diff --git a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/rnnlm.config b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/rnnlm.cntk similarity index 100% rename from Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/rnnlm.config rename to Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/rnnlm.cntk diff --git a/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/rnnlm.gpu.config b/Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/rnnlm.gpu.cntk similarity index 100% rename from Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/rnnlm.gpu.config rename to Examples/Text/PennTreebank/AdditionalFiles/RNNLM/GPU/rnnlm.gpu.cntk diff --git a/Examples/Text/PennTreebank/Config/rnn.config b/Examples/Text/PennTreebank/Config/rnn.cntk similarity index 100% rename from Examples/Text/PennTreebank/Config/rnn.config rename to Examples/Text/PennTreebank/Config/rnn.cntk diff --git a/Examples/Text/PennTreebank/README.md b/Examples/Text/PennTreebank/README.md index d698c4626..3df918994 100644 --- a/Examples/Text/PennTreebank/README.md +++ b/Examples/Text/PennTreebank/README.md @@ -39,12 +39,12 @@ or prefix the call to the cntk executable with the corresponding folder. Run the example from the Text/Data folder using: -`cntk configFile=../Config/rnn.config` +`cntk configFile=../Config/rnn.cntk` or run from any folder and specify the Data folder as the `currentDirectory`, e.g. running from the Text folder using: -`cntk configFile=Config/rnn.config currentDirectory=Data` +`cntk configFile=Config/rnn.cntk currentDirectory=Data` The output folder will be created inside Text/. diff --git a/Source/CNTK/BrainScript/Doc/Notes.txt b/Source/CNTK/BrainScript/Doc/Notes.txt index 71369c8e6..760beda0c 100644 --- a/Source/CNTK/BrainScript/Doc/Notes.txt +++ b/Source/CNTK/BrainScript/Doc/Notes.txt @@ -181,7 +181,7 @@ TIMIT_AddLayer = new EditAction [ sample ------ -// This sample is a modification of the original TIMIT_TrainSimpleNetwork.config and TIMIT_TrainNDLNetwork.config. +// This sample is a modification of the original TIMIT_TrainSimpleNetwork.cntk and TIMIT_TrainNDLNetwork.cntk. // The changes compared to the origina syntax are called out in comments. stderr = ExpDir + "\TrainSimpleNetwork\log\log" // before: $ExpDir$\TrainSimpleNetwork\log\log diff --git a/Tests/EndToEndTests/Examples/Image/MNIST/01_OneHidden/run-test b/Tests/EndToEndTests/Examples/Image/MNIST/01_OneHidden/run-test index 7e459c4e0..5bf350d7d 100755 --- a/Tests/EndToEndTests/Examples/Image/MNIST/01_OneHidden/run-test +++ b/Tests/EndToEndTests/Examples/Image/MNIST/01_OneHidden/run-test @@ -16,5 +16,5 @@ else imageLayout=cudnn fi -cntkrun 01_OneHidden.config "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=100]] train=[reader=[randomize=none]] imageLayout=\"$imageLayout\"" || exit $? +cntkrun 01_OneHidden.cntk "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=100]] train=[reader=[randomize=none]] imageLayout=\"$imageLayout\"" || exit $? diff --git a/Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution/run-test b/Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution/run-test index d57a9c2ff..d220a039d 100755 --- a/Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution/run-test +++ b/Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution/run-test @@ -16,4 +16,4 @@ else imageLayout=cudnn fi -cntkrun 02_Convolution.config "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=128]] train=[reader=[randomize=none]] imageLayout=\"$imageLayout\"" || exit $? +cntkrun 02_Convolution.cntk "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=128]] train=[reader=[randomize=none]] imageLayout=\"$imageLayout\"" || exit $? diff --git a/Tests/EndToEndTests/Examples/Image/MNIST/03_ConvBatchNorm/run-test b/Tests/EndToEndTests/Examples/Image/MNIST/03_ConvBatchNorm/run-test index 04b033e33..d719471a5 100755 --- a/Tests/EndToEndTests/Examples/Image/MNIST/03_ConvBatchNorm/run-test +++ b/Tests/EndToEndTests/Examples/Image/MNIST/03_ConvBatchNorm/run-test @@ -16,5 +16,5 @@ else imageLayout=cudnn fi -cntkrun 03_ConvBatchNorm.config "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=128]] train=[reader=[randomize=none]] imageLayout=\"$imageLayout\"" || exit $? +cntkrun 03_ConvBatchNorm.cntk "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=128]] train=[reader=[randomize=none]] imageLayout=\"$imageLayout\"" || exit $? diff --git a/Tests/EndToEndTests/Examples/Other/Simple2d/MultiGpu/run-test b/Tests/EndToEndTests/Examples/Other/Simple2d/MultiGpu/run-test index 0754b1d4d..e97270101 100755 --- a/Tests/EndToEndTests/Examples/Other/Simple2d/MultiGpu/run-test +++ b/Tests/EndToEndTests/Examples/Other/Simple2d/MultiGpu/run-test @@ -5,5 +5,5 @@ ConfigDir=$TEST_DIR/../../../../../../Examples/Other/Simple2d/Config # cntkrun -cntkrun Multigpu.config "Multigpu_Demo_Train=[SGD=[maxEpochs=1]] Multigpu_Demo_Train=[SGD=[epochSize=100]] Multigpu_Demo_Train=[reader=[randomize=none]]" || exit $? +cntkrun Multigpu.cntk "Multigpu_Demo_Train=[SGD=[maxEpochs=1]] Multigpu_Demo_Train=[SGD=[epochSize=100]] Multigpu_Demo_Train=[reader=[randomize=none]]" || exit $? diff --git a/Tests/EndToEndTests/Examples/Other/Simple2d/Simple/run-test b/Tests/EndToEndTests/Examples/Other/Simple2d/Simple/run-test index 6878e6c7c..4a4951112 100755 --- a/Tests/EndToEndTests/Examples/Other/Simple2d/Simple/run-test +++ b/Tests/EndToEndTests/Examples/Other/Simple2d/Simple/run-test @@ -5,5 +5,5 @@ ConfigDir=$TEST_DIR/../../../../../../Examples/Other/Simple2d/Config # cntkrun -cntkrun Simple.config "Simple_Demo_Train=[SGD=[maxEpochs=1]] Simple_Demo_Train=[SGD=[epochSize=100]] Simple_Demo_Train=[reader=[randomize=none]]" || exit $? +cntkrun Simple.cntk "Simple_Demo_Train=[SGD=[maxEpochs=1]] Simple_Demo_Train=[SGD=[epochSize=100]] Simple_Demo_Train=[reader=[randomize=none]]" || exit $? diff --git a/Tests/EndToEndTests/Examples/Speech/AN4/FeedForward/run-test b/Tests/EndToEndTests/Examples/Speech/AN4/FeedForward/run-test index 6ea4484f4..5f06d30e3 100755 --- a/Tests/EndToEndTests/Examples/Speech/AN4/FeedForward/run-test +++ b/Tests/EndToEndTests/Examples/Speech/AN4/FeedForward/run-test @@ -5,5 +5,5 @@ ConfigDir=$TEST_DIR/../../../../../../Examples/Speech/AN4/Config # cntkrun -cntkrun FeedForward.config "speechTrain=[SGD=[maxEpochs=1]] speechTrain=[SGD=[epochSize=2048]]" || exit $? +cntkrun FeedForward.cntk "speechTrain=[SGD=[maxEpochs=1]] speechTrain=[SGD=[epochSize=2048]]" || exit $? diff --git a/Tests/EndToEndTests/Examples/Speech/AN4/LSTM/run-test b/Tests/EndToEndTests/Examples/Speech/AN4/LSTM/run-test index 675f9b62a..9ba051d55 100755 --- a/Tests/EndToEndTests/Examples/Speech/AN4/LSTM/run-test +++ b/Tests/EndToEndTests/Examples/Speech/AN4/LSTM/run-test @@ -5,5 +5,5 @@ ConfigDir=$TEST_DIR/../../../../../../Examples/Speech/AN4/Config # cntkrun -cntkrun LSTM-NDL.config "speechTrain=[SGD=[maxEpochs=1]] speechTrain=[SGD=[epochSize=64]] parallelTrain=false" || exit $? +cntkrun LSTM-NDL.cntk "speechTrain=[SGD=[maxEpochs=1]] speechTrain=[SGD=[epochSize=64]] parallelTrain=false" || exit $? diff --git a/Tests/EndToEndTests/Examples/Text/PennTreebank/RNN/run-test b/Tests/EndToEndTests/Examples/Text/PennTreebank/RNN/run-test index 65d7231ea..79b5af11e 100755 --- a/Tests/EndToEndTests/Examples/Text/PennTreebank/RNN/run-test +++ b/Tests/EndToEndTests/Examples/Text/PennTreebank/RNN/run-test @@ -5,5 +5,5 @@ ConfigDir=$TEST_DIR/../../../../../../Examples/Text/PennTreebank/Config # cntkrun -cntkrun rnn.config "train=[SGD=[maxEpochs=1]] train=[epochSize=2048]] trainFile=ptb.small.train.txt validFile=ptb.small.valid.txt testFile=ptb.small.test.txt confVocabSize=1000" || exit $? +cntkrun rnn.cntk "train=[SGD=[maxEpochs=1]] train=[epochSize=2048]] trainFile=ptb.small.train.txt validFile=ptb.small.valid.txt testFile=ptb.small.test.txt confVocabSize=1000" || exit $? diff --git a/Tests/EndToEndTests/Image/QuickE2E/cntk.config b/Tests/EndToEndTests/Image/QuickE2E/cntk.cntk similarity index 100% rename from Tests/EndToEndTests/Image/QuickE2E/cntk.config rename to Tests/EndToEndTests/Image/QuickE2E/cntk.cntk diff --git a/Tests/EndToEndTests/Image/QuickE2E/run-test b/Tests/EndToEndTests/Image/QuickE2E/run-test index 498704295..acec44f14 100755 --- a/Tests/EndToEndTests/Image/QuickE2E/run-test +++ b/Tests/EndToEndTests/Image/QuickE2E/run-test @@ -3,10 +3,10 @@ . $TEST_ROOT_DIR/run-test-common # cntkrun -cntkrun cntk.config || exit $? +cntkrun cntk.cntk || exit $? echo === Deleting last epoch data rm $TEST_RUN_DIR/models/*.dnn echo ==== Re-running from checkpoint DeleteExistingModels=0 # cntkrun -cntkrun cntk.config 'makeMode=true' || exit $? +cntkrun cntk.cntk 'makeMode=true' || exit $? diff --git a/Tests/EndToEndTests/LM/RNNLM/CPU/global.config b/Tests/EndToEndTests/LM/RNNLM/CPU/global.cntk similarity index 100% rename from Tests/EndToEndTests/LM/RNNLM/CPU/global.config rename to Tests/EndToEndTests/LM/RNNLM/CPU/global.cntk diff --git a/Tests/EndToEndTests/LM/RNNLM/CPU/rnnlm.config b/Tests/EndToEndTests/LM/RNNLM/CPU/rnnlm.cntk similarity index 100% rename from Tests/EndToEndTests/LM/RNNLM/CPU/rnnlm.config rename to Tests/EndToEndTests/LM/RNNLM/CPU/rnnlm.cntk diff --git a/Tests/EndToEndTests/LM/RNNLM/GPU/rnnlm.config b/Tests/EndToEndTests/LM/RNNLM/GPU/rnnlm.cntk similarity index 100% rename from Tests/EndToEndTests/LM/RNNLM/GPU/rnnlm.config rename to Tests/EndToEndTests/LM/RNNLM/GPU/rnnlm.cntk diff --git a/Tests/EndToEndTests/ParallelTraining/NoQuantization/DoublePrecision/run-test b/Tests/EndToEndTests/ParallelTraining/NoQuantization/DoublePrecision/run-test index 8e322e875..761689c06 100755 --- a/Tests/EndToEndTests/ParallelTraining/NoQuantization/DoublePrecision/run-test +++ b/Tests/EndToEndTests/ParallelTraining/NoQuantization/DoublePrecision/run-test @@ -8,7 +8,7 @@ Instances=4 NumCPUThreads=$(threadsPerInstance $Instances) # cntkmpirun -cntkmpirun "-n $Instances" SimpleMultiGPU.config "numCPUThreads=$NumCPUThreads precision=double SimpleMultiGPU=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=64]]]]" +cntkmpirun "-n $Instances" SimpleMultiGPU.cntk "numCPUThreads=$NumCPUThreads precision=double SimpleMultiGPU=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=64]]]]" ExitCode=$? sed 's/^/MPI Rank 0: /' $TEST_RUN_DIR/"$LogFileName"_SimpleMultiGPU.logrank0 sed 's/^/MPI Rank 1: /' $TEST_RUN_DIR/"$LogFileName"_SimpleMultiGPU.logrank1 diff --git a/Tests/EndToEndTests/ParallelTraining/NoQuantization/SinglePrecision/run-test b/Tests/EndToEndTests/ParallelTraining/NoQuantization/SinglePrecision/run-test index fad087b22..2d04a0bb4 100755 --- a/Tests/EndToEndTests/ParallelTraining/NoQuantization/SinglePrecision/run-test +++ b/Tests/EndToEndTests/ParallelTraining/NoQuantization/SinglePrecision/run-test @@ -8,7 +8,7 @@ Instances=4 NumCPUThreads=$(threadsPerInstance $Instances) # cntkmpirun -cntkmpirun "-n $Instances" SimpleMultiGPU.config "numCPUThreads=$NumCPUThreads precision=float SimpleMultiGPU=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=32]]]]" +cntkmpirun "-n $Instances" SimpleMultiGPU.cntk "numCPUThreads=$NumCPUThreads precision=float SimpleMultiGPU=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=32]]]]" ExitCode=$? sed 's/^/MPI Rank 0: /' $TEST_RUN_DIR/"$LogFileName"_SimpleMultiGPU.logrank0 sed 's/^/MPI Rank 1: /' $TEST_RUN_DIR/"$LogFileName"_SimpleMultiGPU.logrank1 diff --git a/Tests/EndToEndTests/ParallelTraining/SimpleMultiGPU.config b/Tests/EndToEndTests/ParallelTraining/SimpleMultiGPU.cntk similarity index 100% rename from Tests/EndToEndTests/ParallelTraining/SimpleMultiGPU.config rename to Tests/EndToEndTests/ParallelTraining/SimpleMultiGPU.cntk diff --git a/Tests/EndToEndTests/SLU/README.txt b/Tests/EndToEndTests/SLU/README.txt index fca69479c..6990e694d 100644 --- a/Tests/EndToEndTests/SLU/README.txt +++ b/Tests/EndToEndTests/SLU/README.txt @@ -1,4 +1,4 @@ -C:\dev\cntk3\CNTKSolution\x64\Release\cntk configFile=globals.config+rnnlu.config +C:\dev\cntk3\CNTKSolution\x64\Release\cntk configFile=globals.cntk+rnnlu.cntk # expected results, which has a copy at Expected.log is @@ -11,6 +11,6 @@ Finished Epoch[3]: [Training Set] Train Loss Per Sample = 3.6568716 EvalErr P Finished Epoch[3]: [Validation Set] Train Loss Per Sample = 2.6959986 EvalErr Per Sample = 2.6959986 del /q c:\temp\exp\atis -C:\dev\cntk3\CNTKSolution\x64\Release\cntk configFile=globals.config+rnnlu.ndl.config +C:\dev\cntk3\CNTKSolution\x64\Release\cntk configFile=globals.cntk+rnnlu.ndl.cntk #should have the same output as above using simple network builder. diff --git a/Tests/EndToEndTests/SLU/globals.config b/Tests/EndToEndTests/SLU/globals.cntk similarity index 100% rename from Tests/EndToEndTests/SLU/globals.config rename to Tests/EndToEndTests/SLU/globals.cntk diff --git a/Tests/EndToEndTests/SLU/rnnlu.config b/Tests/EndToEndTests/SLU/rnnlu.cntk similarity index 100% rename from Tests/EndToEndTests/SLU/rnnlu.config rename to Tests/EndToEndTests/SLU/rnnlu.cntk diff --git a/Tests/EndToEndTests/SLU/rnnlu.ndl.config b/Tests/EndToEndTests/SLU/rnnlu.ndl.cntk similarity index 100% rename from Tests/EndToEndTests/SLU/rnnlu.ndl.config rename to Tests/EndToEndTests/SLU/rnnlu.ndl.cntk diff --git a/Tests/EndToEndTests/Speech/DNN/DiscriminativePreTraining/cntk_dpt.config b/Tests/EndToEndTests/Speech/DNN/DiscriminativePreTraining/cntk_dpt.cntk similarity index 100% rename from Tests/EndToEndTests/Speech/DNN/DiscriminativePreTraining/cntk_dpt.config rename to Tests/EndToEndTests/Speech/DNN/DiscriminativePreTraining/cntk_dpt.cntk diff --git a/Tests/EndToEndTests/Speech/DNN/DiscriminativePreTraining/run-test b/Tests/EndToEndTests/Speech/DNN/DiscriminativePreTraining/run-test index 5209af7fa..89aec9be8 100755 --- a/Tests/EndToEndTests/Speech/DNN/DiscriminativePreTraining/run-test +++ b/Tests/EndToEndTests/Speech/DNN/DiscriminativePreTraining/run-test @@ -3,4 +3,4 @@ . $TEST_ROOT_DIR/run-test-common # cntkrun -cntkrun cntk_dpt.config || exit $? +cntkrun cntk_dpt.cntk || exit $? diff --git a/Tests/EndToEndTests/Speech/DNN/Parallel1BitQuantization/run-test b/Tests/EndToEndTests/Speech/DNN/Parallel1BitQuantization/run-test index 3df9a4777..f4c8e72e6 100755 --- a/Tests/EndToEndTests/Speech/DNN/Parallel1BitQuantization/run-test +++ b/Tests/EndToEndTests/Speech/DNN/Parallel1BitQuantization/run-test @@ -8,7 +8,7 @@ Instances=3 NumCPUThreads=$(threadsPerInstance $Instances) # cntkmpirun -cntkmpirun "-n $Instances" cntk.config "numCPUThreads=$NumCPUThreads precision=double speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=1]]]] speechTrain=[SGD=[ParallelTrain=[parallelizationStartEpoch=2]]]" +cntkmpirun "-n $Instances" cntk.cntk "numCPUThreads=$NumCPUThreads precision=double speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=1]]]] speechTrain=[SGD=[ParallelTrain=[parallelizationStartEpoch=2]]]" ExitCode=$? sed 's/^/MPI Rank 0: /' $TEST_RUN_DIR/"$LogFileName"_speechTrain.logrank0 sed 's/^/MPI Rank 1: /' $TEST_RUN_DIR/"$LogFileName"_speechTrain.logrank1 diff --git a/Tests/EndToEndTests/Speech/DNN/ParallelBufferedAsyncGradientAggregation/run-test b/Tests/EndToEndTests/Speech/DNN/ParallelBufferedAsyncGradientAggregation/run-test index 5c4be592a..d4d5cac12 100755 --- a/Tests/EndToEndTests/Speech/DNN/ParallelBufferedAsyncGradientAggregation/run-test +++ b/Tests/EndToEndTests/Speech/DNN/ParallelBufferedAsyncGradientAggregation/run-test @@ -8,7 +8,7 @@ Instances=3 NumCPUThreads=$(threadsPerInstance $Instances) # cntkmpirun -cntkmpirun "-n $Instances" cntk.config "numCPUThreads=$NumCPUThreads precision=double speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=1]]]] speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[useBufferedAsyncGradientAggregation=true]]]] speechTrain=[SGD=[ParallelTrain=[parallelizationStartEpoch=2]]] speechTrain=[SGD=[maxEpochs=4]] speechTrain=[SGD=[ParallelTrain=[syncPerfStats=5]]]" +cntkmpirun "-n $Instances" cntk.cntk "numCPUThreads=$NumCPUThreads precision=double speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=1]]]] speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[useBufferedAsyncGradientAggregation=true]]]] speechTrain=[SGD=[ParallelTrain=[parallelizationStartEpoch=2]]] speechTrain=[SGD=[maxEpochs=4]] speechTrain=[SGD=[ParallelTrain=[syncPerfStats=5]]]" ExitCode=$? sed 's/^/MPI Rank 0: /' $TEST_RUN_DIR/"$LogFileName"_speechTrain.logrank0 sed 's/^/MPI Rank 1: /' $TEST_RUN_DIR/"$LogFileName"_speechTrain.logrank1 diff --git a/Tests/EndToEndTests/Speech/DNN/ParallelNoQuantization/run-test b/Tests/EndToEndTests/Speech/DNN/ParallelNoQuantization/run-test index 315112218..b4d4bf643 100755 --- a/Tests/EndToEndTests/Speech/DNN/ParallelNoQuantization/run-test +++ b/Tests/EndToEndTests/Speech/DNN/ParallelNoQuantization/run-test @@ -8,7 +8,7 @@ Instances=3 NumCPUThreads=$(threadsPerInstance $Instances) # cntkmpirun -cntkmpirun "-n $Instances" cntk.config "numCPUThreads=$NumCPUThreads" +cntkmpirun "-n $Instances" cntk.cntk "numCPUThreads=$NumCPUThreads" ExitCode=$? sed 's/^/MPI Rank 0: /' $TEST_RUN_DIR/"$LogFileName"_speechTrain.logrank0 sed 's/^/MPI Rank 1: /' $TEST_RUN_DIR/"$LogFileName"_speechTrain.logrank1 diff --git a/Tests/EndToEndTests/Speech/DNN/ParallelNoQuantizationBufferedAsyncGradientAggregation/run-test b/Tests/EndToEndTests/Speech/DNN/ParallelNoQuantizationBufferedAsyncGradientAggregation/run-test index 1a4f7a134..6415e1e1f 100755 --- a/Tests/EndToEndTests/Speech/DNN/ParallelNoQuantizationBufferedAsyncGradientAggregation/run-test +++ b/Tests/EndToEndTests/Speech/DNN/ParallelNoQuantizationBufferedAsyncGradientAggregation/run-test @@ -8,7 +8,7 @@ Instances=3 NumCPUThreads=$(threadsPerInstance $Instances) # cntkmpirun -cntkmpirun "-n $Instances" cntk.config "numCPUThreads=$NumCPUThreads precision=double speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=64]]]] speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[useBufferedAsyncGradientAggregation=true]]]] speechTrain=[SGD=[ParallelTrain=[parallelizationStartEpoch=2]]] speechTrain=[SGD=[maxEpochs=4]] speechTrain=[SGD=[ParallelTrain=[syncPerfStats=5]]]" +cntkmpirun "-n $Instances" cntk.cntk "numCPUThreads=$NumCPUThreads precision=double speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[gradientBits=64]]]] speechTrain=[SGD=[ParallelTrain=[DataParallelSGD=[useBufferedAsyncGradientAggregation=true]]]] speechTrain=[SGD=[ParallelTrain=[parallelizationStartEpoch=2]]] speechTrain=[SGD=[maxEpochs=4]] speechTrain=[SGD=[ParallelTrain=[syncPerfStats=5]]]" ExitCode=$? sed 's/^/MPI Rank 0: /' $TEST_RUN_DIR/"$LogFileName"_speechTrain.logrank0 sed 's/^/MPI Rank 1: /' $TEST_RUN_DIR/"$LogFileName"_speechTrain.logrank1 diff --git a/Tests/EndToEndTests/Speech/DNN/SequenceTraining/cntk_sequence.config b/Tests/EndToEndTests/Speech/DNN/SequenceTraining/cntk_sequence.cntk similarity index 100% rename from Tests/EndToEndTests/Speech/DNN/SequenceTraining/cntk_sequence.config rename to Tests/EndToEndTests/Speech/DNN/SequenceTraining/cntk_sequence.cntk diff --git a/Tests/EndToEndTests/Speech/DNN/SequenceTraining/run-test b/Tests/EndToEndTests/Speech/DNN/SequenceTraining/run-test index 40843285e..592b89287 100755 --- a/Tests/EndToEndTests/Speech/DNN/SequenceTraining/run-test +++ b/Tests/EndToEndTests/Speech/DNN/SequenceTraining/run-test @@ -21,7 +21,7 @@ mkdir $DataDir cp -R $DataSourceDir/* $DataDir || exit $? # cntkrun -cntkrun cntk_sequence.config +cntkrun cntk_sequence.cntk ExitCode=$? # Delete the test data diff --git a/Tests/EndToEndTests/Speech/DNN/cntk.config b/Tests/EndToEndTests/Speech/DNN/cntk.cntk similarity index 100% rename from Tests/EndToEndTests/Speech/DNN/cntk.config rename to Tests/EndToEndTests/Speech/DNN/cntk.cntk diff --git a/Tests/EndToEndTests/Speech/LSTM/FullUtterance/run-test b/Tests/EndToEndTests/Speech/LSTM/FullUtterance/run-test index 2e6d52266..f55406441 100755 --- a/Tests/EndToEndTests/Speech/LSTM/FullUtterance/run-test +++ b/Tests/EndToEndTests/Speech/LSTM/FullUtterance/run-test @@ -5,4 +5,4 @@ ConfigDir=$TEST_DIR/.. # cntkrun -cntkrun cntk.config 'Truncated=false speechTrain=[reader=[nbruttsineachrecurrentiter=2]] speechTrain=[SGD=[epochSize=2560]] speechTrain=[SGD=[maxEpochs=2]] speechTrain=[SGD=[numMBsToShowResult=1]] shareNodeValueMatrices=true' || exit $? +cntkrun cntk.cntk 'Truncated=false speechTrain=[reader=[nbruttsineachrecurrentiter=2]] speechTrain=[SGD=[epochSize=2560]] speechTrain=[SGD=[maxEpochs=2]] speechTrain=[SGD=[numMBsToShowResult=1]] shareNodeValueMatrices=true' || exit $? diff --git a/Tests/EndToEndTests/Speech/LSTM/Truncated/run-test b/Tests/EndToEndTests/Speech/LSTM/Truncated/run-test index 85ee4f4e0..27ce5f258 100755 --- a/Tests/EndToEndTests/Speech/LSTM/Truncated/run-test +++ b/Tests/EndToEndTests/Speech/LSTM/Truncated/run-test @@ -5,4 +5,4 @@ ConfigDir=$TEST_DIR/.. # cntkrun -cntkrun cntk.config || exit $? +cntkrun cntk.cntk || exit $? diff --git a/Tests/EndToEndTests/Speech/LSTM/cntk.config b/Tests/EndToEndTests/Speech/LSTM/cntk.cntk similarity index 100% rename from Tests/EndToEndTests/Speech/LSTM/cntk.config rename to Tests/EndToEndTests/Speech/LSTM/cntk.cntk diff --git a/Tests/EndToEndTests/Speech/QuickE2E/cntk.config b/Tests/EndToEndTests/Speech/QuickE2E/cntk.cntk similarity index 100% rename from Tests/EndToEndTests/Speech/QuickE2E/cntk.config rename to Tests/EndToEndTests/Speech/QuickE2E/cntk.cntk diff --git a/Tests/EndToEndTests/Speech/QuickE2E/run-test b/Tests/EndToEndTests/Speech/QuickE2E/run-test index 498704295..acec44f14 100755 --- a/Tests/EndToEndTests/Speech/QuickE2E/run-test +++ b/Tests/EndToEndTests/Speech/QuickE2E/run-test @@ -3,10 +3,10 @@ . $TEST_ROOT_DIR/run-test-common # cntkrun -cntkrun cntk.config || exit $? +cntkrun cntk.cntk || exit $? echo === Deleting last epoch data rm $TEST_RUN_DIR/models/*.dnn echo ==== Re-running from checkpoint DeleteExistingModels=0 # cntkrun -cntkrun cntk.config 'makeMode=true' || exit $? +cntkrun cntk.cntk 'makeMode=true' || exit $? diff --git a/Tests/EndToEndTests/Speech/README_Windows_Debug_commands.txt b/Tests/EndToEndTests/Speech/README_Windows_Debug_commands.txt index 9433ea911..8a93748d1 100644 --- a/Tests/EndToEndTests/Speech/README_Windows_Debug_commands.txt +++ b/Tests/EndToEndTests/Speech/README_Windows_Debug_commands.txt @@ -5,19 +5,19 @@ Note: Below, the current dir is sometimes set to be the data directory. This all --- Speech\QuickE2E: -COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=$(SolutionDir)Tests\EndToEndTests\Speech\QuickE2E\cntk.config stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\QuickE2E\models\cntkSpeech.dnn.log RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\QuickE2E DataDir=. DeviceId=auto makeMode=false +COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=$(SolutionDir)Tests\EndToEndTests\Speech\QuickE2E\cntk.cntk stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\QuickE2E\models\cntkSpeech.dnn.log RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\QuickE2E DataDir=. DeviceId=auto makeMode=false -Linux: bin/cntk currentDirectory=Tests/EndToEndTests/Speech/Data configFile=../QuickE2E/cntk.config stderr=../RunDir/QuickE2E/models/cntkSpeech.dnn.log RunDir=../RunDir/QuickE2E DataDir=. DeviceId=auto makeMode=false +Linux: bin/cntk currentDirectory=Tests/EndToEndTests/Speech/Data configFile=../QuickE2E/cntk.cntk stderr=../RunDir/QuickE2E/models/cntkSpeech.dnn.log RunDir=../RunDir/QuickE2E DataDir=. DeviceId=auto makeMode=false --- Speech\Simple: -COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=..\Simple\cntk.config RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\Simple stderr=../RunDir/Simple/models/cntkSpeech.dnn.log DataDir=$(SolutionDir)Tests\EndToEndTests\Speech\Data ConfigDir=$(SolutionDir)Tests\EndToEndTests\Speech\Simple DeviceId=auto makeMode=false +COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=..\Simple\cntk.cntk RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\Simple stderr=../RunDir/Simple/models/cntkSpeech.dnn.log DataDir=$(SolutionDir)Tests\EndToEndTests\Speech\Data ConfigDir=$(SolutionDir)Tests\EndToEndTests\Speech\Simple DeviceId=auto makeMode=false --- Speech\LSTM\Truncated: -COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM\cntk.config stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\Truncated\models\cntkSpeech.dnn.log RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\Truncated NdlDir=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM DataDir=. DeviceId=auto makeMode=false +COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM\cntk.cntk stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\Truncated\models\cntkSpeech.dnn.log RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\Truncated NdlDir=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM DataDir=. DeviceId=auto makeMode=false -Linux: bin/cntk currentDirectory=Tests/EndToEndTests/Speech/Data configFile=../LSTM/cntk.config stderr=../RunDir/LSTM/Truncated/models/cntkSpeech.dnn.log RunDir=../RunDir/LSTM/Truncated NdlDir=../LSTM DataDir=. DeviceId=auto makeMode=false +Linux: bin/cntk currentDirectory=Tests/EndToEndTests/Speech/Data configFile=../LSTM/cntk.cntk stderr=../RunDir/LSTM/Truncated/models/cntkSpeech.dnn.log RunDir=../RunDir/LSTM/Truncated NdlDir=../LSTM DataDir=. DeviceId=auto makeMode=false Using full BrainScript configuration @@ -25,13 +25,13 @@ COMMAND: --cd $(SolutionDir)Tests\EndToEndTests\Speech\Data -f $(SolutionDir --- Speech\LSTM\FullUtterance: -COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM\cntk.config stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\FullUtterance\models\cntkSpeech.dnn.log RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\FullUtterance NdlDir=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM DataDir=. DeviceId=auto Truncated=false speechTrain=[reader=[nbruttsineachrecurrentiter=1]] speechTrain=[SGD=[epochSize=2560]] speechTrain=[SGD=[maxEpochs=2]] speechTrain=[SGD=[numMBsToShowResult=1]] makeMode=false +COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM\cntk.cntk stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\FullUtterance\models\cntkSpeech.dnn.log RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\FullUtterance NdlDir=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM DataDir=. DeviceId=auto Truncated=false speechTrain=[reader=[nbruttsineachrecurrentiter=1]] speechTrain=[SGD=[epochSize=2560]] speechTrain=[SGD=[maxEpochs=2]] speechTrain=[SGD=[numMBsToShowResult=1]] makeMode=false Using parallel sequences (difference to above: nbruttsineachrecurrentiter=4). Note that this will produce a different result since we are confused about what MB size means: -COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM\cntk.config stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\FullUtterance\models\cntkSpeech.dnn.log RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\FullUtterance NdlDir=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM DataDir=. DeviceId=auto Truncated=false speechTrain=[reader=[nbruttsineachrecurrentiter=2]] speechTrain=[SGD=[epochSize=2560]] speechTrain=[SGD=[learningRatesPerMB=0.125]] speechTrain=[SGD=[maxEpochs=2]] speechTrain=[SGD=[numMBsToShowResult=1]] makeMode=false shareNodeValueMatrices=true +COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM\cntk.cntk stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\FullUtterance\models\cntkSpeech.dnn.log RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\LSTM\FullUtterance NdlDir=$(SolutionDir)Tests\EndToEndTests\Speech\LSTM DataDir=. DeviceId=auto Truncated=false speechTrain=[reader=[nbruttsineachrecurrentiter=2]] speechTrain=[SGD=[epochSize=2560]] speechTrain=[SGD=[learningRatesPerMB=0.125]] speechTrain=[SGD=[maxEpochs=2]] speechTrain=[SGD=[numMBsToShowResult=1]] makeMode=false shareNodeValueMatrices=true -Linux: bin/cntk currentDirectory=Tests/EndToEndTests/Speech/Data configFile=../LSTM/cntk.config stderr=../RunDir/LSTM/Truncated/models/cntkSpeech.dnn.log RunDir=../RunDir/LSTM/Truncated NdlDir=../LSTM DataDir=. DeviceId=auto Truncated=false 'speechTrain=[reader=[nbruttsineachrecurrentiter=4]]' 'speechTrain=[SGD=[epochSize=2560]]' 'speechTrain=[SGD=[learningRatesPerMB=0.125]]' 'speechTrain=[SGD=[maxEpochs=2]]' 'speechTrain=[SGD=[numMBsToShowResult=1]]' makeMode=false +Linux: bin/cntk currentDirectory=Tests/EndToEndTests/Speech/Data configFile=../LSTM/cntk.cntk stderr=../RunDir/LSTM/Truncated/models/cntkSpeech.dnn.log RunDir=../RunDir/LSTM/Truncated NdlDir=../LSTM DataDir=. DeviceId=auto Truncated=false 'speechTrain=[reader=[nbruttsineachrecurrentiter=4]]' 'speechTrain=[SGD=[epochSize=2560]]' 'speechTrain=[SGD=[learningRatesPerMB=0.125]]' 'speechTrain=[SGD=[maxEpochs=2]]' 'speechTrain=[SGD=[numMBsToShowResult=1]]' makeMode=false Using full BrainScript configuration @@ -39,26 +39,27 @@ COMMAND: --cd $(SolutionDir)Tests\EndToEndTests\Speech\Data -f $(SolutionDi --- Speech\AN4: -COMMAND: configFile=$(SolutionDir)Examples\Speech\AN4\Config\LSTM-NDL.config currentDirectory=$(SolutionDir)Examples\Speech\AN4\Data RunDir=$(SolutionDir)Examples\RunDir\Speech\AN4 DataDir=$(SolutionDir)Examples\Speech\AN4\Data ConfigDir=$(SolutionDir)Examples\Speech\AN4\Config OutputDir=$(SolutionDir)Examples\RunDir\Speech\AN4 stderr=$(SolutionDir)Examples\RunDir\Speech\AN4\cntkSpeech.dnn.log DeviceId=auto speechTrain=[SGD=[maxEpochs=1]] speechTrain=[SGD=[epochSize=64]] parallelTrain=false makeMode=false +COMMAND: configFile=$(SolutionDir)Examples\Speech\AN4\Config\LSTM-NDL.cntk currentDirectory=$(SolutionDir)Examples\Speech\AN4\Data RunDir=$(SolutionDir)Examples\RunDir\Speech\AN4 DataDir=$(SolutionDir)Examples\Speech\AN4\Data ConfigDir=$(SolutionDir)Examples\Speech\AN4\Config OutputDir=$(SolutionDir)Examples\RunDir\Speech\AN4 stderr=$(SolutionDir)Examples\RunDir\Speech\AN4\cntkSpeech.dnn.log DeviceId=auto speechTrain=[SGD=[maxEpochs=1]] speechTrain=[SGD=[epochSize=64]] parallelTrain=false makeMode=false --- Speech\DiscriminativePreTraining: --currently fails with MEL error 'Parameter name could not be resolved 'HL2.y' -COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=..\DNN\DiscriminativePreTraining\cntk_dpt.config stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\DNN\DiscriminativePreTraining\models\cntkSpeech.dnn.log ConfigDir=$(SolutionDir)Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining RunDir=..\RunDir\DNN\DiscriminativePreTraining DataDir=. DeviceId=auto makeMode=false +COMMAND: currentDirectory=$(SolutionDir)Tests\EndToEndTests\Speech\Data configFile=..\DNN\DiscriminativePreTraining\cntk_dpt.cntk stderr=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\DNN\DiscriminativePreTraining\models\cntkSpeech.dnn.log ConfigDir=$(SolutionDir)Tests\EndToEndTests\Speech\DNN\DiscriminativePreTraining RunDir=..\RunDir\DNN\DiscriminativePreTraining DataDir=. DeviceId=auto makeMode=false --- Speech\SequenceTraining: set CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY=\\storage.ccp.philly.selfhost.corp.microsoft.com\public\CNTKTestData -COMMAND: currentDirectory=\\storage.ccp.philly.selfhost.corp.microsoft.com\public\CNTKTestData configFile=$(SolutionDir)Tests\EndToEndTests\Speech\DNN\SequenceTraining\cntk_sequence.config RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\DNN\SequenceTraining DataDir=. ConfigDir=$(SolutionDir)Tests\EndToEndTests\Speech\DNN\SequenceTraining DeviceId=0 +COMMAND: currentDirectory=\\storage.ccp.philly.selfhost.corp.microsoft.com\public\CNTKTestData configFile=$(SolutionDir)Tests\EndToEndTests\Speech\DNN\SequenceTraining\cntk_sequence.cntk RunDir=$(SolutionDir)Tests\EndToEndTests\Speech\RunDir\DNN\SequenceTraining DataDir=. ConfigDir=$(SolutionDir)Tests\EndToEndTests\Speech\DNN\SequenceTraining DeviceId=0 --- MNIST: -COMMAND: currentDirectory=$(SolutionDir)ExampleSetups\Image\MNIST configFile=02_Conv.config configName=02_Conv +TODO out-of-date: +COMMAND: currentDirectory=$(SolutionDir)ExampleSetups\Image\MNIST configFile=02_Conv.cntk configName=02_Conv --- Image/QuickE2E: -COMMAND: configFile=$(SolutionDir)Tests\EndToEndTests\Image\QuickE2E\cntk.config RunDir=$(SolutionDir)Tests\EndToEndTests\Image\_run DataDir=$(SolutionDir)Tests\EndToEndTests\Image\Data ConfigDir=$(SolutionDir)Tests\EndToEndTests\Image\QuickE2E stderr=$(SolutionDir)Tests\EndToEndTests\RunDir\Image\QuickE2E\models\cntkImage.dnn.log DeviceId=0 useCuDnn=false makeMode=false +COMMAND: configFile=$(SolutionDir)Tests\EndToEndTests\Image\QuickE2E\cntk.cntk RunDir=$(SolutionDir)Tests\EndToEndTests\Image\_run DataDir=$(SolutionDir)Tests\EndToEndTests\Image\Data ConfigDir=$(SolutionDir)Tests\EndToEndTests\Image\QuickE2E stderr=$(SolutionDir)Tests\EndToEndTests\RunDir\Image\QuickE2E\models\cntkImage.dnn.log DeviceId=0 useCuDnn=false makeMode=false Simple test ----------- -COMMAND: currentDirectory=$(SolutionDir)Demos\Simple configFile=Simple.config stderr=RunDir\Simple.config.log RootDir=$(SolutionDir) DeviceNumber=-1 +COMMAND: currentDirectory=$(SolutionDir)Demos\Simple configFile=Simple.cntk stderr=RunDir\Simple.cntk.log RootDir=$(SolutionDir) DeviceNumber=-1 diff --git a/Tests/EndToEndTests/Speech/SVD/cntk.config b/Tests/EndToEndTests/Speech/SVD/cntk.cntk similarity index 100% rename from Tests/EndToEndTests/Speech/SVD/cntk.config rename to Tests/EndToEndTests/Speech/SVD/cntk.cntk diff --git a/Tests/EndToEndTests/Speech/SVD/run-test b/Tests/EndToEndTests/Speech/SVD/run-test index dc7645279..128c0d53d 100755 --- a/Tests/EndToEndTests/Speech/SVD/run-test +++ b/Tests/EndToEndTests/Speech/SVD/run-test @@ -3,4 +3,4 @@ . $TEST_ROOT_DIR/run-test-common # cntkrun -cntkrun cntk.config || exit $? +cntkrun cntk.cntk || exit $? diff --git a/Tests/EndToEndTests/Speech/Simple/cntk.config b/Tests/EndToEndTests/Speech/Simple/cntk.cntk similarity index 100% rename from Tests/EndToEndTests/Speech/Simple/cntk.config rename to Tests/EndToEndTests/Speech/Simple/cntk.cntk diff --git a/Tests/EndToEndTests/Speech/Simple/run-test b/Tests/EndToEndTests/Speech/Simple/run-test index 498704295..acec44f14 100755 --- a/Tests/EndToEndTests/Speech/Simple/run-test +++ b/Tests/EndToEndTests/Speech/Simple/run-test @@ -3,10 +3,10 @@ . $TEST_ROOT_DIR/run-test-common # cntkrun -cntkrun cntk.config || exit $? +cntkrun cntk.cntk || exit $? echo === Deleting last epoch data rm $TEST_RUN_DIR/models/*.dnn echo ==== Re-running from checkpoint DeleteExistingModels=0 # cntkrun -cntkrun cntk.config 'makeMode=true' || exit $? +cntkrun cntk.cntk 'makeMode=true' || exit $? diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop10_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop10_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop10_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop10_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop11_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop11_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop11_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop11_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop12_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop12_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop12_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop12_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop13_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop13_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop13_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop13_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop14_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop14_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop14_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop14_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop16_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop16_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop16_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop16_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop17_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop17_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop17_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop17_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop19_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop19_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop19_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop19_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop1_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop1_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop1_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop1_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop20_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop20_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop20_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop20_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop21_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop21_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop21_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop21_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop22_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop22_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop22_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop22_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop2_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop2_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop2_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop2_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop3_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop3_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop3_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop3_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop4_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop4_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop4_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop4_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop5_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop5_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop5_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop5_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop6_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop6_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop6_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop6_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop7_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop7_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop7_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop7_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop8_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop8_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop8_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop8_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop9_Config.txt b/Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop9_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop9_Config.txt rename to Tests/UnitTests/ReaderTests/Config/HTKMLFReaderSimpleDataLoop9_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/Config/UCIFastReaderSimpleDataLoop_Config.txt b/Tests/UnitTests/ReaderTests/Config/UCIFastReaderSimpleDataLoop_Config.cntk similarity index 100% rename from Tests/UnitTests/ReaderTests/Config/UCIFastReaderSimpleDataLoop_Config.txt rename to Tests/UnitTests/ReaderTests/Config/UCIFastReaderSimpleDataLoop_Config.cntk diff --git a/Tests/UnitTests/ReaderTests/HTKLMFReaderTests.cpp b/Tests/UnitTests/ReaderTests/HTKLMFReaderTests.cpp index c24f091fe..98acbbddf 100644 --- a/Tests/UnitTests/ReaderTests/HTKLMFReaderTests.cpp +++ b/Tests/UnitTests/ReaderTests/HTKLMFReaderTests.cpp @@ -26,7 +26,7 @@ BOOST_FIXTURE_TEST_SUITE(ReaderTestSuite, AN4ReaderFixture) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop1) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop1_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop1_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop1_5_11_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop1_Output.txt", "Simple_Test", @@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop1) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop2) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop2_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop2_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop2_12_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop2_Output.txt", "Simple_Test", @@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop2) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop3) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop3_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop3_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop3_13_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop3_Output.txt", "Simple_Test", @@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop3) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop4) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop4_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop4_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop4_8_14_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop4_Output.txt", "Simple_Test", @@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop4) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop5) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop5_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop5_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop1_5_11_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop5_Output.txt", "Simple_Test", @@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop5) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop6) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop6_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop6_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop6_16_17_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop6_Output.txt", "Simple_Test", @@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop6) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop7) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop7_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop7_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop7_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop7_Output.txt", "Simple_Test", @@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop7) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop8) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop8_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop8_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop4_8_14_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop8_Output.txt", "Simple_Test", @@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop8) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop9) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop9_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop9_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop9_19_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop9_Output.txt", "Simple_Test", @@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop8) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop10) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop10_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop10_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop10_20_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop10_Output.txt", "Simple_Test", @@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop10) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop11) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop11_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop11_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop1_5_11_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop11_Output.txt", "Simple_Test", @@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop11) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop12) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop12_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop12_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop2_12_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop12_Output.txt", "Simple_Test", @@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop12) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop13) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop13_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop13_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop3_13_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop13_Output.txt", "Simple_Test", @@ -250,7 +250,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop13) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop14) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop14_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop14_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop4_8_14_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop14_Output.txt", "Simple_Test", @@ -267,7 +267,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop14) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop16) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop16_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop16_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop6_16_17_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop16_Output.txt", "Simple_Test", @@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop16) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop17) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop17_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop17_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop6_16_17_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop17_Output.txt", "Simple_Test", @@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop17) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop19_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop19_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop9_19_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop19_Output.txt", "Simple_Test", @@ -323,7 +323,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop17) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop20) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop20_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop20_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop10_20_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop20_Output.txt", "Simple_Test", @@ -340,7 +340,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop20) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop21_0) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop21_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop21_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop21_0_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop21_0_Output.txt", "Simple_Test", @@ -357,7 +357,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop21_0) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop21_1) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop21_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop21_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop21_1_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop21_1_Output.txt", "Simple_Test", @@ -374,7 +374,7 @@ BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop21_1) BOOST_AUTO_TEST_CASE(HTKMLFReaderSimpleDataLoop22) { HelperRunReaderTest( - testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop22_Config.txt", + testDataPath() + "/Config/HTKMLFReaderSimpleDataLoop22_Config.cntk", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop22_Control.txt", testDataPath() + "/Control/HTKMLFReaderSimpleDataLoop22_Output.txt", "Simple_Test", diff --git a/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj b/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj index c7545b590..e8f2d6d24 100644 --- a/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj +++ b/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj @@ -156,27 +156,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -206,4 +206,4 @@ - \ No newline at end of file + diff --git a/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj.filters b/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj.filters index f50e08c21..44863be3f 100644 --- a/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj.filters +++ b/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj.filters @@ -54,67 +54,67 @@ Data - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config - + Config @@ -154,4 +154,4 @@ Control - \ No newline at end of file + diff --git a/Tests/UnitTests/ReaderTests/UCIFastReaderTests.cpp b/Tests/UnitTests/ReaderTests/UCIFastReaderTests.cpp index 44c8d592f..17c80c15e 100644 --- a/Tests/UnitTests/ReaderTests/UCIFastReaderTests.cpp +++ b/Tests/UnitTests/ReaderTests/UCIFastReaderTests.cpp @@ -21,7 +21,7 @@ BOOST_FIXTURE_TEST_SUITE(ReaderTestSuite, UCIReaderFixture) BOOST_AUTO_TEST_CASE(UCIFastReaderSimpleDataLoop) { HelperRunReaderTest( - testDataPath() + "/Config/UCIFastReaderSimpleDataLoop_Config.txt", + testDataPath() + "/Config/UCIFastReaderSimpleDataLoop_Config.cntk", testDataPath() + "/Control/UCIFastReaderSimpleDataLoop_Control.txt", testDataPath() + "/Control/UCIFastReaderSimpleDataLoop_Output.txt", "Simple_Test", diff --git a/Tools/build-and-test b/Tools/build-and-test index 3ed489917..80446a3b9 100755 --- a/Tools/build-and-test +++ b/Tools/build-and-test @@ -142,7 +142,7 @@ fi cd $CNTK_ROOT if ! [[ -f $CONF_FILE ]]; then - cp Examples/Other/Simple2d/Config/Simple.config $CONF_FILE || exit $? + cp Examples/Other/Simple2d/Config/Simple.cntk $CONF_FILE || exit $? # This chmod is necessary due to restrictive Cygwin interpretation of Windows permissions. # Cygwin interprets Windows permissions as ----rwx---, which lacks read permissions for user. @@ -219,7 +219,7 @@ fi if [[ $RUN == 1 ]]; then cd $PREFIX_DIR - echo "============ cp Examples/Other/Simple2d/Config/Simple.config $CONF_FILE ============" + echo "============ cp Examples/Other/Simple2d/Config/Simple.cntk $CONF_FILE ============" echo "============ cd $CNTK_ROOT/Examples/Other/Simple2d/Data ============" for TARGET in "${targetArray[@]}"