clean up wide resnet, fix block (#136)

brettkoonce · rxwei · commit 35207ba1da1b · 2019-04-29T13:43:26.000-07:00
diff --git a/CIFAR/wide_resnet.swift b/CIFAR/wide_resnet.swift
@@ -182,8 +182,7 @@ struct WideResnet28FirstBasicBlock: Layer {
 
     @differentiable
     func call(_ input: Input) -> Output {
-        let blockLayer = input.sequenced(through: block1, block2, block3, block4)
-        return blockLayer + shortcut(input)
+        return input.sequenced(through: block1, block2, block3, block4) + shortcut(input)
     }
 }
 
@@ -226,7 +225,7 @@ struct WideResnet28BasicBlock: Layer {
 
     @differentiable
     func call(_ input: Input) -> Output {
-        return input.sequenced(through: block1, block2) + shortcut(input)
+        return input.sequenced(through: block1, block2, block3, block4) + shortcut(input)
     }
 }
 
@@ -260,4 +259,3 @@ struct WideResNet28: Layer {
         return finalNorm.sequenced(through: avgPool, flatten, classifier)
     }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,7 @@ struct WideResnet28FirstBasicBlock: Layer {`
`182`	`182`
`183`	`183`	`@differentiable`
`184`	`184`	`func call(_ input: Input) -> Output {`
`185`		`- let blockLayer = input.sequenced(through: block1, block2, block3, block4)`
`186`		`- return blockLayer + shortcut(input)`
	`185`	`+ return input.sequenced(through: block1, block2, block3, block4) + shortcut(input)`
`187`	`186`	`}`
`188`	`187`	`}`
`189`	`188`
`@@ -226,7 +225,7 @@ struct WideResnet28BasicBlock: Layer {`
`226`	`225`
`227`	`226`	`@differentiable`
`228`	`227`	`func call(_ input: Input) -> Output {`
`229`		`- return input.sequenced(through: block1, block2) + shortcut(input)`
	`228`	`+ return input.sequenced(through: block1, block2, block3, block4) + shortcut(input)`
`230`	`229`	`}`
`231`	`230`	`}`
`232`	`231`
`@@ -260,4 +259,3 @@ struct WideResNet28: Layer {`
`260`	`259`	`return finalNorm.sequenced(through: avgPool, flatten, classifier)`
`261`	`260`	`}`
`262`	`261`	`}`
`263`		`-`