forked from microsoft/CNTK
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added Image Jenkins tests to VS solution and did the same edits as la…
…st commit to it
- Loading branch information
1 parent
d25e83c
commit 4031c04
Showing
6 changed files
with
103 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,31 @@ | ||
| DNNSigmoidLayer(inDim, outDim, x, parmScale) | ||
| { | ||
| W = Parameter(outDim, inDim, init = Uniform, initValueScale = parmScale) | ||
| b = Parameter(outDim, init = Uniform, initValueScale = parmScale) | ||
| DNNSigmoidLayer(inDim, outDim, x, parmScale) = [ | ||
| W = Parameter(outDim, inDim, init=uniform, initValueScale=parmScale) | ||
| b = Parameter(outDim, 1, init=uniform, initValueScale=parmScale) | ||
| t = Times(W, x) | ||
| z = Plus(t, b) | ||
| y = Sigmoid(z) | ||
| } | ||
| ] | ||
|
|
||
| DNNLayer(inDim, outDim, x, parmScale) | ||
| { | ||
| W = Parameter(outDim, inDim, init = Uniform, initValueScale = parmScale) | ||
| b = Parameter(outDim, init = Uniform, initValueScale = parmScale) | ||
| DNNLayer(inDim, outDim, x, parmScale) = [ | ||
| W = Parameter(outDim, inDim, init=uniform, initValueScale=parmScale) | ||
| b = Parameter(outDim, 1, init=uniform, initValueScale=parmScale) | ||
| t = Times(W, x) | ||
| z = Plus(t, b) | ||
| } | ||
| ] | ||
|
|
||
| ConvReLULayer(inp, outMap, inWCount, kW, kH, hStride, vStride, wScale, bValue) | ||
| { | ||
| convW = Parameter(outMap, inWCount, init = Uniform, initValueScale = wScale) | ||
| conv = Convolution(convW, inp, kW, kH, outMap, hStride, vStride, zeroPadding = false) | ||
| convB = Parameter(outMap, 1, init = fixedValue, value = bValue) | ||
| ConvReLULayer(inp, outMap, inWCount, kW, kH, hStride, vStride, wScale, bValue) = [ | ||
| convW = Parameter(outMap, inWCount, init=uniform, initValueScale=wScale) | ||
| conv = Convolution(convW, inp, kW, kH, outMap, hStride, vStride, zeroPadding=false) | ||
| convB = Parameter(outMap, 1, init=fixedValue, value=bValue) | ||
| convPlusB = Plus(conv, convB); | ||
| act = RectifiedLinear(convPlusB); | ||
| } | ||
| ] | ||
|
|
||
| BatchNorm(dim, x, scaleInit, biasInit) | ||
| { | ||
| BatchNorm(dim, x, scaleInit, biasInit) = [ | ||
| m = Mean(x) | ||
| isd = InvStdDev(x) | ||
| norm = ColumnElementTimes(Minus(x, m), isd) | ||
| sc = Parameter(dim, 1, init=Uniform, initValueScale=scaleInit) | ||
| b = Parameter(dim, 1, init=Uniform, initValueScale=biasInit) | ||
| sc = Parameter(dim, 1, init=uniform, initValueScale=scaleInit) | ||
| b = Parameter(dim, 1, init=uniform, initValueScale=biasInit) | ||
| bn_norm = Plus(ColumnElementTimes(norm, sc), b) | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,67 @@ | ||
| precision=float | ||
| command=Train:Test | ||
| deviceId=$DeviceId$ | ||
| precision = "float" | ||
| command = train:test | ||
| deviceId = $DeviceId$ | ||
|
|
||
| ndlMacros=$ConfigDir$/Macros.ndl | ||
| ndlMacros = "$ConfigDir$/Macros.ndl" | ||
|
|
||
| parallelTrain=false | ||
| NumCPUThreads=8 | ||
| parallelTrain = false | ||
| numCPUThreads = 8 | ||
|
|
||
| Train=[ | ||
| action=train | ||
| modelPath=$RunDir$/models/cntk.dnn | ||
| deviceId=$DeviceId$ | ||
| traceLevel=1 | ||
| train = [ | ||
| action = "train" | ||
| modelPath = "$RunDir$/models/cntk.dnn" | ||
| #deviceId = $DeviceId$ | ||
| traceLevel = 1 | ||
|
|
||
| NDLNetworkBuilder=[ | ||
| networkDescription=$ConfigDir$/Convolution.ndl | ||
| ] | ||
| NDLNetworkBuilder = [ | ||
| networkDescription = "$ConfigDir$/Convolution.ndl" | ||
| ] | ||
|
|
||
| SGD=[ | ||
| epochSize=100 | ||
| minibatchSize=10 | ||
| learningRatesPerMB=0.05 | ||
| momentumPerMB=0*10:0.7 | ||
| maxEpochs=12 | ||
| SGD = [ | ||
| epochSize = 100 | ||
| minibatchSize = 10 | ||
| learningRatesPerMB = 0.05 | ||
| momentumPerMB = 0*10:0.7 | ||
| maxEpochs = 12 | ||
| ] | ||
|
|
||
| reader=[ | ||
| readerType=UCIFastReader | ||
| file=$DataDir$/Train.txt | ||
| features=[ | ||
| dim=784 | ||
| start=1 | ||
| reader = [ | ||
| readerType = "UCIFastReader" | ||
| file = "$DataDir$/Train.txt" | ||
| features = [ | ||
| dim = 784 | ||
| start = 1 | ||
| ] | ||
| labels=[ | ||
| dim=1 | ||
| start=0 | ||
| labelDim=10 | ||
| labelMappingFile=$DataDir$/labelsmap.txt | ||
| labels = [ | ||
| dim = 1 | ||
| start = 0 | ||
| labelDim = 10 | ||
| labelMappingFile = "$DataDir$/labelsmap.txt" | ||
| ] | ||
| ] | ||
| ] | ||
|
|
||
| Test=[ | ||
| action=test | ||
| modelPath=$RunDir$/models/cntk.dnn | ||
| test = [ | ||
| action = "test" | ||
| modelPath = "$RunDir$/models/cntk.dnn" | ||
|
|
||
| NDLNetworkBuilder=[ | ||
| networkDescription=$ConfigDir$/Convolution.ndl | ||
| # TODO: there should be no need for a network builder upon testing | ||
| NDLNetworkBuilder = [ | ||
| networkDescription = "$ConfigDir$/Convolution.ndl" | ||
| ] | ||
|
|
||
| reader=[ | ||
| readerType=UCIFastReader | ||
| file=$DataDir$/Test.txt | ||
| features=[ | ||
| dim=784 | ||
| start=1 | ||
| reader = [ | ||
| readerType = "UCIFastReader" | ||
| file = "$DataDir$/Test.txt" | ||
| features = [ | ||
| dim = 784 | ||
| start = 1 | ||
| ] | ||
| labels=[ | ||
| dim=1 | ||
| start=0 | ||
| labelDim=10 | ||
| labelMappingFile=$DataDir$/labelsmap.txt | ||
| labels = [ | ||
| dim = 1 | ||
| start = 0 | ||
| labelDim = 10 | ||
| labelMappingFile = "$DataDir$/labelsmap.txt" | ||
| ] | ||
| ] | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters