Skip to content

Commit d58e959

Browse files
committed
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).
1 parent 5e239c4 commit d58e959

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

include/caffe/fast_rcnn_layers.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "caffe/blob.hpp"
1414
#include "caffe/common.hpp"
1515
#include "caffe/layer.hpp"
16-
#include "caffe/loss_layers.hpp"
16+
#include "caffe/layers/loss_layer.hpp"
1717
#include "caffe/proto/caffe.pb.h"
1818

1919
namespace caffe {

include/caffe/layers/dropout_layer.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class DropoutLayer : public NeuronLayer<Dtype> {
7373
/// the scale for undropped inputs at train time @f$ 1 / (1 - p) @f$
7474
Dtype scale_;
7575
unsigned int uint_thres_;
76+
Dtype scale_train_;
7677
};
7778

7879
} // namespace caffe

include/caffe/layers/python_layer.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class PythonLayer : public Layer<Dtype> {
2626
}
2727
self_.attr("param_str") = bp::str(
2828
this->layer_param_.python_param().param_str());
29-
self_.attr("phase") = static_cast<int>(this->phase_);
3029
self_.attr("setup")(bottom, top);
3130
}
3231
virtual void Reshape(const vector<Blob<Dtype>*>& bottom,

0 commit comments

Comments
 (0)