diff --git a/modules/dnn/tutorials/images/build_1.png b/modules/dnn/tutorials/images/build_1.png deleted file mode 100644 index 855159e87d..0000000000 Binary files a/modules/dnn/tutorials/images/build_1.png and /dev/null differ diff --git a/modules/dnn/tutorials/images/build_2.png b/modules/dnn/tutorials/images/build_2.png deleted file mode 100644 index 6741e8ab6d..0000000000 Binary files a/modules/dnn/tutorials/images/build_2.png and /dev/null differ diff --git a/modules/dnn/tutorials/images/build_3.png b/modules/dnn/tutorials/images/build_3.png deleted file mode 100644 index 102d6e339e..0000000000 Binary files a/modules/dnn/tutorials/images/build_3.png and /dev/null differ diff --git a/modules/dnn/tutorials/images/build_4.png b/modules/dnn/tutorials/images/build_4.png deleted file mode 100644 index 3ad4df8174..0000000000 Binary files a/modules/dnn/tutorials/images/build_4.png and /dev/null differ diff --git a/modules/dnn/tutorials/images/build_5.png b/modules/dnn/tutorials/images/build_5.png deleted file mode 100644 index bd187c6fb6..0000000000 Binary files a/modules/dnn/tutorials/images/build_5.png and /dev/null differ diff --git a/modules/dnn/tutorials/tutorial_dnn_build.markdown b/modules/dnn/tutorials/tutorial_dnn_build.markdown deleted file mode 100644 index 36f0fecbf8..0000000000 --- a/modules/dnn/tutorials/tutorial_dnn_build.markdown +++ /dev/null @@ -1,68 +0,0 @@ -Build opencv_contrib with dnn module {#tutorial_dnn_build} -==================================== - -Introduction ------------- -opencv_dnn module is placed in the secondary [opencv_contrib](https://github.com/opencv/opencv_contrib) repository, -which isn't distributed in binary form, therefore you need to build it manually. - -To do this you need to have installed: [CMake](http://www.cmake.org/download), git, and build system (*gcc* with *make* for Linux or *MS Visual Studio* for Windows) - -Steps ------ --# Make any directory, for example **opencv_root** - --# Clone [opencv](https://github.com/opencv/opencv) and [opencv_contrib](https://github.com/opencv/opencv_contrib) repos to the **opencv_root**. - You can do it in terminal like here: -@code -cd opencv_root -git clone https://github.com/opencv/opencv -git clone https://github.com/opencv/opencv_contrib -@endcode - --# Run [CMake-gui] and set source and build directories: - - - Set source code directory to **opencv_root**/opencv; - - - Set binaries directory, for example, to **opencv_root**/build_opencv. - This directory will contain built libraries. - ![](images/build_1.png) - --# Configure opencv: - - press *Configure*; - - choose the preferred project generator (Makefiles for Linux, MS Visual Studio for Windows); - - also you can set many opencv build options, for more details see @ref tutorial_linux_install. - ![](images/build_2.png) - --# In the appeared list of build parameters find parameter `OPENCV_EXTRA_MODULES_PATH` and set it to the **opencv_root**/opencv_contrib. - ![](images/build_3.png) - --# *Configure* the project again, and set build options of dnn module: - - - `BUILD_opencv_dnn` parameter must exist and be checked. - - - dnn module covers waste part of [Caffe](http://caffe.berkeleyvision.org) framework functionality. - However, to load Caffe networks libprotobuf is required. - You you can uncheck `BUILD_LIBPROTOBUF_FROM_SOURCES` flag to try use protobuf installed in your system. - Elsewise libpotobuf will be built from opencv sources. - - - You can additionally check `opencv_dnn_BUILD_TORCH_IMPORTER` parameter to build [Torch7](http://torch.ch/) importer. - It allows you to use networks, generated by [Torch7.nn](https://github.com/torch/nn/blob/master/README.md/) module. - ![](images/build_4.png) - --# Press *Configure* and *Generate*. - ![](images/build_5.png) - --# Build the generated project: - - If Makefiles generator on Unix was used, run the following in terminal: - @code - cd opencv_root/build_opencv - make all - @endcode - - If MS Visual Studio generator was used, then open OpenCV.sln from **opencv_root**/build_opencv folder in the Visual Studio, - and build it by choosing **Build** -> **Build Solution** menu or using **F7** short-cut. - --# Now you can build own program by using libraries were built into **opencv_root**/build_opencv/lib. - See the following tutorials to learn how to create a program using OpenCV: - - @ref tutorial_windows_install - - @ref tutorial_linux_gcc_cmake \ No newline at end of file diff --git a/modules/dnn/tutorials/tutorial_dnn_halide.markdown b/modules/dnn/tutorials/tutorial_dnn_halide.markdown index 4da0a5ac11..4bd038d45f 100644 --- a/modules/dnn/tutorials/tutorial_dnn_halide.markdown +++ b/modules/dnn/tutorials/tutorial_dnn_halide.markdown @@ -85,8 +85,6 @@ When you build OpenCV add the following configuration flags: - `HALIDE_ROOT_DIR` - path to Halide build directory -How to build OpenCV with DNN module you may find in @ref tutorial_dnn_build. - ## Sample @include dnn/squeezenet_halide.cpp