Refactored cmake and disabled AlexNet test

modules/dnn/CMakeLists.txt

@@ -1,26 +1,27 @@
 cmake_minimum_required(VERSION 2.8)
-
-if(${CMAKE_PROJECT_NAME} STREQUAL "OpenCV")#build as OpenCV module
-
-set(the_description "Deep neural network module. It allows to load models and to make forward pass")
+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_OPTION(BUILD_LIBPROTOBUF_FROM_SOURCES "Force to build libprotobuf from sources (don't try to find it in system)" OFF)
-include(cmake/find_protobuf.cmake)
-
-ocv_add_module(dnn opencv_imgproc opencv_core opencv_highgui WRAP python matlab)
+ocv_add_module(dnn opencv_core opencv_imgproc WRAP python matlab)
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-shadow -Wno-parentheses -Wmaybe-uninitialized -Wsign-promo -Wmissing-declarations -Wmissing-prototypes)
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4701)
+
+# ----------------------------------------------------------------------------
+# Resolve libprotobuf dependency
+# ----------------------------------------------------------------------------
+include(cmake/OpenCVFindLibProtobuf.cmake)
 ocv_glob_module_sources(${PROTOBUF_SRCS} ${PROTOBUF_HDRS})
 ocv_source_group("Src\\protobuf" FILES ${PROTOBUF_SRCS} ${PROTOBUF_HDRS})
 ocv_module_include_directories(include ${PROTOBUF_INCLUDE_DIR})
 
 ocv_create_module(${PROTOBUF_LIBRARIES})
-
 ocv_add_samples()
 ocv_add_accuracy_tests()
 ocv_add_perf_tests()
 
+# ----------------------------------------------------------------------------
+# Download pre-trained models for complex testing on GoogLeNet and AlexNet
+# ----------------------------------------------------------------------------
 OCV_OPTION(${the_module}_DOWNLOAD_CAFFE_MODELS "Use GoogLeNet Caffe model for testing" ON IF BUILD_TESTS AND PYTHON2_EXECUTABLE AND DEFINED ENV{OPENCV_TEST_DATA_PATH})
 if(BUILD_TESTS AND ${the_module}_DOWNLOAD_CAFFE_MODELS)
     add_custom_command( TARGET opencv_test_${name} POST_BUILD
@@ -29,13 +30,19 @@ if(BUILD_TESTS AND ${the_module}_DOWNLOAD_CAFFE_MODELS)
     add_definitions(-DENABLE_CAFFE_MODEL_TESTS=1)
 endif()
 
-OCV_OPTION(${the_module}_BUILD_TORCH_IMPORTER "Build Torch model importer" OFF)
+# ----------------------------------------------------------------------------
+# Torch7 importer of blobs and models, produced by Torch.nn module
+# ----------------------------------------------------------------------------
+OCV_OPTION(${the_module}_BUILD_TORCH_IMPORTER "Build Torch model importer (experimental functionality!)" OFF)
 if(${the_module}_BUILD_TORCH_IMPORTER)
     add_definitions(-DENABLE_TORCH_IMPORTER=1)
-    ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4702 /wd4127 /wd4267)
+    ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4702 /wd4127 /wd4267) #supress warnings in original torch files
 endif()
 
-OCV_OPTION(${the_module}_BUILD_TORCH_TESTS "Build Torch tests (installed Torch7 with nn module is required)" ON IF BUILD_TESTS AND ${the_module}_BUILD_TORCH_IMPORTER)
+# ----------------------------------------------------------------------------
+# Generating test data for Torch importer
+# ----------------------------------------------------------------------------
+OCV_OPTION(${the_module}_BUILD_TORCH_TESTS "Build Torch tests (installed torch7 with nn module is required)" ON IF BUILD_TESTS AND ${the_module}_BUILD_TORCH_IMPORTER)
 if(${the_module}_BUILD_TORCH_TESTS)
 
     if(NOT DEFINED ENV{OPENCV_TEST_DATA_PATH})
@@ -51,24 +58,4 @@ if(${the_module}_BUILD_TORCH_TESTS)
                         COMMAND th ${CMAKE_CURRENT_SOURCE_DIR}/testdata/dnn/torch/torch_gen_test_data.lua
                         WORKING_DIRECTORY  $ENV{OPENCV_TEST_DATA_PATH}/dnn/torch )
     add_definitions(-DENABLE_TORCH_TESTS=1)
