Merge pull request #956 from alalek:opencv_world_with_contrib

Author: alalek

modules/dnn/CMakeLists.txt

@@ -3,7 +3,6 @@ if(WINRT)
 endif()
 
 set(the_description "Deep neural network module. It allows to load models from different frameworks and to make forward pass")
-set(OPENCV_MODULE_IS_PART_OF_WORLD OFF)
 
 ocv_add_module(dnn opencv_core opencv_imgproc PRIVATE_REQUIRED "${LAPACK_LIBRARIES}" WRAP python matlab)
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow -Wno-parentheses -Wmaybe-uninitialized -Wsign-promo
@@ -36,7 +35,7 @@ endif()
 # ----------------------------------------------------------------------------
 # Resolve libprotobuf dependency
 # ----------------------------------------------------------------------------
-include(cmake/OpenCVFindLibProtobuf.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/OpenCVFindLibProtobuf.cmake)
 ocv_source_group("Src\\protobuf" FILES ${PROTOBUF_SRCS} ${PROTOBUF_HDRS})
 ocv_module_include_directories(include ${PROTOBUF_INCLUDE_DIR})
 

modules/dnn/cmake/OpenCVFindLibProtobuf.cmake

@@ -28,7 +28,7 @@ if(PROTOBUF_FOUND)
   # nothing
 else()
   include(${CMAKE_CURRENT_LIST_DIR}/download_protobuf.cmake)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/protobuf)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/protobuf ${CMAKE_BINARY_DIR}/3rdparty/protobuf)
   set(PROTOBUF_LIBRARIES libprotobuf)
   set(PROTOBUF_INCLUDE_DIR ${PROTOBUF_CPP_PATH}/protobuf-3.1.0/src)
 endif()

modules/dnn/src/caffe/caffe_importer.cpp

@@ -39,7 +39,7 @@
 //
 //M*/
 
-#include "precomp.hpp"
+#include "../precomp.hpp"
 using namespace cv;
 using namespace cv::dnn;
 

modules/dnn/src/layers/convolution_layer.cpp

@@ -60,12 +60,12 @@ BaseConvolutionLayerImpl::BaseConvolutionLayerImpl():
     inpGroupCn(0), outGroupCn(0),
     ksize(0), bias(false), tryUseOpenCL(false)
 {
-    #if HAVE_CBLAS
-        if (getBlasThreads() != cv::getThreadNum())
-        {
-            setBlasThreads(cv::getThreadNum());
-        }
-    #endif
+#ifdef HAVE_LAPACK
+    if (getBlasThreads() != cv::getThreadNum())
+    {
+        setBlasThreads(cv::getThreadNum());
+    }
+#endif
 }
 
 void BaseConvolutionLayerImpl::init()

modules/dnn/src/layers/elementwise_layers.hpp

@@ -46,9 +46,7 @@
 #include <cmath>
 #include <opencv2/dnn/all_layers.hpp>
 #include <opencv2/core/ocl.hpp>
-#ifdef HAVE_OPENCL
-#include "modules/dnn/opencl_kernels_dnn.hpp"
-#endif
+#include "opencl_kernels_dnn.hpp"
 
 namespace cv
 {

modules/dnn/src/layers/lrn_layer.cpp

@@ -42,7 +42,7 @@
 #include "../precomp.hpp"
 #include "layers_common.hpp"
 #include "lrn_layer.hpp"
-#include "modules/dnn/opencl_kernels_dnn.hpp"
+#include "opencl_kernels_dnn.hpp"
 #include <opencv2/imgproc.hpp>
 #include <opencv2/core/ocl.hpp>
 #include <opencv2/dnn/shape_utils.hpp>

modules/dnn/src/layers/softmax_layer.cpp

@@ -43,7 +43,7 @@
 #include "layers_common.hpp"
 #include "softmax_layer.hpp"
 #include <opencv2/core/ocl.hpp>
-#include "modules/dnn/opencl_kernels_dnn.hpp"
+#include "opencl_kernels_dnn.hpp"
 #include <algorithm>
 #include <stdlib.h>
 using std::max;

modules/dnn/src/tensorflow/tf_importer.cpp

@@ -9,7 +9,7 @@
 Implementation of Tensorflow models parser
 */
 
-#include "precomp.hpp"
+#include "../precomp.hpp"
 using namespace cv;
 using namespace cv::dnn;
 

modules/dnn/src/torch/THGeneral.cpp

@@ -1,21 +1,22 @@
 #if defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER
-#include "THGeneral.h"
 #include <opencv2/core.hpp>
 
-extern "C"
-{
-
-#ifndef TH_HAVE_THREAD
-#define __thread
-#endif
-
 #if defined(TH_DISABLE_HEAP_TRACKING)
 #elif (defined(__unix) || defined(_WIN32))
 #include <malloc.h>
 #elif defined(__APPLE__)
 #include <malloc/malloc.h>
 #endif
 
+#include "THGeneral.h"
+
+extern "C"
+{
+
+#ifndef TH_HAVE_THREAD
+#define __thread
+#endif
+
 /* Torch Error Handling */
 static void defaultTorchErrorHandlerFunction(const char *msg, void*)
 {