Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c918ac29
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,发现更多精彩内容 >>
提交
c918ac29
编写于
1月 31, 2019
作者:
D
Dmitry Kurtaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix IE tests
上级
eb00dce7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
24 addition
and
9 deletion
+24
-9
modules/dnn/src/layers/blank_layer.cpp
modules/dnn/src/layers/blank_layer.cpp
+16
-5
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/convolution_layer.cpp
+1
-1
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_layers.cpp
+4
-0
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
+1
-1
modules/dnn/test/test_tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
+2
-2
未找到文件。
modules/dnn/src/layers/blank_layer.cpp
浏览文件 @
c918ac29
...
@@ -110,14 +110,25 @@ public:
...
@@ -110,14 +110,25 @@ public:
virtual
Ptr
<
BackendNode
>
initInfEngine
(
const
std
::
vector
<
Ptr
<
BackendWrapper
>
>&
inputs
)
CV_OVERRIDE
virtual
Ptr
<
BackendNode
>
initInfEngine
(
const
std
::
vector
<
Ptr
<
BackendWrapper
>
>&
inputs
)
CV_OVERRIDE
{
{
#ifdef HAVE_INF_ENGINE
#ifdef HAVE_INF_ENGINE
InferenceEngine
::
DataPtr
input
=
infEngineDataNode
(
inputs
[
0
]);
CV_Assert
(
!
input
->
dims
.
empty
());
#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2018R5)
#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2018R5)
InferenceEngine
::
Builder
::
SplitLayer
ieLayer
(
name
);
InferenceEngine
::
Builder
::
Layer
ieLayer
(
name
);
ieLayer
.
setOutputPorts
({
InferenceEngine
::
Port
()});
ieLayer
.
setName
(
name
);
if
(
preferableTarget
==
DNN_TARGET_MYRIAD
)
{
ieLayer
.
setType
(
"Copy"
);
}
else
{
ieLayer
.
setType
(
"Split"
);
ieLayer
.
getParameters
()[
"axis"
]
=
input
->
dims
.
size
()
-
1
;
ieLayer
.
getParameters
()[
"out_sizes"
]
=
input
->
dims
[
0
];
}
ieLayer
.
setInputPorts
(
std
::
vector
<
InferenceEngine
::
Port
>
(
1
));
ieLayer
.
setOutputPorts
(
std
::
vector
<
InferenceEngine
::
Port
>
(
1
));
return
Ptr
<
BackendNode
>
(
new
InfEngineBackendNode
(
ieLayer
));
return
Ptr
<
BackendNode
>
(
new
InfEngineBackendNode
(
ieLayer
));
#else
#else
InferenceEngine
::
DataPtr
input
=
infEngineDataNode
(
inputs
[
0
]);
CV_Assert
(
!
input
->
dims
.
empty
());
InferenceEngine
::
LayerParams
lp
;
InferenceEngine
::
LayerParams
lp
;
lp
.
name
=
name
;
lp
.
name
=
name
;
lp
.
type
=
"Split"
;
lp
.
type
=
"Split"
;
...
...
modules/dnn/src/layers/convolution_layer.cpp
浏览文件 @
c918ac29
...
@@ -1150,7 +1150,7 @@ public:
...
@@ -1150,7 +1150,7 @@ public:
#ifdef HAVE_INF_ENGINE
#ifdef HAVE_INF_ENGINE
if
(
backendId
==
DNN_BACKEND_INFERENCE_ENGINE
)
if
(
backendId
==
DNN_BACKEND_INFERENCE_ENGINE
)
{
{
if
(
INF_ENGINE_RELEASE
=
=
2018050000
&&
(
adjustPad
.
height
||
adjustPad
.
width
))
if
(
INF_ENGINE_RELEASE
>
=
2018050000
&&
(
adjustPad
.
height
||
adjustPad
.
width
))
return
false
;
return
false
;
const
int
outGroupCn
=
blobs
[
0
].
size
[
1
];
// Weights are in IOHW layout
const
int
outGroupCn
=
blobs
[
0
].
size
[
1
];
// Weights are in IOHW layout
...
...
modules/dnn/test/test_layers.cpp
浏览文件 @
c918ac29
...
@@ -236,6 +236,10 @@ TEST_P(Test_Caffe_layers, Dropout)
...
@@ -236,6 +236,10 @@ TEST_P(Test_Caffe_layers, Dropout)
TEST_P
(
Test_Caffe_layers
,
Concat
)
TEST_P
(
Test_Caffe_layers
,
Concat
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_RELEASE > 2018050000
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
)
throw
SkipTestException
(
""
);
#endif
testLayerUsingCaffeModels
(
"layer_concat"
);
testLayerUsingCaffeModels
(
"layer_concat"
);
testLayerUsingCaffeModels
(
"layer_concat_optim"
,
true
,
false
);
testLayerUsingCaffeModels
(
"layer_concat_optim"
,
true
,
false
);
testLayerUsingCaffeModels
(
"layer_concat_shared_input"
,
true
,
false
);
testLayerUsingCaffeModels
(
"layer_concat_shared_input"
,
true
,
false
);
...
...
modules/dnn/test/test_onnx_importer.cpp
浏览文件 @
c918ac29
...
@@ -395,7 +395,7 @@ TEST_P(Test_ONNX_nets, DenseNet121)
...
@@ -395,7 +395,7 @@ TEST_P(Test_ONNX_nets, DenseNet121)
TEST_P
(
Test_ONNX_nets
,
Inception_v1
)
TEST_P
(
Test_ONNX_nets
,
Inception_v1
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_RELEASE
=
= 2018050000
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_RELEASE
>
= 2018050000
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
)
throw
SkipTestException
(
"Test is disabled for OpenVINO 2018R5"
);
throw
SkipTestException
(
"Test is disabled for OpenVINO 2018R5"
);
#endif
#endif
...
...
modules/dnn/test/test_tf_importer.cpp
浏览文件 @
c918ac29
...
@@ -241,7 +241,7 @@ TEST_P(Test_TensorFlow_layers, unfused_flatten)
...
@@ -241,7 +241,7 @@ TEST_P(Test_TensorFlow_layers, unfused_flatten)
TEST_P
(
Test_TensorFlow_layers
,
leaky_relu
)
TEST_P
(
Test_TensorFlow_layers
,
leaky_relu
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_RELEASE
=
= 2018050000
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_RELEASE
>
= 2018050000
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_OPENCL
)
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_OPENCL
)
throw
SkipTestException
(
""
);
throw
SkipTestException
(
""
);
#endif
#endif
...
@@ -388,7 +388,7 @@ TEST_P(Test_TensorFlow_nets, Faster_RCNN)
...
@@ -388,7 +388,7 @@ TEST_P(Test_TensorFlow_nets, Faster_RCNN)
TEST_P
(
Test_TensorFlow_nets
,
MobileNet_v1_SSD_PPN
)
TEST_P
(
Test_TensorFlow_nets
,
MobileNet_v1_SSD_PPN
)
{
{
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_RELEASE
=
= 2018050000
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_RELEASE
>
= 2018050000
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
(
target
==
DNN_TARGET_OPENCL
||
target
==
DNN_TARGET_OPENCL_FP16
))
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
(
target
==
DNN_TARGET_OPENCL
||
target
==
DNN_TARGET_OPENCL_FP16
))
throw
SkipTestException
(
"Unstable test case"
);
throw
SkipTestException
(
"Unstable test case"
);
#endif
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录