Back-merge

  define up-to-date all-in-one model for pascal finetuning
  load transform params in window data layer
  include WindowDataLayer in data param upgrade
  Fix typo in LRN-expression in docs

diff --cc src/caffe/layers/window_data_layer.cpp
index cf1f386,afb4304..33a473d
--- 1/src/caffe/layers/window_data_layer.cpp
--- 2/src/caffe/layers/window_data_layer.cpp
+++ b/src/caffe/layers/window_data_layer.cpp
@@@ -149,23 -149,23 +149,23 @@@ void WindowDataLayer<Dtype>::DataLayerS
        << this->layer_param_.window_data_param().crop_mode();
  
    // image
-   int crop_size = this->layer_param_.window_data_param().crop_size();
+   const int crop_size = this->transform_param_.crop_size();
    CHECK_GT(crop_size, 0);
    const int batch_size = this->layer_param_.window_data_param().batch_size();
 -  (*top)[0]->Reshape(batch_size, channels, crop_size, crop_size);
 +  top[0]->Reshape(batch_size, channels, crop_size, crop_size);
    this->prefetch_data_.Reshape(batch_size, channels, crop_size, crop_size);
  
 -  LOG(INFO) << "output data size: " << (*top)[0]->num() << ","
 -      << (*top)[0]->channels() << "," << (*top)[0]->height() << ","
 -      << (*top)[0]->width();
 +  LOG(INFO) << "output data size: " << top[0]->num() << ","
 +      << top[0]->channels() << "," << top[0]->height() << ","
 +      << top[0]->width();
    // datum size
 -  this->datum_channels_ = (*top)[0]->channels();
 -  this->datum_height_ = (*top)[0]->height();
 -  this->datum_width_ = (*top)[0]->width();
 +  this->datum_channels_ = top[0]->channels();
 +  this->datum_height_ = top[0]->height();
 +  this->datum_width_ = top[0]->width();
    this->datum_size_ =
 -      (*top)[0]->channels() * (*top)[0]->height() * (*top)[0]->width();
 +      top[0]->channels() * top[0]->height() * top[0]->width();
    // label
 -  (*top)[1]->Reshape(batch_size, 1, 1, 1);
 +  top[1]->Reshape(batch_size, 1, 1, 1);
    this->prefetch_label_.Reshape(batch_size, 1, 1, 1);
  }