diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt index 88f4347bb6..804b78ead2 100644 --- a/modules/dnn/CMakeLists.txt +++ b/modules/dnn/CMakeLists.txt @@ -2,10 +2,6 @@ if(WINRT) ocv_module_disable(dnn) endif() -if(NOT HAVE_PROTOBUF) - ocv_module_disable(opencv_dnn) -endif() - set(the_description "Deep neural network module. It allows to load models from different frameworks and to make forward pass") ocv_add_dispatched_file_force_all("layers/layers_common" AVX AVX2 AVX512_SKX RVV LASX) @@ -104,8 +100,6 @@ if(NOT BUILD_PROTOBUF) ocv_target_compile_definitions(${the_module} PRIVATE "OPENCV_DNN_EXTERNAL_PROTOBUF=1") endif() -ocv_target_compile_definitions(${the_module} PRIVATE "HAVE_PROTOBUF=1") - #suppress warnings in autogenerated caffe.pb.* files ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4125 /wd4267 /wd4127 /wd4244 /wd4512 /wd4702 @@ -120,14 +114,18 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS set(include_dirs "") set(libs "") -if(PROTOBUF_UPDATE_FILES) - file(GLOB proto_files "${CMAKE_CURRENT_LIST_DIR}/src/tensorflow/*.proto" "${CMAKE_CURRENT_LIST_DIR}/src/caffe/opencv-caffe.proto" "${CMAKE_CURRENT_LIST_DIR}/src/onnx/opencv-onnx.proto") - set(PROTOBUF_GENERATE_CPP_APPEND_PATH ON) # required for tensorflow - protobuf_generate_cpp(fw_srcs fw_hdrs ${proto_files}) -else() - file(GLOB fw_srcs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/caffe/opencv-caffe.pb.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.cc") - file(GLOB fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.h" "${CMAKE_CURRENT_LIST_DIR}/misc/caffe/opencv-caffe.pb.h" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.h") - set(fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/caffe" "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx") +if(HAVE_PROTOBUF) + ocv_target_compile_definitions(${the_module} PRIVATE "HAVE_PROTOBUF=1") + + if(PROTOBUF_UPDATE_FILES) + file(GLOB proto_files "${CMAKE_CURRENT_LIST_DIR}/src/tensorflow/*.proto" "${CMAKE_CURRENT_LIST_DIR}/src/caffe/opencv-caffe.proto" "${CMAKE_CURRENT_LIST_DIR}/src/onnx/opencv-onnx.proto") + set(PROTOBUF_GENERATE_CPP_APPEND_PATH ON) # required for tensorflow + protobuf_generate_cpp(fw_srcs fw_hdrs ${proto_files}) + else() + file(GLOB fw_srcs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/caffe/opencv-caffe.pb.cc" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.cc") + file(GLOB fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow/*.h" "${CMAKE_CURRENT_LIST_DIR}/misc/caffe/opencv-caffe.pb.h" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx/opencv-onnx.pb.h") + set(fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/caffe" "${CMAKE_CURRENT_LIST_DIR}/misc/tensorflow" "${CMAKE_CURRENT_LIST_DIR}/misc/onnx") + endif() endif() ocv_option(OPENCV_DNN_TFLITE "Build with TFLite support" (TARGET ocv.3rdparty.flatbuffers)) diff --git a/modules/dnn/src/caffe/caffe_importer.cpp b/modules/dnn/src/caffe/caffe_importer.cpp index a8d2f28ca6..b8b520c1a6 100644 --- a/modules/dnn/src/caffe/caffe_importer.cpp +++ b/modules/dnn/src/caffe/caffe_importer.cpp @@ -591,7 +591,23 @@ Net readNetFromCaffe(const std::vector& bufferProto, const std::vector&, const std::vector&) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +#endif // HAVE_PROTOBUF CV__DNN_INLINE_NS_END }} // namespace diff --git a/modules/dnn/src/init.cpp b/modules/dnn/src/init.cpp index a62312375c..360113196b 100644 --- a/modules/dnn/src/init.cpp +++ b/modules/dnn/src/init.cpp @@ -42,7 +42,7 @@ #include "precomp.hpp" #include -#if !defined(BUILD_PLUGIN) +#if defined(HAVE_PROTOBUF) && !defined(BUILD_PLUGIN) #include #endif @@ -60,7 +60,7 @@ Mutex& getInitializationMutex() // force initialization (single-threaded environment) Mutex* __initialization_mutex_initializer = &getInitializationMutex(); -#if !defined(BUILD_PLUGIN) +#if defined(HAVE_PROTOBUF) && !defined(BUILD_PLUGIN) namespace { using namespace google::protobuf; class ProtobufShutdown { @@ -80,7 +80,7 @@ void initializeLayerFactory() { CV_TRACE_FUNCTION(); -#if !defined(BUILD_PLUGIN) +#if defined(HAVE_PROTOBUF) && !defined(BUILD_PLUGIN) static ProtobufShutdown protobufShutdown; CV_UNUSED(protobufShutdown); #endif diff --git a/modules/dnn/src/onnx/onnx_graph_simplifier.cpp b/modules/dnn/src/onnx/onnx_graph_simplifier.cpp index c17b4fdb09..84b9125dcf 100644 --- a/modules/dnn/src/onnx/onnx_graph_simplifier.cpp +++ b/modules/dnn/src/onnx/onnx_graph_simplifier.cpp @@ -7,6 +7,7 @@ #include "../precomp.hpp" +#ifdef HAVE_PROTOBUF #include "../graph_simplifier.hpp" #include "onnx_graph_simplifier.hpp" @@ -1265,3 +1266,4 @@ Mat getMatFromTensor(const opencv_onnx::TensorProto& tensor_proto) CV__DNN_INLINE_NS_END }} // namespace cv::dnn +#endif // HAVE_PROTOBUF diff --git a/modules/dnn/src/onnx/onnx_graph_simplifier.hpp b/modules/dnn/src/onnx/onnx_graph_simplifier.hpp index e2a4d0ac39..eea45e7330 100644 --- a/modules/dnn/src/onnx/onnx_graph_simplifier.hpp +++ b/modules/dnn/src/onnx/onnx_graph_simplifier.hpp @@ -7,6 +7,7 @@ #ifndef __OPENCV_DNN_ONNX_SIMPLIFIER_HPP__ #define __OPENCV_DNN_ONNX_SIMPLIFIER_HPP__ +#ifdef HAVE_PROTOBUF #if defined(__GNUC__) && __GNUC__ >= 5 #pragma GCC diagnostic push @@ -36,4 +37,5 @@ Mat getMatFromTensor(const opencv_onnx::TensorProto& tensor_proto); CV__DNN_INLINE_NS_END }} // namespace dnn, namespace cv +#endif // HAVE_PROTOBUF #endif // __OPENCV_DNN_ONNX_SIMPLIFIER_HPP__ diff --git a/modules/dnn/src/onnx/onnx_importer.cpp b/modules/dnn/src/onnx/onnx_importer.cpp index 035ce2bc99..81a61dd861 100644 --- a/modules/dnn/src/onnx/onnx_importer.cpp +++ b/modules/dnn/src/onnx/onnx_importer.cpp @@ -43,6 +43,7 @@ #endif #include "onnx_graph_simplifier.hpp" +#endif namespace cv { namespace dnn { @@ -50,6 +51,7 @@ CV__DNN_INLINE_NS_BEGIN extern bool DNN_DIAGNOSTICS_RUN; +#ifdef HAVE_PROTOBUF class ONNXLayerHandler; template @@ -4170,7 +4172,27 @@ Mat readTensorFromONNX(const String& path) return mat; } +#else // HAVE_PROTOBUF + +#define DNN_PROTOBUF_UNSUPPORTED() CV_Error(Error::StsError, "DNN/ONNX: Build OpenCV with Protobuf to import ONNX models") + +Net readNetFromONNX(const String&) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +Net readNetFromONNX(const char*, size_t) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +Net readNetFromONNX(const std::vector&) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +Mat readTensorFromONNX(const String&) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +#endif // HAVE_PROTOBUF + CV__DNN_INLINE_NS_END }} // namespace - -#endif diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp index 5863832119..8e9970528a 100644 --- a/modules/dnn/src/tensorflow/tf_importer.cpp +++ b/modules/dnn/src/tensorflow/tf_importer.cpp @@ -36,7 +36,7 @@ CV__DNN_INLINE_NS_BEGIN extern bool DNN_DIAGNOSTICS_RUN; -#if HAVE_PROTOBUF +#ifdef HAVE_PROTOBUF using ::google::protobuf::RepeatedField; using ::google::protobuf::RepeatedPtrField; @@ -3225,8 +3225,6 @@ void TFLayerHandler::handleFailed(const tensorflow::NodeDef& layer) } // namespace -#endif //HAVE_PROTOBUF - Net readNetFromTensorflow(const String &model, const String &config) { return detail::readNetDiagnostic(model.c_str(), config.c_str()); @@ -3276,5 +3274,27 @@ void writeTextGraph(const String& _model, const String& output) ofs.close(); } +#else // HAVE_PROTOBUF + +#define DNN_PROTOBUF_UNSUPPORTED() CV_Error(Error::StsError, "DNN/TF: Build OpenCV with Protobuf to import TensorFlow models") + +Net readNetFromTensorflow(const String &, const String &) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +Net readNetFromTensorflow(const char*, size_t, const char*, size_t) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +Net readNetFromTensorflow(const std::vector&, const std::vector&) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +void writeTextGraph(const String& _model, const String& output) { + DNN_PROTOBUF_UNSUPPORTED(); +} + +#endif // HAVE_PROTOBUF + CV__DNN_INLINE_NS_END }} // namespace