remove padding layers in imagenet definitions

2 files changed, 16 insertions, 80 deletions

diff --git a/examples/imagenet/imagenet_train.prototxt b/examples/imagenet/imagenet_train.prototxt
index e395302e..9764687c 100644
--- a/examples/imagenet/imagenet_train.prototxt
+++ b/examples/imagenet/imagenet_train.prototxt
@@ -67,20 +67,12 @@ layers {
 }
 layers {
   layer {
-    name: "pad2"
-    type: "padding"
-    pad: 2
-  }
-  bottom: "norm1"
-  top: "pad2"
-}
-layers {
-  layer {
     name: "conv2"
     type: "conv"
     num_output: 256
     group: 2
     kernelsize: 5
+    pad: 2
     weight_filler {
       type: "gaussian"
       std: 0.01
@@ -94,7 +86,7 @@ layers {
     weight_decay: 1.
     weight_decay: 0.
   }
-  bottom: "pad2"
+  bottom: "norm1"
   top: "conv2"
 }
 layers {
@@ -129,19 +121,11 @@ layers {
 }
 layers {
   layer {
-    name: "pad3"
-    type: "padding"
-    pad: 1
-  }
-  bottom: "norm2"
-  top: "pad3"
-}
-layers {
-  layer {
     name: "conv3"
     type: "conv"
     num_output: 384
     kernelsize: 3
+    pad: 1
     weight_filler {
       type: "gaussian"
       std: 0.01
@@ -155,7 +139,7 @@ layers {
     weight_decay: 1.
     weight_decay: 0.
   }
-  bottom: "pad3"
+  bottom: "norm2"
   top: "conv3"
 }
 layers {
@@ -168,20 +152,12 @@ layers {
 }
 layers {
   layer {
-    name: "pad4"
-    type: "padding"
-    pad: 1
-  }
-  bottom: "conv3"
-  top: "pad4"
-}
-layers {
-  layer {
     name: "conv4"
     type: "conv"
     num_output: 384
     group: 2
     kernelsize: 3
+    pad: 1
     weight_filler {
       type: "gaussian"
       std: 0.01
@@ -195,7 +171,7 @@ layers {
     weight_decay: 1.
     weight_decay: 0.
   }
-  bottom: "pad4"
+  bottom: "conv3"
   top: "conv4"
 }
 layers {
@@ -208,20 +184,12 @@ layers {
 }
 layers {
   layer {
-    name: "pad5"
-    type: "padding"
-    pad: 1
-  }
-  bottom: "conv4"
-  top: "pad5"
-}
-layers {
-  layer {
     name: "conv5"
     type: "conv"
     num_output: 256
     group: 2
     kernelsize: 3
+    pad: 1
     weight_filler {
       type: "gaussian"
       std: 0.01
@@ -235,7 +203,7 @@ layers {
     weight_decay: 1.
     weight_decay: 0.
   }
-  bottom: "pad5"
+  bottom: "conv4"
   top: "conv5"
 }
 layers {
diff --git a/examples/imagenet/imagenet_val.prototxt b/examples/imagenet/imagenet_val.prototxt
index e523d29e..a004b74f 100644
--- a/examples/imagenet/imagenet_val.prototxt
+++ b/examples/imagenet/imagenet_val.prototxt
@@ -55,22 +55,14 @@ layers {
 }
 layers {
   layer {
-    name: "pad2"
-    type: "padding"
-    pad: 2
-  }
-  bottom: "norm1"
-  top: "pad2"
-}
-layers {
-  layer {
     name: "conv2"
     type: "conv"
     num_output: 256
     group: 2
     kernelsize: 5
+    pad: 2
   }
-  bottom: "pad2"
+  bottom: "norm1"
   top: "conv2"
 }
 layers {
@@ -105,21 +97,13 @@ layers {
 }
 layers {
   layer {
-    name: "pad3"
-    type: "padding"
-    pad: 1
-  }
-  bottom: "norm2"
-  top: "pad3"
-}
-layers {
-  layer {
     name: "conv3"
     type: "conv"
     num_output: 384
     kernelsize: 3
+    pad: 1
   }
-  bottom: "pad3"
+  bottom: "norm2"
   top: "conv3"
 }
 layers {
@@ -132,22 +116,14 @@ layers {
 }
 layers {
   layer {
-    name: "pad4"
-    type: "padding"
-    pad: 1
-  }
-  bottom: "conv3"
-  top: "pad4"
-}
-layers {
-  layer {
     name: "conv4"
     type: "conv"
     num_output: 384
     group: 2
     kernelsize: 3
+    pad: 1
   }
-  bottom: "pad4"
+  bottom: "conv3"
   top: "conv4"
 }
 layers {
@@ -160,22 +136,14 @@ layers {
 }
 layers {
   layer {
-    name: "pad5"
-    type: "padding"
-    pad: 1
-  }
-  bottom: "conv4"
-  top: "pad5"
-}
-layers {
-  layer {
     name: "conv5"
     type: "conv"
     num_output: 256
     group: 2
     kernelsize: 3
+    pad: 1
   }
-  bottom: "pad5"
+  bottom: "conv4"
   top: "conv5"
 }
 layers {