Skip to content

Commit 014ae55

Browse files
committed
cmake: update DL IE detection to align with OpenVINO 2018 R2
These CMake options are enough: - `-DWITH_INF_ENGINE=ON` - `-DIE_PLUGINS_PATH=lib/ubuntu_16.04/intel64` - `-DENABLE_CXX11=ON` (OpenCV 3.4 only)
1 parent 4a3dfff commit 014ae55

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

cmake/OpenCVDetectInferenceEngine.cmake

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,27 @@ macro(ie_fail)
1616
endmacro()
1717

1818
if(NOT HAVE_CXX11)
19+
message(WARNING "DL Inference engine requires C++11. You can turn it on via ENABLE_CXX11=ON CMake flag.")
1920
ie_fail()
2021
endif()
2122

23+
ocv_check_environment_variables(INTEL_CVSDK_DIR INF_ENGINE_ROOT_DIR IE_PLUGINS_PATH)
24+
2225
if(NOT INF_ENGINE_ROOT_DIR OR NOT EXISTS "${INF_ENGINE_ROOT_DIR}/include/inference_engine.hpp")
2326
set(ie_root_paths "${INF_ENGINE_ROOT_DIR}")
24-
if(DEFINED ENV{INTEL_CVSDK_DIR})
25-
list(APPEND ie_root_paths "$ENV{INTEL_CVSDK_DIR}")
26-
list(APPEND ie_root_paths "$ENV{INTEL_CVSDK_DIR}/inference_engine")
27-
endif()
2827
if(DEFINED INTEL_CVSDK_DIR)
29-
list(APPEND ie_root_paths "${INTEL_CVSDK_DIR}")
30-
list(APPEND ie_root_paths "${INTEL_CVSDK_DIR}/inference_engine")
28+
list(APPEND ie_root_paths "${INTEL_CVSDK_DIR}/")
29+
list(APPEND ie_root_paths "${INTEL_CVSDK_DIR}/deployment_tools/inference_engine")
3130
endif()
3231

3332
if(NOT ie_root_paths)
34-
list(APPEND ie_root_paths "/opt/intel/deeplearning_deploymenttoolkit/deployment_tools/inference_engine")
33+
list(APPEND ie_root_paths "/opt/intel/computer_vision_sdk/deployment_tools/inference_engine/")
3534
endif()
3635

3736
find_path(INF_ENGINE_ROOT_DIR include/inference_engine.hpp PATHS ${ie_root_paths})
37+
if(INF_ENGINE_ROOT_DIR MATCHES "-NOTFOUND$")
38+
unset(INF_ENGINE_ROOT_DIR CACHE)
39+
endif()
3840
endif()
3941

4042
set(INF_ENGINE_INCLUDE_DIRS "${INF_ENGINE_ROOT_DIR}/include" CACHE PATH "Path to Inference Engine include directory")
@@ -43,26 +45,27 @@ if(NOT INF_ENGINE_ROOT_DIR
4345
OR NOT EXISTS "${INF_ENGINE_ROOT_DIR}"
4446
OR NOT EXISTS "${INF_ENGINE_ROOT_DIR}/include/inference_engine.hpp"
4547
)
48+
message(WARNING "DL IE: Can't detect INF_ENGINE_ROOT_DIR location.")
4649
ie_fail()
4750
endif()
4851

4952
set(INF_ENGINE_LIBRARIES "")
5053

5154
set(ie_lib_list inference_engine)
5255

56+
if(NOT IS_ABSOLUTE "${IE_PLUGINS_PATH}")
57+
set(IE_PLUGINS_PATH "${INF_ENGINE_ROOT_DIR}/${IE_PLUGINS_PATH}")
58+
endif()
59+
5360
link_directories(
54-
${INTEL_CVSDK_DIR}/inference_engine/external/mkltiny_lnx/lib
55-
${INTEL_CVSDK_DIR}/inference_engine/external/cldnn/lib
61+
${INF_ENGINE_ROOT_DIR}/external/mkltiny_lnx/lib
62+
${INF_ENGINE_ROOT_DIR}/external/cldnn/lib
5663
)
5764

5865
foreach(lib ${ie_lib_list})
59-
find_library(${lib}
60-
NAMES ${lib}
61-
# For inference_engine
62-
HINTS ${IE_PLUGINS_PATH}
63-
HINTS "$ENV{IE_PLUGINS_PATH}"
64-
)
66+
find_library(${lib} NAMES ${lib} HINTS ${IE_PLUGINS_PATH})
6567
if(NOT ${lib})
68+
message(WARNING "DL IE: Can't find library: '${lib}'")
6669
ie_fail()
6770
endif()
6871
list(APPEND INF_ENGINE_LIBRARIES ${${lib}})

0 commit comments

Comments
 (0)