From 890bbb0bdbb3cd49e119e55b129e7a428ce2f9b0 Mon Sep 17 00:00:00 2001 From: Alexey Suhov Date: Mon, 7 Oct 2019 16:27:36 +0300 Subject: [PATCH] removed opencv from benchmark_app; disabled vpu, gna, gpu plugin builds; disabled opencv by default --- inference-engine/README.md | 6 ++---- inference-engine/cmake/features.cmake | 14 +++++++------- .../samples/benchmark_app/CMakeLists.txt | 3 +-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/inference-engine/README.md b/inference-engine/README.md index 6b06c8ecfa9..c839cdba925 100644 --- a/inference-engine/README.md +++ b/inference-engine/README.md @@ -52,7 +52,7 @@ The software was validated on: ``` 5. Inference Engine uses a CMake-based build system. In the created `build` directory, run `cmake` to fetch project dependencies and create Unix makefiles, then run `make` to build the project: ```sh - cmake -DCMAKE_BUILD_TYPE=Release -DTHREADING=OMP .. + cmake -DCMAKE_BUILD_TYPE=Release .. make --jobs=$(nproc --all) ``` @@ -60,9 +60,7 @@ The software was validated on: You can use the following additional build options: -- Threading Building Blocks (TBB) is used by default. For MLPerf we recommend to build the Inference Engine with OpenMP* (see previous section). - -- Required versions of TBB and OpenCV packages are downloaded automatically by the CMake-based script. If you want to use the automatically downloaded packages but you already have installed TBB or OpenCV packages configured in your environment, you may need to clean the `TBBROOT` and `OpenCV_DIR` environment variables before running the `cmake` command, otherwise they won't be downloaded and the build may fail if incompatible versions were installed. +- Required versions of TBB/OMP and OpenCV packages are downloaded automatically by the CMake-based script. If you want to use the automatically downloaded packages but you already have installed TBB or OpenCV packages configured in your environment, you may need to clean the `TBBROOT` and `OpenCV_DIR` environment variables before running the `cmake` command, otherwise they won't be downloaded and the build may fail if incompatible versions were installed. - If the CMake-based build script can not find and download the OpenCV package that is supported on your platform, or if you want to use a custom build of the OpenCV library, refer to the [Use Custom OpenCV Builds](#use-custom-opencv-builds-for-inference-engine) section for details. diff --git a/inference-engine/cmake/features.cmake b/inference-engine/cmake/features.cmake index 73b009498a2..31d2322fba7 100644 --- a/inference-engine/cmake/features.cmake +++ b/inference-engine/cmake/features.cmake @@ -7,12 +7,12 @@ include (options) #these options are aimed to optimize build time on development system #backed targets -ie_option (ENABLE_GNA "GNA support for inference engine" ON) -ie_option (ENABLE_ROCKHOPER "use Rockhopper decoder for converting / output scores" ON) +ie_option (ENABLE_GNA "GNA support for inference engine" OFF) +ie_option (ENABLE_ROCKHOPER "use Rockhopper decoder for converting / output scores" OFF) ie_option (ENABLE_MKL_DNN "MKL-DNN plugin for inference engine" ON) -ie_option (ENABLE_CLDNN "clDnn based plugin for inference engine" ON) +ie_option (ENABLE_CLDNN "clDnn based plugin for inference engine" OFF) ie_option (ENABLE_CLDNN_TESTS "Enable clDNN unit tests" OFF) @@ -37,15 +37,15 @@ if (NOT THREADING STREQUAL "TBB" AND NOT THREADING STREQUAL "TBB_AUTO" AND NOT THREADING STREQUAL "OMP" AND NOT THREADING STREQUAL "SEQ") - set (THREADING "TBB") + set (THREADING "OMP") message(STATUS "THREADING should be set to TBB, TBB_AUTO, OMP or SEQ. Default option is " ${THREADING}) endif() set(THREADING "${THREADING}" CACHE STRING "Threading" FORCE) list (APPEND IE_OPTIONS THREADING) -ie_option (ENABLE_VPU "vpu targeted plugins for inference engine" ON) +ie_option (ENABLE_VPU "vpu targeted plugins for inference engine" OFF) -ie_option (ENABLE_MYRIAD "myriad targeted plugin for inference engine" ON) +ie_option (ENABLE_MYRIAD "myriad targeted plugin for inference engine" OFF) ie_option (ENABLE_MYRIAD_NO_BOOT "myriad plugin will skip device boot" OFF) @@ -77,7 +77,7 @@ ie_option (ENABLE_OBJECT_DETECTION_TESTS "object detection tests" ON) ie_option (ENABLE_DUMP "enables mode for dumping per layer information" OFF) -ie_option (ENABLE_OPENCV "enables OpenCV" ON) +ie_option (ENABLE_OPENCV "enables OpenCV" OFF) ie_option (OS_FOLDER "create OS dedicated folder in output" OFF) diff --git a/inference-engine/samples/benchmark_app/CMakeLists.txt b/inference-engine/samples/benchmark_app/CMakeLists.txt index bd2d6672d9e..7a82d375090 100644 --- a/inference-engine/samples/benchmark_app/CMakeLists.txt +++ b/inference-engine/samples/benchmark_app/CMakeLists.txt @@ -8,5 +8,4 @@ file (GLOB HDR ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) ie_add_sample(NAME benchmark_app SOURCES ${SRC} HEADERS ${HDR} - DEPENDENCIES format_reader - OPENCV_DEPENDENCIES imgcodecs) + DEPENDENCIES format_reader)