Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10092 from alalek:dnn_rename_caffe_proto

Browse Source
pull/10018/head
Vadim Pisarevsky 7 years ago
parent a9b5233f67 f19f2bbcde
commit f8ad289311
8 changed files with 876 additions and 878 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. 4
      cmake/OpenCVFindLibProtobuf.cmake
  2. 9
      modules/dnn/CMakeLists.txt
  3. 1176
      modules/dnn/misc/caffe/opencv-caffe.pb.cc
  4. 560
      modules/dnn/misc/caffe/opencv-caffe.pb.h
  5. 2
      modules/dnn/src/caffe/caffe_importer.cpp
  6. 1
      modules/dnn/src/caffe/caffe_io.cpp
  7. 2
      modules/dnn/src/caffe/caffe_io.hpp
  8. 0
      modules/dnn/src/caffe/opencv-caffe.proto

4
cmake/OpenCVFindLibProtobuf.cmake
Unescape View File

@ -7,7 +7,7 @@ OCV_OPTION(BUILD_PROTOBUF "Force to build libprotobuf from sources" ON)
OCV_OPTION(PROTOBUF_UPDATE_FILES "Force to rebuild .proto files" OFF) OCV_OPTION(PROTOBUF_UPDATE_FILES "Force to rebuild .proto files" OFF)
if(PROTOBUF_UPDATE_FILES) if(PROTOBUF_UPDATE_FILES)
if(NOT DEFINED Protobuf_PROTOC_EXECUTABLE) if(NOT COMMAND PROTOBUF_GENERATE_CPP)
find_package(Protobuf QUIET) find_package(Protobuf QUIET)
endif() endif()
if(DEFINED Protobuf_PROTOC_EXECUTABLE AND EXISTS ${Protobuf_PROTOC_EXECUTABLE}) if(DEFINED Protobuf_PROTOC_EXECUTABLE AND EXISTS ${Protobuf_PROTOC_EXECUTABLE})
@ -21,7 +21,7 @@ if(NOT BUILD_PROTOBUF AND NOT (DEFINED Protobuf_INCLUDE_DIRS AND DEFINED Protobu
find_package(Protobuf QUIET) find_package(Protobuf QUIET)
endif() endif()
if(Protobuf_FOUND) if(Protobuf_FOUND AND NOT BUILD_PROTOBUF)
# nothing # nothing
else() else()
set(Protobuf_LIBRARIES libprotobuf) set(Protobuf_LIBRARIES libprotobuf)

9
modules/dnn/CMakeLists.txt
Unescape View File

@ -56,14 +56,15 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
) )
if(PROTOBUF_UPDATE_FILES) if(PROTOBUF_UPDATE_FILES)
file(GLOB proto_files src/tensorflow/*.proto) file(GLOB proto_files ${CMAKE_CURRENT_SOURCE_DIR}/src/tensorflow/*.proto)
list(APPEND proto_files src/caffe/caffe.proto) list(APPEND proto_files ${CMAKE_CURRENT_SOURCE_DIR}/src/caffe/opencv-caffe.proto)
set(PROTOBUF_GENERATE_CPP_APPEND_PATH ON) # required for tensorflow
PROTOBUF_GENERATE_CPP(Protobuf_HDRS Protobuf_SRCS ${proto_files}) PROTOBUF_GENERATE_CPP(Protobuf_HDRS Protobuf_SRCS ${proto_files})
else() else()
file(GLOB fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.cc) file(GLOB fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.cc)
file(GLOB fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.h) file(GLOB fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/tensorflow/*.h)
list(APPEND fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.cc) list(APPEND fw_srcs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.cc)
list(APPEND fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/caffe.pb.h) list(APPEND fw_hdrs ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe/opencv-caffe.pb.h)
list(APPEND Protobuf_SRCS ${fw_srcs}) list(APPEND Protobuf_SRCS ${fw_srcs})
list(APPEND Protobuf_HDRS ${fw_hdrs}) list(APPEND Protobuf_HDRS ${fw_hdrs})
list(APPEND Protobuf_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe) list(APPEND Protobuf_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/misc/caffe)

1176
modules/dnn/misc/caffe/caffe.pb.cc → modules/dnn/misc/caffe/opencv-caffe.pb.cc
View File

File diff suppressed because it is too large Load Diff

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

@ -1,8 +1,8 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: caffe.proto // source: opencv-caffe.proto
#ifndef PROTOBUF_caffe_2eproto__INCLUDED #ifndef PROTOBUF_opencv_2dcaffe_2eproto__INCLUDED
#define PROTOBUF_caffe_2eproto__INCLUDED #define PROTOBUF_opencv_2dcaffe_2eproto__INCLUDED
#include <string> #include <string>
@ -33,10 +33,10 @@
namespace caffe { namespace caffe {
// Internal implementation detail -- do not call these. // Internal implementation detail -- do not call these.
void protobuf_AddDesc_caffe_2eproto(); void protobuf_AddDesc_opencv_2dcaffe_2eproto();
void protobuf_InitDefaults_caffe_2eproto(); void protobuf_InitDefaults_opencv_2dcaffe_2eproto();
void protobuf_AssignDesc_caffe_2eproto(); void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
void protobuf_ShutdownFile_caffe_2eproto(); void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
class AccuracyParameter; class AccuracyParameter;
class ArgMaxParameter; class ArgMaxParameter;
@ -775,10 +775,10 @@ class BlobShape : public ::google::protobuf::Message /* @@protoc_insertion_point
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::RepeatedField< ::google::protobuf::int64 > dim_; ::google::protobuf::RepeatedField< ::google::protobuf::int64 > dim_;
mutable int _dim_cached_byte_size_; mutable int _dim_cached_byte_size_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -996,10 +996,10 @@ class BlobProto : public ::google::protobuf::Message /* @@protoc_insertion_point
::google::protobuf::int32 channels_; ::google::protobuf::int32 channels_;
::google::protobuf::int32 height_; ::google::protobuf::int32 height_;
::google::protobuf::int32 width_; ::google::protobuf::int32 width_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -1097,10 +1097,10 @@ class BlobProtoVector : public ::google::protobuf::Message /* @@protoc_insertion
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::RepeatedPtrField< ::caffe::BlobProto > blobs_; ::google::protobuf::RepeatedPtrField< ::caffe::BlobProto > blobs_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -1198,10 +1198,10 @@ class PermuteParameter : public ::google::protobuf::Message /* @@protoc_insertio
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::RepeatedField< ::google::protobuf::uint32 > order_; ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > order_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -1328,10 +1328,10 @@ class NormalizeBBoxParameter : public ::google::protobuf::Message /* @@protoc_in
bool across_spatial_; bool across_spatial_;
bool channel_shared_; bool channel_shared_;
float eps_; float eps_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -1588,10 +1588,10 @@ class PriorBoxParameter : public ::google::protobuf::Message /* @@protoc_inserti
bool flip_; bool flip_;
bool clip_; bool clip_;
float offset_; float offset_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -1770,10 +1770,10 @@ class DetectionOutputParameter : public ::google::protobuf::Message /* @@protoc_
::google::protobuf::int32 keep_top_k_; ::google::protobuf::int32 keep_top_k_;
bool share_location_; bool share_location_;
int code_type_; int code_type_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -1936,10 +1936,10 @@ class Datum : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
::google::protobuf::int32 width_; ::google::protobuf::int32 width_;
::google::protobuf::int32 label_; ::google::protobuf::int32 label_;
bool encoded_; bool encoded_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -2138,10 +2138,10 @@ class FillerParameter : public ::google::protobuf::Message /* @@protoc_insertion
::google::protobuf::int32 sparse_; ::google::protobuf::int32 sparse_;
float max_; float max_;
float std_; float std_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -2342,10 +2342,10 @@ class NetParameter : public ::google::protobuf::Message /* @@protoc_insertion_po
::caffe::NetState* state_; ::caffe::NetState* state_;
bool force_backward_; bool force_backward_;
bool debug_info_; bool debug_info_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -2973,10 +2973,10 @@ class SolverParameter : public ::google::protobuf::Message /* @@protoc_insertion
float delta_; float delta_;
float momentum2_; float momentum2_;
mutable int _cached_size_; mutable int _cached_size_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -3109,10 +3109,10 @@ class SolverState : public ::google::protobuf::Message /* @@protoc_insertion_poi
::google::protobuf::internal::ArenaStringPtr learned_net_; ::google::protobuf::internal::ArenaStringPtr learned_net_;
::google::protobuf::int32 iter_; ::google::protobuf::int32 iter_;
::google::protobuf::int32 current_step_; ::google::protobuf::int32 current_step_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -3234,10 +3234,10 @@ class NetState : public ::google::protobuf::Message /* @@protoc_insertion_point(
::google::protobuf::RepeatedPtrField< ::std::string> stage_; ::google::protobuf::RepeatedPtrField< ::std::string> stage_;
::google::protobuf::int32 level_; ::google::protobuf::int32 level_;
int phase_; int phase_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -3386,10 +3386,10 @@ class NetStateRule : public ::google::protobuf::Message /* @@protoc_insertion_po
int phase_; int phase_;
::google::protobuf::int32 min_level_; ::google::protobuf::int32 min_level_;
::google::protobuf::int32 max_level_; ::google::protobuf::int32 max_level_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -3545,10 +3545,10 @@ class ParamSpec : public ::google::protobuf::Message /* @@protoc_insertion_point
int share_mode_; int share_mode_;
float lr_mult_; float lr_mult_;
float decay_mult_; float decay_mult_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -4397,10 +4397,10 @@ class LayerParameter : public ::google::protobuf::Message /* @@protoc_insertion_
::caffe::WindowDataParameter* window_data_param_; ::caffe::WindowDataParameter* window_data_param_;
int phase_; int phase_;
mutable int _cached_size_; mutable int _cached_size_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -4563,10 +4563,10 @@ class TransformationParameter : public ::google::protobuf::Message /* @@protoc_i
bool force_color_; bool force_color_;
bool force_gray_; bool force_gray_;
float scale_; float scale_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -4711,10 +4711,10 @@ class LossParameter : public ::google::protobuf::Message /* @@protoc_insertion_p
::google::protobuf::int32 ignore_label_; ::google::protobuf::int32 ignore_label_;
bool normalize_; bool normalize_;
int normalization_; int normalization_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -4829,10 +4829,10 @@ class AccuracyParameter : public ::google::protobuf::Message /* @@protoc_inserti
::google::protobuf::int32 ignore_label_; ::google::protobuf::int32 ignore_label_;
::google::protobuf::uint32 top_k_; ::google::protobuf::uint32 top_k_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -4947,10 +4947,10 @@ class ArgMaxParameter : public ::google::protobuf::Message /* @@protoc_insertion
bool out_max_val_; bool out_max_val_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
::google::protobuf::uint32 top_k_; ::google::protobuf::uint32 top_k_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -5055,10 +5055,10 @@ class ConcatParameter : public ::google::protobuf::Message /* @@protoc_insertion
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
::google::protobuf::uint32 concat_dim_; ::google::protobuf::uint32 concat_dim_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -5173,10 +5173,10 @@ class BatchNormParameter : public ::google::protobuf::Message /* @@protoc_insert
bool use_global_stats_; bool use_global_stats_;
float moving_average_fraction_; float moving_average_fraction_;
float eps_; float eps_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -5293,10 +5293,10 @@ class BiasParameter : public ::google::protobuf::Message /* @@protoc_insertion_p
::caffe::FillerParameter* filler_; ::caffe::FillerParameter* filler_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
::google::protobuf::int32 num_axes_; ::google::protobuf::int32 num_axes_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -5401,10 +5401,10 @@ class ContrastiveLossParameter : public ::google::protobuf::Message /* @@protoc_
mutable int _cached_size_; mutable int _cached_size_;
bool legacy_version_; bool legacy_version_;
float margin_; float margin_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -5713,10 +5713,10 @@ class ConvolutionParameter : public ::google::protobuf::Message /* @@protoc_inse
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
bool bias_term_; bool bias_term_;
::google::protobuf::uint32 group_; ::google::protobuf::uint32 group_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -5824,10 +5824,10 @@ class CropParameter : public ::google::protobuf::Message /* @@protoc_insertion_p
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::RepeatedField< ::google::protobuf::uint32 > offset_; ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > offset_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -6048,10 +6048,10 @@ class DataParameter : public ::google::protobuf::Message /* @@protoc_insertion_p
bool force_encoded_color_; bool force_encoded_color_;
float scale_; float scale_;
::google::protobuf::uint32 prefetch_; ::google::protobuf::uint32 prefetch_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -6166,10 +6166,10 @@ class NonMaximumSuppressionParameter : public ::google::protobuf::Message /* @@p
::google::protobuf::int32 top_k_; ::google::protobuf::int32 top_k_;
float nms_threshold_; float nms_threshold_;
float eta_; float eta_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -6339,10 +6339,10 @@ class SaveOutputParameter : public ::google::protobuf::Message /* @@protoc_inser
::google::protobuf::internal::ArenaStringPtr label_map_file_; ::google::protobuf::internal::ArenaStringPtr label_map_file_;
::google::protobuf::internal::ArenaStringPtr name_size_file_; ::google::protobuf::internal::ArenaStringPtr name_size_file_;
::google::protobuf::uint32 num_test_image_; ::google::protobuf::uint32 num_test_image_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -6437,10 +6437,10 @@ class DropoutParameter : public ::google::protobuf::Message /* @@protoc_insertio
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
float dropout_ratio_; float dropout_ratio_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -6603,10 +6603,10 @@ class DummyDataParameter : public ::google::protobuf::Message /* @@protoc_insert
::google::protobuf::RepeatedField< ::google::protobuf::uint32 > channels_; ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > channels_;
::google::protobuf::RepeatedField< ::google::protobuf::uint32 > height_; ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > height_;
::google::protobuf::RepeatedField< ::google::protobuf::uint32 > width_; ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > width_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -6752,10 +6752,10 @@ class EltwiseParameter : public ::google::protobuf::Message /* @@protoc_insertio
::google::protobuf::RepeatedField< float > coeff_; ::google::protobuf::RepeatedField< float > coeff_;
int operation_; int operation_;
bool stable_prod_grad_; bool stable_prod_grad_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -6850,10 +6850,10 @@ class ELUParameter : public ::google::protobuf::Message /* @@protoc_insertion_po
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
float alpha_; float alpha_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -6992,10 +6992,10 @@ class EmbedParameter : public ::google::protobuf::Message /* @@protoc_insertion_
::google::protobuf::uint32 num_output_; ::google::protobuf::uint32 num_output_;
::google::protobuf::uint32 input_dim_; ::google::protobuf::uint32 input_dim_;
bool bias_term_; bool bias_term_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -7110,10 +7110,10 @@ class ExpParameter : public ::google::protobuf::Message /* @@protoc_insertion_po
float shift_; float shift_;
float base_; float base_;
float scale_; float scale_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -7218,10 +7218,10 @@ class FlattenParameter : public ::google::protobuf::Message /* @@protoc_insertio
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
::google::protobuf::int32 end_axis_; ::google::protobuf::int32 end_axis_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -7341,10 +7341,10 @@ class HDF5DataParameter : public ::google::protobuf::Message /* @@protoc_inserti
::google::protobuf::internal::ArenaStringPtr source_; ::google::protobuf::internal::ArenaStringPtr source_;
::google::protobuf::uint32 batch_size_; ::google::protobuf::uint32 batch_size_;
bool shuffle_; bool shuffle_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -7444,10 +7444,10 @@ class HDF5OutputParameter : public ::google::protobuf::Message /* @@protoc_inser
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::internal::ArenaStringPtr file_name_; ::google::protobuf::internal::ArenaStringPtr file_name_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -7568,10 +7568,10 @@ class HingeLossParameter : public ::google::protobuf::Message /* @@protoc_insert
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
int norm_; int norm_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -7791,10 +7791,10 @@ class ImageDataParameter : public ::google::protobuf::Message /* @@protoc_insert
float scale_; float scale_;
::google::protobuf::uint32 batch_size_; ::google::protobuf::uint32 batch_size_;
bool is_color_; bool is_color_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -7894,10 +7894,10 @@ class InfogainLossParameter : public ::google::protobuf::Message /* @@protoc_ins
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::internal::ArenaStringPtr source_; ::google::protobuf::internal::ArenaStringPtr source_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -8046,10 +8046,10 @@ class InnerProductParameter : public ::google::protobuf::Message /* @@protoc_ins
bool transpose_; bool transpose_;
bool bias_term_; bool bias_term_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -8147,10 +8147,10 @@ class InputParameter : public ::google::protobuf::Message /* @@protoc_insertion_
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::RepeatedPtrField< ::caffe::BlobShape > shape_; ::google::protobuf::RepeatedPtrField< ::caffe::BlobShape > shape_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -8265,10 +8265,10 @@ class LogParameter : public ::google::protobuf::Message /* @@protoc_insertion_po
float shift_; float shift_;
float base_; float base_;
float scale_; float scale_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -8467,10 +8467,10 @@ class LRNParameter : public ::google::protobuf::Message /* @@protoc_insertion_po
float alpha_; float alpha_;
float beta_; float beta_;
float k_; float k_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -8595,10 +8595,10 @@ class MemoryDataParameter : public ::google::protobuf::Message /* @@protoc_inser
::google::protobuf::uint32 channels_; ::google::protobuf::uint32 channels_;
::google::protobuf::uint32 height_; ::google::protobuf::uint32 height_;
::google::protobuf::uint32 width_; ::google::protobuf::uint32 width_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -8713,10 +8713,10 @@ class MVNParameter : public ::google::protobuf::Message /* @@protoc_insertion_po
bool across_channels_; bool across_channels_;
bool normalize_variance_; bool normalize_variance_;
float eps_; float eps_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -8813,10 +8813,10 @@ class ParameterParameter : public ::google::protobuf::Message /* @@protoc_insert
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
::caffe::BlobShape* shape_; ::caffe::BlobShape* shape_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -9087,10 +9087,10 @@ class PoolingParameter : public ::google::protobuf::Message /* @@protoc_insertio
bool global_pooling_; bool global_pooling_;
::google::protobuf::uint32 stride_; ::google::protobuf::uint32 stride_;
bool ceil_mode_; bool ceil_mode_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -9205,10 +9205,10 @@ class PowerParameter : public ::google::protobuf::Message /* @@protoc_insertion_
float shift_; float shift_;
float power_; float power_;
float scale_; float scale_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -9348,10 +9348,10 @@ class PythonParameter : public ::google::protobuf::Message /* @@protoc_insertion
::google::protobuf::internal::ArenaStringPtr layer_; ::google::protobuf::internal::ArenaStringPtr layer_;
::google::protobuf::internal::ArenaStringPtr param_str_; ::google::protobuf::internal::ArenaStringPtr param_str_;
bool share_in_parallel_; bool share_in_parallel_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -9490,10 +9490,10 @@ class RecurrentParameter : public ::google::protobuf::Message /* @@protoc_insert
::google::protobuf::uint32 num_output_; ::google::protobuf::uint32 num_output_;
bool debug_info_; bool debug_info_;
bool expose_hidden_; bool expose_hidden_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -9638,10 +9638,10 @@ class ReductionParameter : public ::google::protobuf::Message /* @@protoc_insert
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
int operation_; int operation_;
float coeff_; float coeff_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -9774,10 +9774,10 @@ class ReLUParameter : public ::google::protobuf::Message /* @@protoc_insertion_p
mutable int _cached_size_; mutable int _cached_size_;
float negative_slope_; float negative_slope_;
int engine_; int engine_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -9894,10 +9894,10 @@ class ReshapeParameter : public ::google::protobuf::Message /* @@protoc_insertio
::caffe::BlobShape* shape_; ::caffe::BlobShape* shape_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
::google::protobuf::int32 num_axes_; ::google::protobuf::int32 num_axes_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -10036,10 +10036,10 @@ class ScaleParameter : public ::google::protobuf::Message /* @@protoc_insertion_
bool bias_term_; bool bias_term_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
::google::protobuf::int32 num_axes_; ::google::protobuf::int32 num_axes_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -10162,10 +10162,10 @@ class SigmoidParameter : public ::google::protobuf::Message /* @@protoc_insertio
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
int engine_; int engine_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -10283,10 +10283,10 @@ class SliceParameter : public ::google::protobuf::Message /* @@protoc_insertion_
::google::protobuf::RepeatedField< ::google::protobuf::uint32 > slice_point_; ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > slice_point_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
::google::protobuf::uint32 slice_dim_; ::google::protobuf::uint32 slice_dim_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -10419,10 +10419,10 @@ class SoftmaxParameter : public ::google::protobuf::Message /* @@protoc_insertio
mutable int _cached_size_; mutable int _cached_size_;
int engine_; int engine_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -10545,10 +10545,10 @@ class TanHParameter : public ::google::protobuf::Message /* @@protoc_insertion_p
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
int engine_; int engine_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -10653,10 +10653,10 @@ class TileParameter : public ::google::protobuf::Message /* @@protoc_insertion_p
mutable int _cached_size_; mutable int _cached_size_;
::google::protobuf::int32 tiles_; ::google::protobuf::int32 tiles_;
::google::protobuf::int32 axis_; ::google::protobuf::int32 axis_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -10751,10 +10751,10 @@ class ThresholdParameter : public ::google::protobuf::Message /* @@protoc_insert
::google::protobuf::internal::HasBits<1> _has_bits_; ::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_; mutable int _cached_size_;
float threshold_; float threshold_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -10990,10 +10990,10 @@ class WindowDataParameter : public ::google::protobuf::Message /* @@protoc_inser
float fg_threshold_; float fg_threshold_;
float bg_threshold_; float bg_threshold_;
float fg_fraction_; float fg_fraction_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -11164,10 +11164,10 @@ class SPPParameter : public ::google::protobuf::Message /* @@protoc_insertion_po
::google::protobuf::uint32 pyramid_height_; ::google::protobuf::uint32 pyramid_height_;
int pool_; int pool_;
int engine_; int engine_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -11917,10 +11917,10 @@ class V1LayerParameter : public ::google::protobuf::Message /* @@protoc_insertio
::caffe::V0LayerParameter* layer_; ::caffe::V0LayerParameter* layer_;
int type_; int type_;
mutable int _cached_size_; mutable int _cached_size_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -12454,10 +12454,10 @@ class V0LayerParameter : public ::google::protobuf::Message /* @@protoc_insertio
float det_bg_threshold_; float det_bg_threshold_;
float det_fg_fraction_; float det_fg_fraction_;
mutable int _cached_size_; mutable int _cached_size_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -12564,10 +12564,10 @@ class PReLUParameter : public ::google::protobuf::Message /* @@protoc_insertion_
mutable int _cached_size_; mutable int _cached_size_;
::caffe::FillerParameter* filler_; ::caffe::FillerParameter* filler_;
bool channel_shared_; bool channel_shared_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -12732,10 +12732,10 @@ class NormalizedBBox : public ::google::protobuf::Message /* @@protoc_insertion_
bool difficult_; bool difficult_;
float score_; float score_;
float size_; float size_;
friend void protobuf_InitDefaults_caffe_2eproto_impl(); friend void protobuf_InitDefaults_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AddDesc_caffe_2eproto_impl(); friend void protobuf_AddDesc_opencv_2dcaffe_2eproto_impl();
friend void protobuf_AssignDesc_caffe_2eproto(); friend void protobuf_AssignDesc_opencv_2dcaffe_2eproto();
friend void protobuf_ShutdownFile_caffe_2eproto(); friend void protobuf_ShutdownFile_opencv_2dcaffe_2eproto();
void InitAsDefaultInstance(); void InitAsDefaultInstance();
}; };
@ -28808,4 +28808,4 @@ inline const EnumDescriptor* GetEnumDescriptor< ::caffe::Phase>() {
// @@protoc_insertion_point(global_scope) // @@protoc_insertion_point(global_scope)
#endif // PROTOBUF_caffe_2eproto__INCLUDED #endif // PROTOBUF_opencv_2dcaffe_2eproto__INCLUDED

2
modules/dnn/src/caffe/caffe_importer.cpp
Unescape View File

@ -42,8 +42,6 @@
#include "../precomp.hpp" #include "../precomp.hpp"
#ifdef HAVE_PROTOBUF #ifdef HAVE_PROTOBUF
#include "caffe.pb.h"
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>

1
modules/dnn/src/caffe/caffe_io.cpp
Unescape View File

@ -99,7 +99,6 @@
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include "caffe.pb.h"
#include "caffe_io.hpp" #include "caffe_io.hpp"
#include "glog_emulator.hpp" #include "glog_emulator.hpp"

2
modules/dnn/src/caffe/caffe_io.hpp
Unescape View File

@ -91,7 +91,7 @@
#define __OPENCV_DNN_CAFFE_IO_HPP__ #define __OPENCV_DNN_CAFFE_IO_HPP__
#ifdef HAVE_PROTOBUF #ifdef HAVE_PROTOBUF
#include "caffe.pb.h" #include "opencv-caffe.pb.h"
namespace cv { namespace cv {
namespace dnn { namespace dnn {

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

Write Preview
Loading…
Cancel
Save