fix broken conv/deconv reshaping caused by reading bottom shape in

LayerSetUp

This also eliminates the extra copying of bottom's shape.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/caffe/layers/conv_layer.cpp b/src/caffe/layers/conv_layer.cpp
index 5cf26970..fb50bb09 100644
--- a/src/caffe/layers/conv_layer.cpp
+++ b/src/caffe/layers/conv_layer.cpp
@@ -10,14 +10,13 @@ namespace caffe {
 
 template <typename Dtype>
 void ConvolutionLayer<Dtype>::compute_output_shape() {
-  // input_shape_ + 1 to skip channel axis
-  const int* input_shape_data = this->input_shape_.cpu_data() + 1;
   const int* kernel_shape_data = this->kernel_shape_.cpu_data();
   const int* stride_data = this->stride_.cpu_data();
   const int* pad_data = this->pad_.cpu_data();
   this->output_shape_.clear();
   for (int i = 0; i < this->num_spatial_axes_; ++i) {
-    const int input_dim = input_shape_data[i];
+    // i + 1 to skip channel axis
+    const int input_dim = this->input_shape(i + 1);
     const int output_dim = (input_dim + 2 * pad_data[i] - kernel_shape_data[i])
         / stride_data[i] + 1;
     this->output_shape_.push_back(output_dim);