dnn: move samples

lloy1231 · Jun 26, 2017 · 14de8ac · 14de8ac
1 parent 6031c79
commit 14de8ac
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 0 deletions.
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -11,6 +11,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_LIST_DIR)
 # ----------------------------------------------------------------------------
 
 add_subdirectory(cpp)
+add_subdirectory(dnn)
 add_subdirectory(gpu)
 add_subdirectory(tapi)
 
@@ -78,6 +79,7 @@ if(MSVC)
 endif()
 
 add_subdirectory(cpp)
+add_subdirectory(dnn)
 # FIXIT: can't use cvconfig.h in samples: add_subdirectory(gpu)
 
 add_subdirectory(opencl)

diff --git a/modules/dnn/samples/.gitignore → samples/data/dnn/.gitignore b/modules/dnn/samples/.gitignore → samples/data/dnn/.gitignore
diff --git a/...G_VOC0712_SSD_300x300_iter_60000.prototxt → ...G_VOC0712_SSD_300x300_iter_60000.prototxt b/...G_VOC0712_SSD_300x300_iter_60000.prototxt → ...G_VOC0712_SSD_300x300_iter_60000.prototxt
diff --git a/modules/dnn/samples/bvlc_googlenet.prototxt → samples/data/dnn/bvlc_googlenet.prototxt b/modules/dnn/samples/bvlc_googlenet.prototxt → samples/data/dnn/bvlc_googlenet.prototxt
diff --git a/modules/dnn/samples/enet-classes.txt → samples/data/dnn/enet-classes.txt b/modules/dnn/samples/enet-classes.txt → samples/data/dnn/enet-classes.txt
diff --git a/.../dnn/samples/fcn32s-heavy-pascal.prototxt → ...les/data/dnn/fcn32s-heavy-pascal.prototxt b/.../dnn/samples/fcn32s-heavy-pascal.prototxt → ...les/data/dnn/fcn32s-heavy-pascal.prototxt
diff --git a/...s/dnn/samples/fcn8s-heavy-pascal.prototxt → samples/data/dnn/fcn8s-heavy-pascal.prototxt b/...s/dnn/samples/fcn8s-heavy-pascal.prototxt → samples/data/dnn/fcn8s-heavy-pascal.prototxt
diff --git a/modules/dnn/samples/pascal-classes.txt → samples/data/dnn/pascal-classes.txt b/modules/dnn/samples/pascal-classes.txt → samples/data/dnn/pascal-classes.txt
diff --git a/modules/dnn/samples/rgb.jpg → samples/data/dnn/rgb.jpg b/modules/dnn/samples/rgb.jpg → samples/data/dnn/rgb.jpg
diff --git a/modules/dnn/samples/space_shuttle.jpg → samples/data/dnn/space_shuttle.jpg b/modules/dnn/samples/space_shuttle.jpg → samples/data/dnn/space_shuttle.jpg
diff --git a/modules/dnn/samples/synset_words.txt → samples/data/dnn/synset_words.txt b/modules/dnn/samples/synset_words.txt → samples/data/dnn/synset_words.txt
diff --git a/samples/dnn/CMakeLists.txt b/samples/dnn/CMakeLists.txt
@@ -0,0 +1,55 @@
+SET(OPENCV_DNN_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_dnn
+    opencv_imgcodecs opencv_videoio opencv_highgui
+    ${OpenCV_LIB_COMPONENTS})
+
+ocv_check_dependencies(${OPENCV_DNN_SAMPLES_REQUIRED_DEPS})
+
+
+if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
+  project(dnn_samples)
+
+  ocv_include_directories("${OpenCV_SOURCE_DIR}/include")
+  ocv_include_modules_recurse(${OPENCV_DNN_SAMPLES_REQUIRED_DEPS})
+
+  # ---------------------------------------------
+  #      Define executable targets
+  # ---------------------------------------------
+  MACRO(OPENCV_DEFINE_DNN_EXAMPLE name srcs)
+    set(sample_kind example_dnn)
+    set(sample_subfolder "dnn")
+
+    set(the_target "${sample_kind}_${name}")
+    add_executable(${the_target} ${srcs})
+    ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_DNN_SAMPLES_REQUIRED_DEPS})
+
+    set_target_properties(${the_target} PROPERTIES
+      OUTPUT_NAME "${sample_kind}-${name}"
+      PROJECT_LABEL "(${sample_KIND}) ${name}")
+
+    if(ENABLE_SOLUTION_FOLDERS)
+      set_target_properties(${the_target} PROPERTIES FOLDER "samples/${sample_subfolder}")
+    endif()
+
+    if(WIN32)
+      if (MSVC AND NOT BUILD_SHARED_LIBS)
+        set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
+      endif()
+      install(TARGETS ${the_target}
+              RUNTIME DESTINATION "${OPENCV_SAMPLES_BIN_INSTALL_PATH}/${sample_subfolder}" COMPONENT samples)
+    endif()
+  ENDMACRO()
+
+  file(GLOB_RECURSE dnn_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+
+  foreach(sample_filename ${dnn_samples})
+    get_filename_component(sample ${sample_filename} NAME_WE)
+    OPENCV_DEFINE_DNN_EXAMPLE(${sample}  ${sample_filename})
+  endforeach()
+endif()
+
+if(INSTALL_C_EXAMPLES AND NOT WIN32)
+  file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+  install(FILES ${C_SAMPLES}
+          DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/dnn
+          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
+endif()
diff --git a/modules/dnn/samples/caffe_googlenet.cpp → samples/dnn/caffe_googlenet.cpp b/modules/dnn/samples/caffe_googlenet.cpp → samples/dnn/caffe_googlenet.cpp
diff --git a/modules/dnn/samples/fcn_semsegm.cpp → samples/dnn/fcn_semsegm.cpp b/modules/dnn/samples/fcn_semsegm.cpp → samples/dnn/fcn_semsegm.cpp
diff --git a/modules/dnn/samples/googlenet_python.py → samples/dnn/googlenet_python.py b/modules/dnn/samples/googlenet_python.py → samples/dnn/googlenet_python.py
diff --git a/modules/dnn/samples/squeezenet_halide.cpp → samples/dnn/squeezenet_halide.cpp b/modules/dnn/samples/squeezenet_halide.cpp → samples/dnn/squeezenet_halide.cpp
diff --git a/modules/dnn/samples/ssd_object_detection.cpp → samples/dnn/ssd_object_detection.cpp b/modules/dnn/samples/ssd_object_detection.cpp → samples/dnn/ssd_object_detection.cpp
diff --git a/modules/dnn/samples/tf_inception.cpp → samples/dnn/tf_inception.cpp b/modules/dnn/samples/tf_inception.cpp → samples/dnn/tf_inception.cpp
diff --git a/modules/dnn/samples/torch_enet.cpp → samples/dnn/torch_enet.cpp b/modules/dnn/samples/torch_enet.cpp → samples/dnn/torch_enet.cpp