merge LRNMapLayer into LRNLayer with norm_region proto field

7 files changed, 37 insertions, 33 deletions

diff --git a/examples/cifar10/cifar10_full_lrn_map_solver.prototxt b/examples/cifar10/cifar10_full_lrn_in_channel_solver.prototxt
index 492912a0..a217ec1a 100644
--- a/examples/cifar10/cifar10_full_lrn_map_solver.prototxt
+++ b/examples/cifar10/cifar10_full_lrn_in_channel_solver.prototxt
@@ -2,9 +2,9 @@
 # then another factor of 10 after 10 more epochs (5000 iters)
 
 # The training protocol buffer definition
-train_net: "cifar10_full_lrn_map_train.prototxt"
+train_net: "cifar10_full_lrn_in_channel_train.prototxt"
 # The testing protocol buffer definition
-test_net: "cifar10_full_lrn_map_test.prototxt"
+test_net: "cifar10_full_lrn_in_channel_test.prototxt"
 # test_iter specifies how many forward passes the test should carry out.
 # In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
 # covering the full 10,000 testing images.
@@ -23,6 +23,6 @@ display: 200
 max_iter: 60000
 # snapshot intermediate results
 snapshot: 10000
-snapshot_prefix: "cifar10_full_lrn_map"
+snapshot_prefix: "cifar10_full_lrn_in_channel"
 # solver mode: 0 for CPU and 1 for GPU
 solver_mode: 1
diff --git a/examples/cifar10/cifar10_full_lrn_map_solver_lr1.prototxt b/examples/cifar10/cifar10_full_lrn_in_channel_solver_lr1.prototxt
index c51a4e6b..6fcae73e 100644
--- a/examples/cifar10/cifar10_full_lrn_map_solver_lr1.prototxt
+++ b/examples/cifar10/cifar10_full_lrn_in_channel_solver_lr1.prototxt
@@ -2,9 +2,9 @@
 # then another factor of 10 after 10 more epochs (5000 iters)
 
 # The training protocol buffer definition
-train_net: "cifar10_full_lrn_map_train.prototxt"
+train_net: "cifar10_full_lrn_in_channel_train.prototxt"
 # The testing protocol buffer definition
-test_net: "cifar10_full_lrn_map_test.prototxt"
+test_net: "cifar10_full_lrn_in_channel_test.prototxt"
 # test_iter specifies how many forward passes the test should carry out.
 # In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
 # covering the full 10,000 testing images.
@@ -23,6 +23,6 @@ display: 200
 max_iter: 65000
 # snapshot intermediate results
 snapshot: 5000
-snapshot_prefix: "cifar10_full_lrn_map"
+snapshot_prefix: "cifar10_full_lrn_in_channel"
 # solver mode: 0 for CPU and 1 for GPU
 solver_mode: 1
diff --git a/examples/cifar10/cifar10_full_lrn_map_solver_lr2.prototxt b/examples/cifar10/cifar10_full_lrn_in_channel_solver_lr2.prototxt
index d15b1155..8f53fe11 100644
--- a/examples/cifar10/cifar10_full_lrn_map_solver_lr2.prototxt
+++ b/examples/cifar10/cifar10_full_lrn_in_channel_solver_lr2.prototxt
@@ -2,9 +2,9 @@
 # then another factor of 10 after 10 more epochs (5000 iters)
 
 # The training protocol buffer definition
-train_net: "cifar10_full_lrn_map_train.prototxt"
+train_net: "cifar10_full_lrn_in_channel_train.prototxt"
 # The testing protocol buffer definition
-test_net: "cifar10_full_lrn_map_test.prototxt"
+test_net: "cifar10_full_lrn_in_channel_test.prototxt"
 # test_iter specifies how many forward passes the test should carry out.
 # In the case of CIFAR10, we have test batch size 100 and 100 test iterations,
 # covering the full 10,000 testing images.
@@ -23,6 +23,6 @@ display: 200
 max_iter: 70000
 # snapshot intermediate results
 snapshot: 5000
-snapshot_prefix: "cifar10_full_lrn_map"
+snapshot_prefix: "cifar10_full_lrn_in_channel"
 # solver mode: 0 for CPU and 1 for GPU
 solver_mode: 1
