Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
6797fd65
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 9 个月
通知
994
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 搜索 >>
提交
6797fd65
编写于
6月 29, 2021
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
dnn(test): update tests for OpenVINO 2021.4
上级
7d842f5b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
7 deletion
+21
-7
modules/dnn/test/test_backends.cpp
modules/dnn/test/test_backends.cpp
+5
-5
modules/dnn/test/test_ie_models.cpp
modules/dnn/test/test_ie_models.cpp
+9
-0
modules/dnn/test/test_torch_importer.cpp
modules/dnn/test/test_torch_importer.cpp
+7
-2
未找到文件。
modules/dnn/test/test_backends.cpp
浏览文件 @
6797fd65
...
...
@@ -196,7 +196,7 @@ TEST_P(DNNTestNetwork, MobileNet_SSD_Caffe)
Mat
inp
=
blobFromImage
(
sample
,
1.0
f
/
127.5
,
Size
(
300
,
300
),
Scalar
(
127.5
,
127.5
,
127.5
),
false
);
float
diffScores
=
(
target
==
DNN_TARGET_OPENCL_FP16
||
target
==
DNN_TARGET_MYRIAD
)
?
1.5e-2
:
0.0
;
float
diffSquares
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.063
:
0.0
;
float
detectionConfThresh
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.2
5
2
:
FLT_MIN
;
float
detectionConfThresh
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.2
6
2
:
FLT_MIN
;
processNet
(
"dnn/MobileNetSSD_deploy.caffemodel"
,
"dnn/MobileNetSSD_deploy.prototxt"
,
inp
,
"detection_out"
,
""
,
diffScores
,
diffSquares
,
detectionConfThresh
);
expectNoFallbacksFromIE
(
net
);
...
...
@@ -301,8 +301,8 @@ TEST_P(DNNTestNetwork, OpenPose_pose_coco)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD_X
,
CV_TEST_TAG_DNN_SKIP_IE_VERSION
);
#endif
const
float
l1
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.00
56
:
0.0
;
const
float
lInf
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.0
72
:
0.0
;
const
float
l1
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.00
9
:
0.0
;
const
float
lInf
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.0
9
:
0.0
;
processNet
(
"dnn/openpose_pose_coco.caffemodel"
,
"dnn/openpose_pose_coco.prototxt"
,
Size
(
46
,
46
),
""
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
...
...
@@ -321,8 +321,8 @@ TEST_P(DNNTestNetwork, OpenPose_pose_mpi)
#endif
// output range: [-0.001, 0.97]
const
float
l1
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.0
1
2
:
0.0
;
const
float
lInf
=
(
target
==
DNN_TARGET_MYRIAD
||
target
==
DNN_TARGET_OPENCL_FP16
)
?
0.
16
:
0.0
;
const
float
l1
=
(
target
==
DNN_TARGET_MYRIAD
)
?
0.02
:
0.0
;
const
float
lInf
=
(
target
==
DNN_TARGET_MYRIAD
||
target
==
DNN_TARGET_OPENCL_FP16
)
?
0.
2
:
0.0
;
processNet
(
"dnn/openpose_pose_mpi.caffemodel"
,
"dnn/openpose_pose_mpi.prototxt"
,
Size
(
46
,
46
),
""
,
""
,
l1
,
lInf
);
expectNoFallbacksFromIE
(
net
);
...
...
modules/dnn/test/test_ie_models.cpp
浏览文件 @
6797fd65
...
...
@@ -288,6 +288,15 @@ TEST_P(DNNTestOpenVINO, models)
ASSERT_FALSE
(
backendId
!=
DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019
&&
backendId
!=
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
)
<<
"Inference Engine backend is required"
;
#if INF_ENGINE_VER_MAJOR_EQ(2021040000)
if
(
targetId
==
DNN_TARGET_MYRIAD
&&
(
modelName
==
"person-detection-retail-0013"
||
// ncDeviceOpen:1013 Failed to find booted device after boot
modelName
==
"age-gender-recognition-retail-0013"
// ncDeviceOpen:1013 Failed to find booted device after boot
)
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
,
CV_TEST_TAG_DNN_SKIP_IE_VERSION
);
#endif
#if INF_ENGINE_VER_MAJOR_GE(2020020000)
if
(
targetId
==
DNN_TARGET_MYRIAD
&&
backendId
==
DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019
)
{
...
...
modules/dnn/test/test_torch_importer.cpp
浏览文件 @
6797fd65
...
...
@@ -254,9 +254,14 @@ TEST_P(Test_Torch_layers, net_padding)
TEST_P
(
Test_Torch_layers
,
net_non_spatial
)
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
#if defined(INF_ENGINE_RELEASE) && ( \
INF_ENGINE_VER_MAJOR_EQ(2021030000) || \
INF_ENGINE_VER_MAJOR_EQ(2021040000) \
)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
&&
target
==
DNN_TARGET_MYRIAD
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// crash
// 2021.3: crash
// 2021.4: [ GENERAL_ERROR ] AssertionFailed: !out.networkInputs.empty()
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
&&
target
==
DNN_TARGET_OPENCL
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_OPENCL
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// exception
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
&&
target
==
DNN_TARGET_OPENCL_FP16
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录