merge LRNMapLayer into LRNLayer with norm_region proto field
authorJeff Donahue <jeff.donahue@gmail.com>
Sat, 29 Mar 2014 10:36:28 +0000 (03:36 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Tue, 8 Apr 2014 18:36:18 +0000 (11:36 -0700)
commit824c34483ec4360cd660ec9ca60561cd52da8b86
tree3a9348a24cdb6651b502ad69f3a332d25a3140ef
parent4c81ee54af139e2072affbb865bb6deef92e14c5
merge LRNMapLayer into LRNLayer with norm_region proto field
16 files changed:
examples/cifar10/cifar10_full_lrn_in_channel_solver.prototxt [moved from examples/cifar10/cifar10_full_lrn_map_solver.prototxt with 84% similarity]
examples/cifar10/cifar10_full_lrn_in_channel_solver_lr1.prototxt [moved from examples/cifar10/cifar10_full_lrn_map_solver_lr1.prototxt with 84% similarity]
examples/cifar10/cifar10_full_lrn_in_channel_solver_lr2.prototxt [moved from examples/cifar10/cifar10_full_lrn_map_solver_lr2.prototxt with 84% similarity]
examples/cifar10/cifar10_full_lrn_in_channel_test.prototxt [moved from examples/cifar10/cifar10_full_lrn_map_test.prototxt with 95% similarity]
examples/cifar10/cifar10_full_lrn_in_channel_train.prototxt [moved from examples/cifar10/cifar10_full_lrn_map_train.prototxt with 95% similarity]
examples/cifar10/train_full_lrn_in_channel.sh [new file with mode: 0755]
examples/cifar10/train_full_lrn_map.sh [deleted file]
include/caffe/vision_layers.hpp
src/caffe/layer_factory.cpp
src/caffe/layers/lrn_layer.cpp
src/caffe/layers/lrn_layer.cu
src/caffe/layers/lrn_map_layer.cpp [deleted file]
src/caffe/layers/lrn_map_layer.cu [deleted file]
src/caffe/proto/caffe.proto
src/caffe/test/test_lrn_layer.cpp
src/caffe/test/test_lrn_map_layer.cpp [deleted file]