upgrade model definitions for transformation params

diff --git a/examples/cifar10/cifar10_full_train_test.prototxt b/examples/cifar10/cifar10_full_train_test.prototxt
index 4fd52fe..c01fef4 100644 (file)
--- a/examples/cifar10/cifar10_full_train_test.prototxt
+++ b/examples/cifar10/cifar10_full_train_test.prototxt
@@ -6,8 +6,10 @@ layers {
   top: "label"
   data_param {
     source: "cifar10-leveldb/cifar-train-leveldb"
-    mean_file: "mean.binaryproto"
     batch_size: 100
+    transform_param {
+      mean_file: "mean.binaryproto"
+    }
   }
   include: { phase: TRAIN }
 }
@@ -18,8 +20,10 @@ layers {
   top: "label"
   data_param {
     source: "cifar10-leveldb/cifar-test-leveldb"
-    mean_file: "mean.binaryproto"
     batch_size: 100
+    transform_param {
+      mean_file: "mean.binaryproto"
+    }
   }
   include: { phase: TEST }
 }

diff --git a/examples/cifar10/cifar10_quick_train_test.prototxt b/examples/cifar10/cifar10_quick_train_test.prototxt
index b34d1cd..779dacf 100644 (file)
--- a/examples/cifar10/cifar10_quick_train_test.prototxt
+++ b/examples/cifar10/cifar10_quick_train_test.prototxt
@@ -6,8 +6,10 @@ layers {
   top: "label"
   data_param {
     source: "cifar10-leveldb/cifar-train-leveldb"
-    mean_file: "mean.binaryproto"
     batch_size: 100
+    transform_param {
+      mean_file: "mean.binaryproto"
+    }
   }
   include: { phase: TRAIN }
 }
@@ -18,8 +20,10 @@ layers {
   top: "label"
   data_param {
     source: "cifar10-leveldb/cifar-test-leveldb"
-    mean_file: "mean.binaryproto"
     batch_size: 100
+    transform_param {
+      mean_file: "mean.binaryproto"
+    }
   }
   include: { phase: TEST }
 }

