Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
9ff1c39d
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ff1c39d
编写于
12月 05, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
dnn: fixup available backends/targets
上级
fe459c82
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
11 deletion
+20
-11
modules/dnn/src/dnn.cpp
modules/dnn/src/dnn.cpp
+13
-10
modules/dnn/test/test_backends.cpp
modules/dnn/test/test_backends.cpp
+1
-1
modules/dnn/test/test_common.hpp
modules/dnn/test/test_common.hpp
+6
-0
未找到文件。
modules/dnn/src/dnn.cpp
浏览文件 @
9ff1c39d
...
@@ -74,6 +74,16 @@ static int PARAM_DNN_BACKEND_DEFAULT = (int)utils::getConfigurationParameterSize
...
@@ -74,6 +74,16 @@ static int PARAM_DNN_BACKEND_DEFAULT = (int)utils::getConfigurationParameterSize
#endif
#endif
);
);
// Additional checks (slowdowns execution!)
static
bool
DNN_CHECK_NAN_INF
=
utils
::
getConfigurationParameterBool
(
"OPENCV_DNN_CHECK_NAN_INF"
,
false
);
static
bool
DNN_CHECK_NAN_INF_DUMP
=
utils
::
getConfigurationParameterBool
(
"OPENCV_DNN_CHECK_NAN_INF_DUMP"
,
false
);
static
bool
DNN_CHECK_NAN_INF_RAISE_ERROR
=
utils
::
getConfigurationParameterBool
(
"OPENCV_DNN_CHECK_NAN_INF_RAISE_ERROR"
,
false
);
using
std
::
vector
;
using
std
::
map
;
using
std
::
make_pair
;
using
std
::
set
;
//==================================================================================================
//==================================================================================================
class
BackendRegistry
class
BackendRegistry
...
@@ -160,6 +170,9 @@ std::vector< std::pair<Backend, Target> > getAvailableBackends()
...
@@ -160,6 +170,9 @@ std::vector< std::pair<Backend, Target> > getAvailableBackends()
std
::
vector
<
Target
>
getAvailableTargets
(
Backend
be
)
std
::
vector
<
Target
>
getAvailableTargets
(
Backend
be
)
{
{
if
(
be
==
DNN_BACKEND_DEFAULT
)
be
=
(
Backend
)
PARAM_DNN_BACKEND_DEFAULT
;
std
::
vector
<
Target
>
result
;
std
::
vector
<
Target
>
result
;
const
BackendRegistry
::
BackendsList
all_backends
=
getAvailableBackends
();
const
BackendRegistry
::
BackendsList
all_backends
=
getAvailableBackends
();
for
(
BackendRegistry
::
BackendsList
::
const_iterator
i
=
all_backends
.
begin
();
i
!=
all_backends
.
end
();
++
i
)
for
(
BackendRegistry
::
BackendsList
::
const_iterator
i
=
all_backends
.
begin
();
i
!=
all_backends
.
end
();
++
i
)
...
@@ -172,16 +185,6 @@ std::vector<Target> getAvailableTargets(Backend be)
...
@@ -172,16 +185,6 @@ std::vector<Target> getAvailableTargets(Backend be)
//==================================================================================================
//==================================================================================================
// Additional checks (slowdowns execution!)
static
bool
DNN_CHECK_NAN_INF
=
utils
::
getConfigurationParameterBool
(
"OPENCV_DNN_CHECK_NAN_INF"
,
false
);
static
bool
DNN_CHECK_NAN_INF_DUMP
=
utils
::
getConfigurationParameterBool
(
"OPENCV_DNN_CHECK_NAN_INF_DUMP"
,
false
);
static
bool
DNN_CHECK_NAN_INF_RAISE_ERROR
=
utils
::
getConfigurationParameterBool
(
"OPENCV_DNN_CHECK_NAN_INF_RAISE_ERROR"
,
false
);
using
std
::
vector
;
using
std
::
map
;
using
std
::
make_pair
;
using
std
::
set
;
namespace
namespace
{
{
typedef
std
::
vector
<
MatShape
>
ShapesVec
;
typedef
std
::
vector
<
MatShape
>
ShapesVec
;
...
...
modules/dnn/test/test_backends.cpp
浏览文件 @
9ff1c39d
...
@@ -292,6 +292,6 @@ TEST_P(DNNTestNetwork, FastNeuralStyle_eccv16)
...
@@ -292,6 +292,6 @@ TEST_P(DNNTestNetwork, FastNeuralStyle_eccv16)
processNet
(
"dnn/fast_neural_style_eccv16_starry_night.t7"
,
""
,
inp
,
""
,
""
,
l1
,
lInf
);
processNet
(
"dnn/fast_neural_style_eccv16_starry_night.t7"
,
""
,
inp
,
""
,
""
,
l1
,
lInf
);
}
}
INSTANTIATE_TEST_CASE_P
(
/*nothing*/
,
DNNTestNetwork
,
dnnBackendsAndTargets
());
INSTANTIATE_TEST_CASE_P
(
/*nothing*/
,
DNNTestNetwork
,
dnnBackendsAndTargets
(
true
,
true
,
false
));
}}
// namespace
}}
// namespace
modules/dnn/test/test_common.hpp
浏览文件 @
9ff1c39d
...
@@ -236,8 +236,14 @@ testing::internal::ParamGenerator< tuple<Backend, Target> > dnnBackendsAndTarget
...
@@ -236,8 +236,14 @@ testing::internal::ParamGenerator< tuple<Backend, Target> > dnnBackendsAndTarget
{
{
available
=
getAvailableTargets
(
DNN_BACKEND_OPENCV
);
available
=
getAvailableTargets
(
DNN_BACKEND_OPENCV
);
for
(
std
::
vector
<
Target
>::
const_iterator
i
=
available
.
begin
();
i
!=
available
.
end
();
++
i
)
for
(
std
::
vector
<
Target
>::
const_iterator
i
=
available
.
begin
();
i
!=
available
.
end
();
++
i
)
{
if
(
!
withCpuOCV
&&
*
i
==
DNN_TARGET_CPU
)
continue
;
targets
.
push_back
(
make_tuple
(
DNN_BACKEND_OPENCV
,
*
i
));
targets
.
push_back
(
make_tuple
(
DNN_BACKEND_OPENCV
,
*
i
));
}
}
}
if
(
targets
.
empty
())
// validate at least CPU mode
targets
.
push_back
(
make_tuple
(
DNN_BACKEND_OPENCV
,
DNN_TARGET_CPU
));
return
testing
::
ValuesIn
(
targets
);
return
testing
::
ValuesIn
(
targets
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录