Fix vgg16

Author: junjihashimoto

src/Torch/Compose/Models.hs

@@ -23,11 +23,11 @@ import Data.HList
 
 vgg16Spec numClass =
   let maxPool2dSpec = MaxPool2dSpec
-        { kernelSize = (3,3)
+        { kernelSize = (2,2)
         , stride = (2,2)
-        , padding = (1,1)
-        , dilation = (0,0)
-        , ceilMode = Ceil
+        , padding = (0,0)
+        , dilation = (1,1)
+        , ceilMode = Floor
         }
       vggClassifierSpec =
         LinearSpec (512 * 7 * 7) 4096 .*.
@@ -39,7 +39,7 @@ vgg16Spec numClass =
         LinearSpec 4096 numClass .*.
         HNil
       conv2dSpec inChannel outChannel kernelHeight kernelWidth =
-        Conv2dSpec' inChannel outChannel kernelHeight kernelWidth (1,1) (0,0)
+        Conv2dSpec' inChannel outChannel kernelHeight kernelWidth (1,1) (1,1)
   in
     conv2dSpec 3 64 3 3 .*.
     conv2dSpec 64 64 3 3 .*.
@@ -55,7 +55,7 @@ vgg16Spec numClass =
     conv2dSpec 512 512 3 3 .*.
     conv2dSpec 512 512 3 3 .*.
     AdaptiveAvgPool2dSpec (7,7) .*.
-    ReshapeSpec [1,512*7*7] .*.
+    ReshapeSpec [-1,512*7*7] .*.
     vggClassifierSpec
 
 -- resnetSpec numClass =

test/Spec.hs

@@ -106,12 +106,10 @@ main = hspec $ do
     model <- sample (vgg16Spec 10)
     let input = ones' [2,3,128,128]
         outputShapes = toMaybeOutputShapes model input
---        output = forward model input
         exp =
-          Nothing .*. Nothing .*. Nothing .*. Nothing .*. Nothing .*.
-          Nothing .*. Nothing .*. Nothing .*. Nothing .*. Nothing .*.
-          Nothing .*. Nothing .*. Nothing .*. Nothing .*. Nothing .*.
-          Nothing .*. Nothing .*. Nothing .*. Nothing .*. Nothing .*.
-          Nothing .*. Nothing .*. HNil
-
+          Just [2,64,128,128] .*. Just [2,64,128,128] .*. Just [2,64,64,64] .*. Just [2,128,64,64] .*. Just [2,128,64,64] .*.
+          Just [2,128,32,32] .*. Just [2,256,32,32] .*. Just [2,256,32,32] .*. Just [2,256,32,32] .*. Just [2,256,16,16] .*.
+          Just [2,512,16,16] .*. Just [2,512,16,16] .*. Just [2,512,16,16] .*. Just [2,512,7,7] .*. Just [2,25088] .*.
+          Just [2,4096] .*. Just [2,4096] .*. Just [2,4096] .*. Just [2,4096] .*. Just [2,4096] .*.
+          Just [2,4096] .*. Just [2,10] .*. HNil
     outputShapes `shouldBe` exp