diff --git a/examples/feature_extraction/imagenet_val.prototxt b/examples/feature_extraction/imagenet_val.prototxt
index b0451a1..8d5b076 100644 (file)
--- a/examples/feature_extraction/imagenet_val.prototxt
+++ b/examples/feature_extraction/imagenet_val.prototxt
@@ -6,12 +6,14 @@ layers {
   top: "label"
   image_data_param {
     source: "$CAFFE_DIR/examples/_temp/file_list.txt"
-    mean_file: "$CAFFE_DIR/data/ilsvrc12/imagenet_mean.binaryproto"
     batch_size: 50
-    crop_size: 227
-    mirror: false
     new_height: 256
     new_width: 256
+    transform_param {
+      crop_size: 227
+      mean_file: "$CAFFE_DIR/data/ilsvrc12/imagenet_mean.binaryproto"
+      mirror: false
+    }
   }
 }
 layers {

diff --git a/examples/imagenet/alexnet_train_val.prototxt b/examples/imagenet/alexnet_train_val.prototxt
index 8d7977d..8ffdb7a 100644 (file)
--- a/examples/imagenet/alexnet_train_val.prototxt
+++ b/examples/imagenet/alexnet_train_val.prototxt
@@ -6,10 +6,12 @@ layers {
   top: "label"
   data_param {
     source: "ilsvrc12_train_leveldb"
-    mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
     batch_size: 256
-    crop_size: 227
-    mirror: true
+    transform_param {
+      crop_size: 227
+      mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
+      mirror: true
+    }
   }
   include: { phase: TRAIN }
 }
@@ -20,10 +22,12 @@ layers {
   top: "label"
   data_param {
     source: "ilsvrc12_val_leveldb"
-    mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
     batch_size: 50
-    crop_size: 227
-    mirror: false
+    transform_param {
+      crop_size: 227
+      mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
+      mirror: false
+    }
   }
   include: { phase: TEST }
 }

diff --git a/examples/imagenet/imagenet_train_val.prototxt b/examples/imagenet/imagenet_train_val.prototxt
index ea1f907..5f9c839 100644 (file)
--- a/examples/imagenet/imagenet_train_val.prototxt
+++ b/examples/imagenet/imagenet_train_val.prototxt
@@ -6,10 +6,12 @@ layers {
   top: "label"
   data_param {
     source: "ilsvrc12_train_leveldb"
-    mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
     batch_size: 256
-    crop_size: 227
-    mirror: true
+    transform_param {
+      crop_size: 227
+      mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
+      mirror: true
+    }
   }
   include: { phase: TRAIN }
 }
@@ -20,10 +22,12 @@ layers {
   top: "label"
   data_param {
     source: "ilsvrc12_val_leveldb"
-    mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
     batch_size: 50
-    crop_size: 227
-    mirror: false
+    transform_param {
+      crop_size: 227
+      mean_file: "../../data/ilsvrc12/imagenet_mean.binaryproto"
+      mirror: false
+    }
   }
   include: { phase: TEST }
 }

diff --git a/examples/mnist/lenet_consolidated_solver.prototxt b/examples/mnist/lenet_consolidated_solver.prototxt
index 42f54e4..2e69589 100644 (file)
--- a/examples/mnist/lenet_consolidated_solver.prototxt
+++ b/examples/mnist/lenet_consolidated_solver.prototxt
@@ -51,8 +51,10 @@ net_param {
     top: "label"
     data_param {
       source: "mnist-train-leveldb"
-      scale: 0.00390625
       batch_size: 64
+      transform_param {
+        scale: 0.00390625
+      }
     }
     include: { phase: TRAIN }
   }
@@ -63,8 +65,10 @@ net_param {
     top: "label"
     data_param {
       source: "mnist-test-leveldb"
-      scale: 0.00390625
       batch_size: 100
+      transform_param {
+        scale: 0.00390625
+      }
     }
     include: {
       phase: TEST
@@ -78,8 +82,10 @@ net_param {
     top: "label"
     data_param {
       source: "mnist-train-leveldb"
-      scale: 0.00390625
       batch_size: 100
+      transform_param {
+        scale: 0.00390625
+      }
     }
     include: {
       phase: TEST

diff --git a/examples/mnist/lenet_train_test.prototxt b/examples/mnist/lenet_train_test.prototxt
index 3c77452..578641d 100644 (file)
--- a/examples/mnist/lenet_train_test.prototxt
+++ b/examples/mnist/lenet_train_test.prototxt
@@ -6,8 +6,10 @@ layers {
   top: "label"
   data_param {
     source: "mnist-train-leveldb"
-    scale: 0.00390625
     batch_size: 64
+    transform_param {
+      scale: 0.00390625
+    }
   }
   include: { phase: TRAIN }
 }
@@ -18,8 +20,10 @@ layers {
   top: "label"
   data_param {
     source: "mnist-test-leveldb"
-    scale: 0.00390625
     batch_size: 100
+    transform_param {
+      scale: 0.00390625
+    }
   }
   include: { phase: TEST }
 }

diff --git a/examples/mnist/mnist_autoencoder.prototxt b/examples/mnist/mnist_autoencoder.prototxt
index ad1e766..3af6b7a 100644 (file)
--- a/examples/mnist/mnist_autoencoder.prototxt
+++ b/examples/mnist/mnist_autoencoder.prototxt
@@ -5,8 +5,10 @@ layers {
   type: DATA
   data_param {
     source: "mnist-train-leveldb"
-    scale: 0.0039215684
     batch_size: 100
+    transform_param {
+      scale: 0.0039215684
+    }
   }
   include: { phase: TRAIN }
 }
@@ -16,8 +18,10 @@ layers {
   type: DATA
   data_param {
     source: "mnist-test-leveldb"
-    scale: 0.0039215684
     batch_size: 100
+    transform_param {
+      scale: 0.0039215684
+    }
   }
   include: { phase: TEST }
 }