Fix compilation errors with rebased patchset

This patch fixes compilation errors from rebasing the faster-rcnn patchset from rbgirshick/caffe-fast-rcnn:faster-rcnn on BVLC/caffe:master (#c430690).
acmiyaguchi · Nov 13, 2017 · d58e959 · d58e959 · chang0977 · Aug 16, 2018
1 parent 5e239c4
commit d58e959
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/include/caffe/fast_rcnn_layers.hpp b/include/caffe/fast_rcnn_layers.hpp
@@ -13,7 +13,7 @@
 #include "caffe/blob.hpp"
 #include "caffe/common.hpp"
 #include "caffe/layer.hpp"
-#include "caffe/loss_layers.hpp"
+#include "caffe/layers/loss_layer.hpp"
 #include "caffe/proto/caffe.pb.h"
 
 namespace caffe {

diff --git a/include/caffe/layers/dropout_layer.hpp b/include/caffe/layers/dropout_layer.hpp
@@ -73,6 +73,7 @@ class DropoutLayer : public NeuronLayer<Dtype> {
   /// the scale for undropped inputs at train time @f$ 1 / (1 - p) @f$
   Dtype scale_;
   unsigned int uint_thres_;
+  Dtype scale_train_;
 };
 
 }  // namespace caffe

diff --git a/include/caffe/layers/python_layer.hpp b/include/caffe/layers/python_layer.hpp
@@ -26,7 +26,6 @@ class PythonLayer : public Layer<Dtype> {
     }
     self_.attr("param_str") = bp::str(
         this->layer_param_.python_param().param_str());
-    self_.attr("phase") = static_cast<int>(this->phase_);
     self_.attr("setup")(bottom, top);
   }
   virtual void Reshape(const vector<Blob<Dtype>*>& bottom,