Add option not to reshape to Blob::FromProto; use when loading Blobs

from saved NetParameter

Want to keep the param Blob shape the layer has set, and not necessarily
adopt the one from the saved net (e.g. want to keep new 1D bias shape,
rather than take the (1 x 1 x 1 x D) shape from a legacy net).

include/caffe/blob.hpp

@@ -206,7 +206,7 @@ class Blob {
   Dtype* mutable_cpu_diff();
   Dtype* mutable_gpu_diff();
   void Update();
-  void FromProto(const BlobProto& proto);
+  void FromProto(const BlobProto& proto, bool reshape = true);
   void ToProto(BlobProto* proto, bool write_diff = false) const;
 
   /// @brief Compute the sum of absolute values (L1 norm) of the data.

src/caffe/blob.cpp

@@ -433,7 +433,7 @@ void Blob<Dtype>::CopyFrom(const Blob& source, bool copy_diff, bool reshape) {
 }
 
 template <typename Dtype>
-void Blob<Dtype>::FromProto(const BlobProto& proto) {
+void Blob<Dtype>::FromProto(const BlobProto& proto, bool reshape) {
   vector<int> shape;
   if (proto.has_num() || proto.has_channels() ||
       proto.has_height() || proto.has_width()) {
@@ -450,7 +450,9 @@ void Blob<Dtype>::FromProto(const BlobProto& proto) {
       shape[i] = proto.shape().dim(i);
     }
   }
-  Reshape(shape);
+  if (reshape) {
+    Reshape(shape);
+  }
   // copy data
   Dtype* data_vec = mutable_cpu_data();
   for (int i = 0; i < count_; ++i) {

src/caffe/net.cpp

@@ -706,7 +706,8 @@ void Net<Dtype>::CopyTrainedLayersFrom(const NetParameter& param) {
         << "Incompatible number of blobs for layer " << source_layer_name;
     for (int j = 0; j < target_blobs.size(); ++j) {
       CHECK(target_blobs[j]->ShapeEquals(source_layer.blobs(j)));
-      target_blobs[j]->FromProto(source_layer.blobs(j));
+      const bool kReshape = false;
+      target_blobs[j]->FromProto(source_layer.blobs(j), kReshape);
     }
   }
 }