third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11566 from mshabunin:allow-ie-force

Browse Source
This commit is contained in:
Alexander Alekhin 2018-05-22 14:12:32 +00:00
commit 2fc713bb94
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVDetectInferenceEngine.cmake
View File

@ -30,7 +30,7 @@ if(NOT INF_ENGINE_ROOT_DIR OR NOT EXISTS "${INF_ENGINE_ROOT_DIR}/include/inferen
list(APPEND ie_root_paths "${INTEL_CVSDK_DIR}/inference_engine")
endif()
if(WITH_INF_ENGINE AND NOT ie_root_paths)
if(NOT ie_root_paths)
list(APPEND ie_root_paths "/opt/intel/deeplearning_deploymenttoolkit/deployment_tools/inference_engine")
endif()

2
modules/dnn/CMakeLists.txt
View File

@ -80,7 +80,7 @@ else()
set(sources_options EXCLUDE_OPENCL)
endif()
if(WITH_INF_ENGINE AND HAVE_INF_ENGINE)
if(HAVE_INF_ENGINE)
add_definitions(-DHAVE_INF_ENGINE=1)
list(APPEND include_dirs ${INF_ENGINE_INCLUDE_DIRS})
list(APPEND libs ${INF_ENGINE_LIBRARIES})

4
modules/dnn/src/op_inf_engine.cpp
View File

@ -192,6 +192,10 @@ void InfEngineBackendNet::getName(char*, size_t) noexcept
{
}
void InfEngineBackendNet::getName(char*, size_t) const noexcept
{
}
size_t InfEngineBackendNet::layerCount() noexcept
{
return layers.size();

4
modules/dnn/src/op_inf_engine.hpp
View File

@ -46,7 +46,9 @@ public:
virtual InferenceEngine::InputInfo::Ptr getInput(const std::string &inputName) noexcept CV_OVERRIDE;
virtual void getName(char *pName, size_t len) noexcept CV_OVERRIDE;
virtual void getName(char *pName, size_t len) noexcept;
virtual void getName(char *pName, size_t len) const noexcept;
virtual size_t layerCount() noexcept CV_OVERRIDE;