-endif()
-
-else()#build as standalone module (for development purposes)
-
-project(dnn_standalone)
-
-include(cmake/find_protobuf.cmake)
-find_package( OpenCV 3.0 REQUIRED )
-
-file(GLOB_RECURSE MODULE_SOURCES "src/*.cpp")
-file(GLOB_RECURSE MODULE_HEADERS "src/*.hpp" "src/*.h" "include/*.h*")
-file(GLOB_RECURSE MODULE_TEST_SOURCES "test/*.cpp" "test/*.hpp" "test/*.h")
-
-include_directories(include ${OpenCV_INCLUDE_DIRS})
-add_library(_opencv_dnn SHARED ${MODULE_SOURCES} ${MODULE_HEADERS} ${PROTO_FILES} ${PROTO_HDRS})
-add_executable(_opencv_test_dnn ${MODULE_TEST_SOURCES})
-target_link_libraries(_opencv_dnn ${OpenCV_LIBS} ${PROTOBUF_LIBRARIES})
-target_link_libraries(_opencv_test_dnn _opencv_dnn opencv_ts)
-target_include_directories(_opencv_dnn PRIVATE src src/caffe ${PROTOBUF_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
-endif()
+endif()

modules/dnn/cmake/OpenCVFindLibProtobuf.cmake

@@ -1,3 +1,5 @@
+OCV_OPTION(BUILD_LIBPROTOBUF_FROM_SOURCES "Force to build libprotobuf from sources (don't try to find it in system)" OFF)
+
 if(NOT BUILD_LIBPROTOBUF_FROM_SOURCES)
   find_package(Protobuf)
 endif()
@@ -7,13 +9,16 @@ if(NOT BUILD_LIBPROTOBUF_FROM_SOURCES AND PROTOBUF_FOUND AND EXISTS ${PROTOBUF_P
   PROTOBUF_GENERATE_CPP(PROTOBUF_HDRS PROTOBUF_SRCS src/caffe/caffe.proto)
   add_definitions(-DHAVE_PROTOBUF=1)
 else()
+  message(STATUS "Build libprotobuf from sources:")
   if(NOT PROTOBUF_FOUND)
-    message(STATUS "libprotobuf not found")
-  else()
-    message(STATUS "The protocol buffer compiler not found")
+  message(STATUS "    libprotobuf not found into system")
+  endif()
+  if(NOT EXISTS ${PROTOBUF_PROTOC_EXECUTABLE})
+  message(STATUS "    The protocol buffer compiler not found")
   endif()
 
-  if(NOT OPENCV_INITIAL_PASS)
+  #take into account OpenCV two-pass module addition scheme
+  if(NOT OPENCV_INITIAL_PASS) #TODO: it looks like a hack
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/protobuf)
   endif()
 
@@ -32,6 +37,7 @@ else()
   )
   set_source_files_properties(${PROTOBUF_SRCS} ${PROTOBUF_HDRS} PROPERTIES GENERATED TRUE)
 
+  #supress warnings in autogenerated caffe.pb.* files
   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter)
   ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4125 /wd4267 /wd4127 /wd4244 /wd4512 /wd4702)
 endif()

modules/dnn/test/test_alexnet.cpp

@@ -1,3 +1,4 @@
+#if defined(ENABLE_CAFFE_MODEL_TESTS) && defined(ENABLE_CAFFE_ALEXNET_TEST) //AlexNet is disabled now
 #include "test_precomp.hpp"
 #include "npy_blob.hpp"
 
@@ -36,3 +37,4 @@ TEST(Reproducibility_AlexNet, Accuracy)
 }
 
 }
+#endif

modules/dnn/test/test_googlenet.cpp

@@ -1,3 +1,4 @@
+#if defined(ENABLE_CAFFE_MODEL_TESTS)
 #include "test_precomp.hpp"
 #include "npy_blob.hpp"
 
@@ -27,8 +28,7 @@ TEST(Reproducibility_GoogLeNet, Accuracy)
     inpMats.push_back( imread(_tf("googlenet_1.jpg")) );
     ASSERT_TRUE(!inpMats[0].empty() && !inpMats[1].empty());
 
-    Blob inp(inpMats);
-    net.setBlob(".data", inp);
+    net.setBlob(".data", Blob(inpMats));
     net.forward();
 
     Blob out = net.getBlob("prob");
@@ -37,3 +37,4 @@ TEST(Reproducibility_GoogLeNet, Accuracy)
 }
 
 }
+#endif