Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
9d3d5e9d
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,发现更多精彩内容 >>
提交
9d3d5e9d
编写于
2月 15, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13774 from l-bat:fix-IE-tests
上级
3c70d966
183c0fca
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
7 addition
and
17 deletion
+7
-17
modules/dnn/perf/perf_net.cpp
modules/dnn/perf/perf_net.cpp
+1
-2
modules/dnn/src/layers/lrn_layer.cpp
modules/dnn/src/layers/lrn_layer.cpp
+1
-1
modules/dnn/src/layers/normalize_bbox_layer.cpp
modules/dnn/src/layers/normalize_bbox_layer.cpp
+3
-7
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
+2
-3
modules/dnn/test/test_tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
+0
-2
modules/dnn/test/test_torch_importer.cpp
modules/dnn/test/test_torch_importer.cpp
+0
-2
未找到文件。
modules/dnn/perf/perf_net.cpp
浏览文件 @
9d3d5e9d
...
...
@@ -124,8 +124,7 @@ PERF_TEST_P_(DNNTestNetwork, SSD)
PERF_TEST_P_
(
DNNTestNetwork
,
OpenFace
)
{
if
(
backend
==
DNN_BACKEND_HALIDE
||
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_OPENCL_FP16
)
||
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
))
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_MYRIAD
))
throw
SkipTestException
(
""
);
processNet
(
"dnn/openface_nn4.small2.v1.t7"
,
""
,
""
,
Mat
(
cv
::
Size
(
96
,
96
),
CV_32FC3
));
...
...
modules/dnn/src/layers/lrn_layer.cpp
浏览文件 @
9d3d5e9d
...
...
@@ -92,7 +92,7 @@ public:
{
return
backendId
==
DNN_BACKEND_OPENCV
||
backendId
==
DNN_BACKEND_HALIDE
||
(
backendId
==
DNN_BACKEND_INFERENCE_ENGINE
&&
(
preferableTarget
!=
DNN_TARGET_MYRIAD
||
type
==
CHANNEL_NRM
))
;
backendId
==
DNN_BACKEND_INFERENCE_ENGINE
;
}
#ifdef HAVE_OPENCL
...
...
modules/dnn/src/layers/normalize_bbox_layer.cpp
浏览文件 @
9d3d5e9d
...
...
@@ -67,14 +67,10 @@ public:
{
if
(
pnorm
!=
2
)
return
false
;
if
(
!
blobs
.
empty
())
return
true
;
if
(
preferableTarget
==
DNN_TARGET_MYRIAD
)
return
!
acrossSpatial
;
return
startAxis
==
1
&&
(
!
acrossSpatial
||
endAxis
>
1
);
return
preferableTarget
==
DNN_TARGET_MYRIAD
?
!
acrossSpatial
:
startAxis
==
1
;
}
else
return
backendId
==
DNN_BACKEND_OPENCV
;
return
backendId
==
DNN_BACKEND_OPENCV
;
}
bool
getMemoryShapes
(
const
std
::
vector
<
MatShape
>
&
inputs
,
...
...
modules/dnn/src/layers/resize_layer.cpp
浏览文件 @
9d3d5e9d
...
...
@@ -54,12 +54,11 @@ public:
#ifdef HAVE_INF_ENGINE
if
(
backendId
==
DNN_BACKEND_INFERENCE_ENGINE
)
{
return
(
interpolation
==
"nearest"
&&
preferableTarget
!=
DNN_TARGET_MYRIAD
)
||
return
(
interpolation
==
"nearest"
&&
scaleWidth
==
scaleHeight
)
||
(
interpolation
==
"bilinear"
&&
INF_ENGINE_VER_MAJOR_GE
(
INF_ENGINE_RELEASE_2018R4
));
}
else
#endif
return
backendId
==
DNN_BACKEND_OPENCV
;
return
backendId
==
DNN_BACKEND_OPENCV
;
}
virtual
void
finalize
(
InputArrayOfArrays
inputs_arr
,
OutputArrayOfArrays
outputs_arr
)
CV_OVERRIDE
...
...
modules/dnn/test/test_tf_importer.cpp
浏览文件 @
9d3d5e9d
...
...
@@ -558,8 +558,6 @@ TEST_P(Test_TensorFlow_layers, split)
TEST_P
(
Test_TensorFlow_layers
,
resize_nearest_neighbor
)
{
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
!=
DNN_TARGET_MYRIAD
)
throw
SkipTestException
(
""
);
runTensorFlowNet
(
"resize_nearest_neighbor"
);
runTensorFlowNet
(
"keras_upsampling2d"
);
}
...
...
modules/dnn/test/test_torch_importer.cpp
浏览文件 @
9d3d5e9d
...
...
@@ -277,8 +277,6 @@ TEST_P(Test_Torch_nets, OpenFace_accuracy)
throw
SkipTestException
(
""
);
#endif
checkBackend
();
if
(
backend
==
DNN_BACKEND_INFERENCE_ENGINE
&&
target
==
DNN_TARGET_OPENCL_FP16
)
throw
SkipTestException
(
""
);
const
string
model
=
findDataFile
(
"dnn/openface_nn4.small2.v1.t7"
,
false
);
Net
net
=
readNetFromTorch
(
model
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录