Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
e56e4876
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
e56e4876
编写于
3月 24, 2021
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
dnn(test): update tests for OpenVINO 2021.3
上级
56bdd7db
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
65 addition
and
2 deletion
+65
-2
modules/dnn/test/test_common.hpp
modules/dnn/test/test_common.hpp
+1
-0
modules/dnn/test/test_common.impl.hpp
modules/dnn/test/test_common.impl.hpp
+2
-2
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
+4
-0
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_layers.cpp
+5
-0
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
+21
-0
modules/dnn/test/test_tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
+18
-0
modules/dnn/test/test_torch_importer.cpp
modules/dnn/test/test_torch_importer.cpp
+14
-0
未找到文件。
modules/dnn/test/test_common.hpp
浏览文件 @
e56e4876
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
#define CV_TEST_TAG_DNN_SKIP_IE_2019R1_1 "dnn_skip_ie_2019r1_1"
#define CV_TEST_TAG_DNN_SKIP_IE_2019R1_1 "dnn_skip_ie_2019r1_1"
#define CV_TEST_TAG_DNN_SKIP_IE_2019R2 "dnn_skip_ie_2019r2"
#define CV_TEST_TAG_DNN_SKIP_IE_2019R2 "dnn_skip_ie_2019r2"
#define CV_TEST_TAG_DNN_SKIP_IE_2019R3 "dnn_skip_ie_2019r3"
#define CV_TEST_TAG_DNN_SKIP_IE_2019R3 "dnn_skip_ie_2019r3"
#define CV_TEST_TAG_DNN_SKIP_IE_CPU "dnn_skip_ie_cpu"
#define CV_TEST_TAG_DNN_SKIP_IE_OPENCL "dnn_skip_ie_ocl"
#define CV_TEST_TAG_DNN_SKIP_IE_OPENCL "dnn_skip_ie_ocl"
#define CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16 "dnn_skip_ie_ocl_fp16"
#define CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16 "dnn_skip_ie_ocl_fp16"
#define CV_TEST_TAG_DNN_SKIP_IE_MYRIAD_2 "dnn_skip_ie_myriad2"
#define CV_TEST_TAG_DNN_SKIP_IE_MYRIAD_2 "dnn_skip_ie_myriad2"
...
...
modules/dnn/test/test_common.impl.hpp
浏览文件 @
e56e4876
...
@@ -385,13 +385,13 @@ void initDNNTests()
...
@@ -385,13 +385,13 @@ void initDNNTests()
#ifdef HAVE_DNN_IE_NN_BUILDER_2019
#ifdef HAVE_DNN_IE_NN_BUILDER_2019
CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER
,
CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER
,
#endif
#endif
""
CV_TEST_TAG_DNN_SKIP_IE_CPU
);
);
#endif
registerGlobalSkipTag
(
registerGlobalSkipTag
(
// see validateVPUType(): CV_TEST_TAG_DNN_SKIP_IE_MYRIAD_2, CV_TEST_TAG_DNN_SKIP_IE_MYRIAD_X
// see validateVPUType(): CV_TEST_TAG_DNN_SKIP_IE_MYRIAD_2, CV_TEST_TAG_DNN_SKIP_IE_MYRIAD_X
CV_TEST_TAG_DNN_SKIP_IE_OPENCL
,
CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16
CV_TEST_TAG_DNN_SKIP_IE_OPENCL
,
CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16
);
);
#endif
}
}
}
// namespace
}
// namespace
modules/dnn/test/test_darknet_importer.cpp
浏览文件 @
e56e4876
...
@@ -694,6 +694,10 @@ TEST_P(Test_Darknet_layers, shortcut)
...
@@ -694,6 +694,10 @@ TEST_P(Test_Darknet_layers, shortcut)
TEST_P
(
Test_Darknet_layers
,
upsample
)
TEST_P
(
Test_Darknet_layers
,
upsample
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
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
);
// exception
#endif
testDarknetLayer
(
"upsample"
);
testDarknetLayer
(
"upsample"
);
}
}
...
...
modules/dnn/test/test_layers.cpp
浏览文件 @
e56e4876
...
@@ -1553,6 +1553,11 @@ TEST_P(Test_Caffe_layers, Interp)
...
@@ -1553,6 +1553,11 @@ TEST_P(Test_Caffe_layers, Interp)
TEST_P
(
Test_Caffe_layers
,
DISABLED_Interp
)
// requires patched protobuf (available in OpenCV source tree only)
TEST_P
(
Test_Caffe_layers
,
DISABLED_Interp
)
// requires patched protobuf (available in OpenCV source tree only)
#endif
#endif
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
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
);
// exception
#endif
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019
&&
target
==
DNN_TARGET_MYRIAD
)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019
&&
target
==
DNN_TARGET_MYRIAD
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
);
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
);
...
...
modules/dnn/test/test_onnx_importer.cpp
浏览文件 @
e56e4876
...
@@ -406,11 +406,19 @@ TEST_P(Test_ONNX_layers, BatchNormalization3D)
...
@@ -406,11 +406,19 @@ TEST_P(Test_ONNX_layers, BatchNormalization3D)
TEST_P
(
Test_ONNX_layers
,
BatchNormalizationUnfused
)
TEST_P
(
Test_ONNX_layers
,
BatchNormalizationUnfused
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
&&
target
==
DNN_TARGET_CPU
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_CPU
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// exception
#endif
testONNXModels
(
"frozenBatchNorm2d"
);
testONNXModels
(
"frozenBatchNorm2d"
);
}
}
TEST_P
(
Test_ONNX_layers
,
BatchNormalizationSubgraph
)
TEST_P
(
Test_ONNX_layers
,
BatchNormalizationSubgraph
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
&&
target
==
DNN_TARGET_CPU
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_CPU
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// exception
#endif
testONNXModels
(
"batch_norm_subgraph"
);
testONNXModels
(
"batch_norm_subgraph"
);
}
}
...
@@ -746,6 +754,13 @@ TEST_P(Test_ONNX_layers, Conv1d_variable_weight_bias)
...
@@ -746,6 +754,13 @@ TEST_P(Test_ONNX_layers, Conv1d_variable_weight_bias)
TEST_P
(
Test_ONNX_layers
,
GatherMultiOutput
)
TEST_P
(
Test_ONNX_layers
,
GatherMultiOutput
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
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
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// exception
#endif
#if defined(INF_ENGINE_RELEASE)
#if defined(INF_ENGINE_RELEASE)
if
(
target
==
DNN_TARGET_MYRIAD
)
if
(
target
==
DNN_TARGET_MYRIAD
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE
);
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE
);
...
@@ -842,6 +857,7 @@ TEST_P(Test_ONNX_layers, PoolConv1d)
...
@@ -842,6 +857,7 @@ TEST_P(Test_ONNX_layers, PoolConv1d)
TEST_P
(
Test_ONNX_layers
,
ConvResizePool1d
)
TEST_P
(
Test_ONNX_layers
,
ConvResizePool1d
)
{
{
#if defined(INF_ENGINE_RELEASE)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019
)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019
)
{
{
if
(
target
==
DNN_TARGET_MYRIAD
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER
);
if
(
target
==
DNN_TARGET_MYRIAD
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER
);
...
@@ -849,7 +865,12 @@ TEST_P(Test_ONNX_layers, ConvResizePool1d)
...
@@ -849,7 +865,12 @@ TEST_P(Test_ONNX_layers, ConvResizePool1d)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
)
{
{
if
(
target
==
DNN_TARGET_MYRIAD
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
if
(
target
==
DNN_TARGET_MYRIAD
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
#if INF_ENGINE_VER_MAJOR_EQ(2021030000)
if
(
target
==
DNN_TARGET_OPENCL
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_OPENCL
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// exception
if
(
target
==
DNN_TARGET_OPENCL_FP16
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// exception
#endif
}
}
#endif
testONNXModels
(
"conv_resize_pool_1d"
);
testONNXModels
(
"conv_resize_pool_1d"
);
}
}
...
...
modules/dnn/test/test_tf_importer.cpp
浏览文件 @
e56e4876
...
@@ -230,6 +230,12 @@ TEST_P(Test_TensorFlow_layers, pad_and_concat)
...
@@ -230,6 +230,12 @@ TEST_P(Test_TensorFlow_layers, pad_and_concat)
TEST_P
(
Test_TensorFlow_layers
,
concat_axis_1
)
TEST_P
(
Test_TensorFlow_layers
,
concat_axis_1
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
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
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// exception
#endif
runTensorFlowNet
(
"concat_axis_1"
);
runTensorFlowNet
(
"concat_axis_1"
);
}
}
...
@@ -290,6 +296,10 @@ TEST_P(Test_TensorFlow_layers, batch_norm_10)
...
@@ -290,6 +296,10 @@ TEST_P(Test_TensorFlow_layers, batch_norm_10)
}
}
TEST_P
(
Test_TensorFlow_layers
,
batch_norm_11
)
TEST_P
(
Test_TensorFlow_layers
,
batch_norm_11
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
&&
target
==
DNN_TARGET_CPU
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_CPU
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// nan
#endif
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NGRAPH
&&
target
==
DNN_TARGET_MYRIAD
)
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
);
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_MYRIAD
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
runTensorFlowNet
(
"mvn_batch_norm_1x1"
);
runTensorFlowNet
(
"mvn_batch_norm_1x1"
);
...
@@ -1018,12 +1028,20 @@ TEST_P(Test_TensorFlow_layers, keras_mobilenet_head)
...
@@ -1018,12 +1028,20 @@ TEST_P(Test_TensorFlow_layers, keras_mobilenet_head)
// TF case: align_corners=False, half_pixel_centers=False
// TF case: align_corners=False, half_pixel_centers=False
TEST_P
(
Test_TensorFlow_layers
,
resize_bilinear
)
TEST_P
(
Test_TensorFlow_layers
,
resize_bilinear
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
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
);
// exception
#endif
runTensorFlowNet
(
"resize_bilinear"
);
runTensorFlowNet
(
"resize_bilinear"
);
}
}
// TF case: align_corners=True, half_pixel_centers=False
// TF case: align_corners=True, half_pixel_centers=False
TEST_P
(
Test_TensorFlow_layers
,
resize_bilinear_align_corners
)
TEST_P
(
Test_TensorFlow_layers
,
resize_bilinear_align_corners
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
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
);
// exception
#endif
runTensorFlowNet
(
"resize_bilinear"
,
runTensorFlowNet
(
"resize_bilinear"
,
false
,
0.0
,
0.0
,
false
,
// default parameters
false
,
0.0
,
0.0
,
false
,
// default parameters
"_align_corners"
);
"_align_corners"
);
...
...
modules/dnn/test/test_torch_importer.cpp
浏览文件 @
e56e4876
...
@@ -242,6 +242,15 @@ TEST_P(Test_Torch_layers, net_padding)
...
@@ -242,6 +242,15 @@ TEST_P(Test_Torch_layers, net_padding)
TEST_P
(
Test_Torch_layers
,
net_non_spatial
)
TEST_P
(
Test_Torch_layers
,
net_non_spatial
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
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
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
)
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16
,
CV_TEST_TAG_DNN_SKIP_IE_NGRAPH
);
// exception
#endif
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019
&&
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019
&&
(
target
==
DNN_TARGET_OPENCL
||
target
==
DNN_TARGET_OPENCL_FP16
))
(
target
==
DNN_TARGET_OPENCL
||
target
==
DNN_TARGET_OPENCL_FP16
))
applyTestTag
(
target
==
DNN_TARGET_OPENCL
?
CV_TEST_TAG_DNN_SKIP_IE_OPENCL
:
CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16
,
applyTestTag
(
target
==
DNN_TARGET_OPENCL
?
CV_TEST_TAG_DNN_SKIP_IE_OPENCL
:
CV_TEST_TAG_DNN_SKIP_IE_OPENCL_FP16
,
...
@@ -537,6 +546,11 @@ private:
...
@@ -537,6 +546,11 @@ private:
TEST_P
(
Test_Torch_layers
,
upsampling_nearest
)
TEST_P
(
Test_Torch_layers
,
upsampling_nearest
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000)
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
);
// TODO
#endif
// Test a custom layer.
// Test a custom layer.
CV_DNN_REGISTER_LAYER_CLASS
(
SpatialUpSamplingNearest
,
SpatialUpSamplingNearestLayer
);
CV_DNN_REGISTER_LAYER_CLASS
(
SpatialUpSamplingNearest
,
SpatialUpSamplingNearestLayer
);
try
try
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录