flownet2 patch: fix the layer type mismatching/missing.

Author: vera121

include/caffe/layers/channel_norm_layer.hpp

@@ -19,7 +19,7 @@ class ChannelNormLayer : public Layer<Dtype> {
   virtual void Reshape(const vector<Blob<Dtype>*>& bottom,
       const vector<Blob<Dtype>*>& top);
 
-  virtual inline const char* type() const { return "NormLayer"; }
+  virtual inline const char* type() const { return "ChannelNorm"; }
   virtual inline int MinBottomBlobs() const { return 1; }
   virtual inline int ExactNumTopBlobs() const { return 1; }
 

include/caffe/layers/data_augmentation_layer.hpp

@@ -25,6 +25,7 @@ class DataAugmentationLayer : public AugmentationLayerBase<Dtype>, public Layer<
                             const vector<Blob<Dtype>*>& top);
     virtual void Reshape(const vector<Blob<Dtype>*>& bottom,
                          const vector<Blob<Dtype>*>& top);
+    virtual inline const char* type() const { return "DataAugmentation"; }
     virtual void adjust_blobs(vector<Blob<Dtype>*> blobs);
     virtual inline bool AllowBackward() const { LOG(WARNING) << "DataAugmentationLayer does not do backward."; return false; }
 

include/caffe/layers/float_reader_layer.hpp

@@ -20,6 +20,7 @@ class FloatReaderLayer : public Layer<Dtype> {
       const vector<Blob<Dtype>*>& top);
   virtual void Reshape(const vector<Blob<Dtype>*>& bottom,
       const vector<Blob<Dtype>*>& top);
+  virtual inline const char* type() const { return "FloatReader"; }
 
  protected:
   int dataXSize_;

include/caffe/layers/flow_augmentation_layer.hpp

@@ -25,6 +25,7 @@ class FlowAugmentationLayer : public AugmentationLayerBase<Dtype>, public Layer<
       const vector<Blob<Dtype>*>& top);
   virtual void Reshape(const vector<Blob<Dtype>*>& bottom,
       const vector<Blob<Dtype>*>& top);
+  virtual inline const char* type() const { return "FlowAugmentation"; }
   virtual inline bool AllowBackward() const { LOG(WARNING) << "FlowAugmentationLayer does not do backward."; return false; }
 
 

include/caffe/layers/flow_warp_layer.hpp

@@ -19,6 +19,7 @@ class FlowWarpLayer : public Layer<Dtype> {
       const vector<Blob<Dtype>*>& top);
   virtual void Reshape(const vector<Blob<Dtype>*>& bottom,
       const vector<Blob<Dtype>*>& top);
+  virtual inline const char* type() const { return "FlowWarp"; }
 
 protected:
  virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,

include/caffe/layers/generate_augmentation_parameters_layer.hpp

@@ -24,6 +24,7 @@ class GenerateAugmentationParametersLayer : public AugmentationLayerBase<Dtype>,
       const vector<Blob<Dtype>*>& top);
   virtual void Reshape(const vector<Blob<Dtype>*>& bottom,
       const vector<Blob<Dtype>*>& top);
+  virtual inline const char* type() const { return "GenerateAugmentationParameters"; }
   virtual inline bool AllowBackward() const { LOG(WARNING) << "GenerateAugmentationParametersLayer does not do backward."; return false; }
 
  protected:

include/caffe/layers/lpq_loss_layer.hpp

@@ -37,7 +37,7 @@ class LpqLossLayer : public LossLayer<Dtype> {
         const vector<Blob<Dtype>*>& bottom,
         const vector<Blob<Dtype>*>& top);
 
-  virtual inline const char* type() const { return "L1Loss"; }
+  virtual inline const char* type() const { return "LpqLoss"; }
 
   virtual inline bool AllowForceBackward(
         const int bottom_index) const 

include/caffe/layers/mean_layer.hpp

@@ -19,6 +19,7 @@ class MeanLayer : public Layer<Dtype> {
         const vector<Blob<Dtype>*>& top);
   virtual void Reshape(const vector<Blob<Dtype>*>& bottom,
         const vector<Blob<Dtype>*>& top);
+  virtual inline const char* type() const { return "Mean"; }
 
  protected:
   Blob<Dtype> mean_;

include/caffe/layers/resample_layer.hpp

@@ -22,6 +22,7 @@ class ResampleLayer : public Layer<Dtype> {
   virtual inline int MinBottomBlobs() const { return 1; }
   virtual inline int MaxBottomBlobs() const { return 2; }
   virtual inline int ExactNumTopBlobs() const { return 1; }
+  virtual inline const char* type() const { return "Resample"; }
   virtual inline bool AllowBackward() const { LOG(WARNING) << "ResampleLayer does not do backward."; return false; }
 
  protected:

src/caffe/net.cpp

@@ -81,6 +81,8 @@ void Net<Dtype>::Init(const NetParameter& in_param) {
     }
     layers_.push_back(LayerRegistry<Dtype>::CreateLayer(layer_param));
     layer_names_.push_back(layer_param.name());
+    Layer<Dtype>* layer = layers_[layer_id].get();
+    layer->SetNet(this);
     LOG_IF(INFO, Caffe::root_solver())
         << "Creating Layer " << layer_param.name();
     bool need_backward = false;
@@ -106,7 +108,7 @@ void Net<Dtype>::Init(const NetParameter& in_param) {
     // If the layer specifies that AutoTopBlobs() -> true and the LayerParameter
     // specified fewer than the required number (as specified by
     // ExactNumTopBlobs() or MinTopBlobs()), allocate them here.
-    Layer<Dtype>* layer = layers_[layer_id].get();
+    //Layer<Dtype>* layer = layers_[layer_id].get();
     if (layer->AutoTopBlobs()) {
       const int needed_num_top =
           std::max(layer->MinTopBlobs(), layer->ExactNumTopBlobs());