diff --git a/examples/cifar10/cifar10_full_lrn_map_test.prototxt b/examples/cifar10/cifar10_full_lrn_in_channel_test.prototxt
index 62a6e102..0e1957a9 100644
--- a/examples/cifar10/cifar10_full_lrn_map_test.prototxt
+++ b/examples/cifar10/cifar10_full_lrn_in_channel_test.prototxt
@@ -50,10 +50,11 @@ layers {
 }
 layers {
   name: "norm1"
-  type: LRN_MAP
+  type: LRN
   bottom: "pool1"
   top: "norm1"
-  lrn_map_param {
+  lrn_param {
+    norm_region: WITHIN_CHANNEL
     local_size: 3
     alpha: 5e-05
     beta: 0.75
@@ -99,10 +100,11 @@ layers {
 }
 layers {
   name: "norm2"
-  type: LRN_MAP
+  type: LRN
   bottom: "pool2"
   top: "norm2"
-  lrn_map_param {
+  lrn_param {
+    norm_region: WITHIN_CHANNEL
     local_size: 3
     alpha: 5e-05
     beta: 0.75
diff --git a/examples/cifar10/cifar10_full_lrn_map_train.prototxt b/examples/cifar10/cifar10_full_lrn_in_channel_train.prototxt
index d9244dc5..25c76060 100644
--- a/examples/cifar10/cifar10_full_lrn_map_train.prototxt
+++ b/examples/cifar10/cifar10_full_lrn_in_channel_train.prototxt
@@ -50,10 +50,11 @@ layers {
 }
 layers {
   name: "norm1"
-  type: LRN_MAP
+  type: LRN
   bottom: "pool1"
   top: "norm1"
-  lrn_map_param {
+  lrn_param {
+    norm_region: WITHIN_CHANNEL
     local_size: 3
     alpha: 5e-05
     beta: 0.75
@@ -99,10 +100,11 @@ layers {
 }
 layers {
   name: "norm2"
-  type: LRN_MAP
+  type: LRN
   bottom: "pool2"
   top: "norm2"
-  lrn_map_param {
+  lrn_param {
+    norm_region: WITHIN_CHANNEL
     local_size: 3
     alpha: 5e-05
     beta: 0.75
diff --git a/examples/cifar10/train_full_lrn_in_channel.sh b/examples/cifar10/train_full_lrn_in_channel.sh
new file mode 100755
index 00000000..fcc9f4d0
--- /dev/null
+++ b/examples/cifar10/train_full_lrn_in_channel.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+TOOLS=../../build/tools
+
+GLOG_logtostderr=1 $TOOLS/train_net.bin \
+    cifar10_full_lrn_in_channel_solver.prototxt
+
+#reduce learning rate by factor of 10
+GLOG_logtostderr=1 $TOOLS/train_net.bin \
+    cifar10_full_lrn_in_channel_solver_lr1.prototxt \
+    cifar10_full_lrn_in_channel_iter_60000.solverstate
+
+#reduce learning rate by factor of 10
+GLOG_logtostderr=1 $TOOLS/train_net.bin \
+    cifar10_full_lrn_in_channel_solver_lr2.prototxt \
+    cifar10_full_lrn_in_channel_iter_65000.solverstate
diff --git a/examples/cifar10/train_full_lrn_map.sh b/examples/cifar10/train_full_lrn_map.sh
deleted file mode 100755
index ffd34702..00000000
--- a/examples/cifar10/train_full_lrn_map.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-
-TOOLS=../../build/tools
-
-GLOG_logtostderr=1 $TOOLS/train_net.bin \
-    cifar10_full_lrn_map_solver.prototxt
-
-#reduce learning rate by factor of 10
-GLOG_logtostderr=1 $TOOLS/train_net.bin \
-    cifar10_full_lrn_map_solver_lr1.prototxt \
-    cifar10_full_lrn_map_iter_60000.solverstate
-
-#reduce learning rate by factor of 10
-GLOG_logtostderr=1 $TOOLS/train_net.bin \
-    cifar10_full_lrn_map_solver_lr2.prototxt \
-    cifar10_full_lrn_map_iter_65000.solverstate