Move data_mean into data_transformer remove datum_* from BaseData
authorSergio Guadarrama <sguada@gmail.com>
Sat, 20 Sep 2014 00:10:59 +0000 (17:10 -0700)
committerSergio <sguada@gmail.com>
Fri, 3 Oct 2014 18:45:58 +0000 (11:45 -0700)
commit7182bfb831c3c4dc37817af7695e6247cb9eae5c
treed9ceb9de6d7ad22aeab345d70d69db35b4435b81
parentb84009e168e6a2354540dff8fabbdc39f574d66f
Move data_mean into data_transformer remove datum_* from BaseData

Conflicts:

src/caffe/layers/memory_data_layer.cpp
include/caffe/data_layers.hpp
include/caffe/data_transformer.hpp
src/caffe/data_transformer.cpp
src/caffe/layers/base_data_layer.cpp
src/caffe/layers/data_layer.cpp
src/caffe/layers/image_data_layer.cpp
src/caffe/layers/memory_data_layer.cpp
src/caffe/layers/window_data_layer.cpp