Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
2f3a9ba1
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 9 个月
通知
992
Star
71100
Fork
55581
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
2f3a9ba1
编写于
3月 28, 2018
作者:
D
Dmitry Kurtaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update OpenCVDetectInferenceEngine.cmake
上级
7972f47e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
18 deletion
+22
-18
cmake/OpenCVDetectInferenceEngine.cmake
cmake/OpenCVDetectInferenceEngine.cmake
+7
-10
modules/core/CMakeLists.txt
modules/core/CMakeLists.txt
+1
-1
modules/dnn/CMakeLists.txt
modules/dnn/CMakeLists.txt
+9
-1
modules/dnn/src/dnn.cpp
modules/dnn/src/dnn.cpp
+5
-6
未找到文件。
cmake/OpenCVDetectInferenceEngine.cmake
浏览文件 @
2f3a9ba1
...
...
@@ -46,9 +46,13 @@ endif()
set
(
INF_ENGINE_LIBRARIES
""
)
set
(
ie_lib_list inference_engine
)
if
(
UNIX
)
list
(
APPEND ie_lib_list mklml_intel iomp5
)
endif
()
link_directories
(
${
INTEL_CVSDK_DIR
}
/external/mklml_lnx/lib
${
INTEL_CVSDK_DIR
}
/inference_engine/external/mklml_lnx/lib
${
INTEL_CVSDK_DIR
}
/external/cldnn/lib
${
INTEL_CVSDK_DIR
}
/inference_engine/external/cldnn/lib
)
foreach
(
lib
${
ie_lib_list
}
)
find_library
(
${
lib
}
...
...
@@ -56,9 +60,6 @@ foreach(lib ${ie_lib_list})
# For inference_engine
HINTS
${
IE_PLUGINS_PATH
}
HINTS
"$ENV{IE_PLUGINS_PATH}"
# For mklml_intel, iomp5
HINTS
${
INTEL_CVSDK_DIR
}
/external/mklml_lnx/lib
HINTS
${
INTEL_CVSDK_DIR
}
/inference_engine/external/mklml_lnx/lib
)
if
(
NOT
${
lib
}
)
ie_fail
()
...
...
@@ -67,7 +68,3 @@ foreach(lib ${ie_lib_list})
endforeach
()
set
(
HAVE_INF_ENGINE TRUE
)
include_directories
(
${
INF_ENGINE_INCLUDE_DIRS
}
)
list
(
APPEND OPENCV_LINKER_LIBS
${
INF_ENGINE_LIBRARIES
}
)
add_definitions
(
-DHAVE_INF_ENGINE
)
modules/core/CMakeLists.txt
浏览文件 @
2f3a9ba1
...
...
@@ -59,7 +59,7 @@ ocv_create_module(${extra_libs})
ocv_target_link_libraries
(
${
the_module
}
LINK_PRIVATE
"
${
ZLIB_LIBRARIES
}
"
"
${
OPENCL_LIBRARIES
}
"
"
${
VA_LIBRARIES
}
"
"
${
LAPACK_LIBRARIES
}
"
"
${
CPUFEATURES_LIBRARIES
}
"
"
${
HALIDE_LIBRARIES
}
"
"
${
INF_ENGINE_LIBRARIES
}
"
"
${
LAPACK_LIBRARIES
}
"
"
${
CPUFEATURES_LIBRARIES
}
"
"
${
HALIDE_LIBRARIES
}
"
"
${
ITT_LIBRARIES
}
"
"
${
OPENCV_HAL_LINKER_LIBS
}
"
)
...
...
modules/dnn/CMakeLists.txt
浏览文件 @
2f3a9ba1
...
...
@@ -73,14 +73,22 @@ endif()
set
(
include_dirs
${
fw_inc
}
)
set
(
sources_options
""
)
set
(
libs libprotobuf
${
LAPACK_LIBRARIES
}
)
if
(
OPENCV_DNN_OPENCL AND HAVE_OPENCL
)
list
(
APPEND include_dirs
${
OPENCL_INCLUDE_DIRS
}
)
else
()
set
(
sources_options EXCLUDE_OPENCL
)
endif
()
if
(
WITH_INF_ENGINE AND HAVE_INF_ENGINE
)
add_definitions
(
-DHAVE_INF_ENGINE=1
)
list
(
APPEND include_dirs
${
INF_ENGINE_INCLUDE_DIRS
}
)
list
(
APPEND libs
${
INF_ENGINE_LIBRARIES
}
)
endif
()
ocv_module_include_directories
(
${
include_dirs
}
)
ocv_glob_module_sources
(
${
sources_options
}
SOURCES
${
fw_srcs
}
)
ocv_create_module
(
libprotobuf
${
LAPACK_LIBRARIES
}
)
ocv_create_module
(
${
libs
}
)
ocv_add_samples
()
ocv_add_accuracy_tests
()
ocv_add_perf_tests
()
...
...
modules/dnn/src/dnn.cpp
浏览文件 @
2f3a9ba1
...
...
@@ -1915,9 +1915,8 @@ Net::Net() : impl(new Net::Impl)
Net
Net
::
readFromModelOptimizer
(
const
String
&
xml
,
const
String
&
bin
)
{
Net
cvNet
;
#ifndef HAVE_INF_ENGINE
CV_Error
(
Error
::
StsError
,
"Build OpenCV with Inference Engine to enable loading models from Model Optimizer."
);
CV_Error
NoReturn
(
Error
::
StsError
,
"Build OpenCV with Inference Engine to enable loading models from Model Optimizer."
);
#else
InferenceEngine
::
CNNNetReader
reader
;
reader
.
ReadNetwork
(
xml
);
...
...
@@ -1931,6 +1930,7 @@ Net Net::readFromModelOptimizer(const String& xml, const String& bin)
inputsNames
.
push_back
(
it
.
first
);
}
Net
cvNet
;
cvNet
.
setInputsNames
(
inputsNames
);
Ptr
<
InfEngineBackendNode
>
backendNode
(
new
InfEngineBackendNode
(
0
));
...
...
@@ -1949,8 +1949,8 @@ Net Net::readFromModelOptimizer(const String& xml, const String& bin)
cvNet
.
setPreferableBackend
(
DNN_BACKEND_INFERENCE_ENGINE
);
cvNet
.
impl
->
skipInfEngineInit
=
true
;
#endif // HAVE_INF_ENGINE
return
cvNet
;
#endif // HAVE_INF_ENGINE
}
Net
::~
Net
()
...
...
@@ -2894,9 +2894,8 @@ Net readNet(const String& _model, const String& _config, const String& _framewor
std
::
swap
(
model
,
config
);
return
readNetFromModelOptimizer
(
config
,
model
);
}
CV_Error
(
Error
::
StsError
,
"Cannot determine an origin framework of files: "
+
model
+
(
config
.
empty
()
?
""
:
", "
+
config
));
return
Net
();
CV_ErrorNoReturn
(
Error
::
StsError
,
"Cannot determine an origin framework of files: "
+
model
+
(
config
.
empty
()
?
""
:
", "
+
config
));
}
Net
readNetFromModelOptimizer
(
const
String
&
xml
,
const
String
&
bin
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录