Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10550 from dkurt:replace_psroi_pooling_tag

Browse Source
pull/10567/head
Alexander Alekhin 7 years ago
parent c08a0edea1 27b55ea761
commit da0904df2d
3 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      modules/dnn/misc/caffe/opencv-caffe.pb.cc
  2. 6
      modules/dnn/misc/caffe/opencv-caffe.pb.h
  3. 2
      modules/dnn/src/caffe/opencv-caffe.proto

22
modules/dnn/misc/caffe/opencv-caffe.pb.cc
Unescape View File

@ -2368,7 +2368,7 @@ void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl() {
"eLUParameter\0229\n\017prior_box_param\030\226\001 \001(\0132\037" "eLUParameter\0229\n\017prior_box_param\030\226\001 \001(\0132\037"
".opencv_caffe.PriorBoxParameter\0228\n\016propo" ".opencv_caffe.PriorBoxParameter\0228\n\016propo"
"sal_param\030\311\001 \001(\0132\037.opencv_caffe.Proposal" "sal_param\030\311\001 \001(\0132\037.opencv_caffe.Proposal"
"Parameter\022A\n\023psroi_pooling_param\030\221N \001(\0132" "Parameter\022A\n\023psroi_pooling_param\030\222N \001(\0132"
"#.opencv_caffe.PSROIPoolingParameter\0224\n\014" "#.opencv_caffe.PSROIPoolingParameter\0224\n\014"
"python_param\030\202\001 \001(\0132\035.opencv_caffe.Pytho" "python_param\030\202\001 \001(\0132\035.opencv_caffe.Pytho"
"nParameter\022:\n\017recurrent_param\030\222\001 \001(\0132 .o" "nParameter\022:\n\017recurrent_param\030\222\001 \001(\0132 .o"
@ -16966,13 +16966,13 @@ bool LayerParameter::MergePartialFromCodedStream(
} else { } else {
goto handle_unusual; goto handle_unusual;
} }
if (input->ExpectTag(80010)) goto parse_psroi_pooling_param; if (input->ExpectTag(80018)) goto parse_psroi_pooling_param;
break; break;
} }
// optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10001; // optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10002;
case 10001: { case 10002: {
if (tag == 80010) { if (tag == 80018) {
parse_psroi_pooling_param: parse_psroi_pooling_param:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_psroi_pooling_param())); input, mutable_psroi_pooling_param()));
@ -17415,10 +17415,10 @@ void LayerParameter::SerializeWithCachedSizes(
201, *this->proposal_param_, output); 201, *this->proposal_param_, output);
} }
// optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10001; // optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10002;
if (has_psroi_pooling_param()) { if (has_psroi_pooling_param()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
10001, *this->psroi_pooling_param_, output); 10002, *this->psroi_pooling_param_, output);
} }
// optional .opencv_caffe.ROIPoolingParameter roi_pooling_param = 8266711; // optional .opencv_caffe.ROIPoolingParameter roi_pooling_param = 8266711;
@ -17890,11 +17890,11 @@ void LayerParameter::SerializeWithCachedSizes(
201, *this->proposal_param_, false, target); 201, *this->proposal_param_, false, target);
} }
// optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10001; // optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10002;
if (has_psroi_pooling_param()) { if (has_psroi_pooling_param()) {
target = ::google::protobuf::internal::WireFormatLite:: target = ::google::protobuf::internal::WireFormatLite::
InternalWriteMessageNoVirtualToArray( InternalWriteMessageNoVirtualToArray(
10001, *this->psroi_pooling_param_, false, target); 10002, *this->psroi_pooling_param_, false, target);
} }
// optional .opencv_caffe.ROIPoolingParameter roi_pooling_param = 8266711; // optional .opencv_caffe.ROIPoolingParameter roi_pooling_param = 8266711;
@ -18215,7 +18215,7 @@ size_t LayerParameter::ByteSizeLong() const {
*this->proposal_param_); *this->proposal_param_);
} }
// optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10001; // optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10002;
if (has_psroi_pooling_param()) { if (has_psroi_pooling_param()) {
total_size += 3 + total_size += 3 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@ -20896,7 +20896,7 @@ void LayerParameter::set_allocated_proposal_param(::opencv_caffe::ProposalParame
// @@protoc_insertion_point(field_set_allocated:opencv_caffe.LayerParameter.proposal_param) // @@protoc_insertion_point(field_set_allocated:opencv_caffe.LayerParameter.proposal_param)
} }
// optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10001; // optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10002;
bool LayerParameter::has_psroi_pooling_param() const { bool LayerParameter::has_psroi_pooling_param() const {
return (_has_bits_[1] & 0x00020000u) != 0; return (_has_bits_[1] & 0x00020000u) != 0;
} }

6
modules/dnn/misc/caffe/opencv-caffe.pb.h
Unescape View File

@ -4159,10 +4159,10 @@ class LayerParameter : public ::google::protobuf::Message /* @@protoc_insertion_
::opencv_caffe::ProposalParameter* release_proposal_param(); ::opencv_caffe::ProposalParameter* release_proposal_param();
void set_allocated_proposal_param(::opencv_caffe::ProposalParameter* proposal_param); void set_allocated_proposal_param(::opencv_caffe::ProposalParameter* proposal_param);
// optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10001; // optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10002;
bool has_psroi_pooling_param() const; bool has_psroi_pooling_param() const;
void clear_psroi_pooling_param(); void clear_psroi_pooling_param();
static const int kPsroiPoolingParamFieldNumber = 10001; static const int kPsroiPoolingParamFieldNumber = 10002;
const ::opencv_caffe::PSROIPoolingParameter& psroi_pooling_param() const; const ::opencv_caffe::PSROIPoolingParameter& psroi_pooling_param() const;
::opencv_caffe::PSROIPoolingParameter* mutable_psroi_pooling_param(); ::opencv_caffe::PSROIPoolingParameter* mutable_psroi_pooling_param();
::opencv_caffe::PSROIPoolingParameter* release_psroi_pooling_param(); ::opencv_caffe::PSROIPoolingParameter* release_psroi_pooling_param();
@ -19331,7 +19331,7 @@ inline void LayerParameter::set_allocated_proposal_param(::opencv_caffe::Proposa
// @@protoc_insertion_point(field_set_allocated:opencv_caffe.LayerParameter.proposal_param) // @@protoc_insertion_point(field_set_allocated:opencv_caffe.LayerParameter.proposal_param)
} }
// optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10001; // optional .opencv_caffe.PSROIPoolingParameter psroi_pooling_param = 10002;
inline bool LayerParameter::has_psroi_pooling_param() const { inline bool LayerParameter::has_psroi_pooling_param() const {
return (_has_bits_[1] & 0x00020000u) != 0; return (_has_bits_[1] & 0x00020000u) != 0;
} }

2
modules/dnn/src/caffe/opencv-caffe.proto
Unescape View File

@ -550,7 +550,7 @@ message LayerParameter {
optional PReLUParameter prelu_param = 131; optional PReLUParameter prelu_param = 131;
optional PriorBoxParameter prior_box_param = 150; optional PriorBoxParameter prior_box_param = 150;
optional ProposalParameter proposal_param = 201; optional ProposalParameter proposal_param = 201;
optional PSROIPoolingParameter psroi_pooling_param = 10001; // https://github.com/daijifeng001/caffe-rfcn optional PSROIPoolingParameter psroi_pooling_param = 10002; // https://github.com/daijifeng001/caffe-rfcn
optional PythonParameter python_param = 130; optional PythonParameter python_param = 130;
optional RecurrentParameter recurrent_param = 146; optional RecurrentParameter recurrent_param = 146;
optional ReductionParameter reduction_param = 136; optional ReductionParameter reduction_param = 136;

Write Preview
Loading…
Cancel
Save