Merge pull request #733 from lukeyeager/update-standard-networks

Update standard networks for Caffe
NVIDIA · May 16, 2016 · 9d9ff58 · 9d9ff58
2 parents 251bd44 + 2be3381
commit 9d9ff58
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 31 deletions.
diff --git a/digits/standard-networks/caffe/alexnet.prototxt b/digits/standard-networks/caffe/alexnet.prototxt
@@ -1,35 +1,31 @@
 # AlexNet
 name: "AlexNet"
 layer {
-  name: "data"
+  name: "train-data"
   type: "Data"
   top: "data"
   top: "label"
-  include {
-    phase: TRAIN
-  }
   transform_param {
     mirror: true
     crop_size: 227
   }
   data_param {
-    batch_size: 100
+    batch_size: 128
   }
+  include { stage: "train" }
 }
 layer {
-  name: "data"
+  name: "val-data"
   type: "Data"
   top: "data"
   top: "label"
-  include {
-    phase: TEST
-  }
   transform_param {
     crop_size: 227
   }
   data_param {
-    batch_size: 100
+    batch_size: 32
   }
+  include { stage: "val" }
 }
 layer {
   name: "conv1"

diff --git a/digits/standard-networks/caffe/googlenet.prototxt b/digits/standard-networks/caffe/googlenet.prototxt
@@ -1,36 +1,32 @@
 # GoogLeNet
 name: "GoogleNet"
 layer {
-  name: "data"
+  name: "train-data"
   type: "Data"
   top: "data"
   top: "label"
-  include {
-    phase: TRAIN
-  }
   transform_param {
     mirror: true
     crop_size: 224
   }
   data_param {
-    batch_size: 24
+    batch_size: 32
   }
+  include { stage: "train" }
 }
 layer {
-  name: "data"
+  name: "val-data"
   type: "Data"
   top: "data"
   top: "label"
-  include {
-    phase: TEST
-  }
   transform_param {
     mirror: false
     crop_size: 224
   }
   data_param {
-    batch_size: 24
+    batch_size: 16
   }
+  include { stage: "val" }
 }
 layer {
   name: "conv1/7x7_s2"

diff --git a/digits/standard-networks/caffe/lenet.prototxt b/digits/standard-networks/caffe/lenet.prototxt
@@ -1,43 +1,49 @@
 # LeNet
 name: "LeNet"
 layer {
-  name: "mnist"
+  name: "train-data"
   type: "Data"
-  top: "data"
+  top: "scaled"
   top: "label"
-  include {
-    phase: TRAIN
+  transform_param {
+    # 1/(standard deviation)
+    scale: 0.0125
   }
   data_param {
     batch_size: 64
   }
+  include { stage: "train" }
 }
 layer {
-  name: "mnist"
+  name: "val-data"
   type: "Data"
-  top: "data"
+  top: "scaled"
   top: "label"
-  include {
-    phase: TEST
+  transform_param {
+    # 1/(standard deviation)
+    scale: 0.0125
   }
   data_param {
-    batch_size: 100
+    batch_size: 32
   }
+  include { stage: "val" }
 }
 layer {
+  # Use Power layer in deploy phase for input scaling
   name: "scale"
   bottom: "data"
-  top: "scale"
+  top: "scaled"
   type: "Power"
   power_param {
     # 1/(standard deviation)
     scale: 0.0125
   }
+  include { stage: "deploy" }
 }
 layer {
   name: "conv1"
   type: "Convolution"
-  bottom: "scale"
+  bottom: "scaled"
   top: "conv1"
   param {
     lr_mult: 1