Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6700fdb8
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,发现更多精彩内容 >>
提交
6700fdb8
编写于
8月 22, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12275 from alalek:fix_build_dnn_inf_engine
上级
59ccf2c9
09636673
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
7 deletion
+8
-7
modules/dnn/src/dnn.cpp
modules/dnn/src/dnn.cpp
+5
-4
modules/dnn/src/layers/prior_box_layer.cpp
modules/dnn/src/layers/prior_box_layer.cpp
+3
-3
未找到文件。
modules/dnn/src/dnn.cpp
浏览文件 @
6700fdb8
...
...
@@ -588,7 +588,8 @@ struct DataLayer : public Layer
lp
.
precision
=
InferenceEngine
::
Precision
::
FP32
;
std
::
shared_ptr
<
InferenceEngine
::
ScaleShiftLayer
>
ieLayer
(
new
InferenceEngine
::
ScaleShiftLayer
(
lp
));
CV_Assert
(
inputsData
.
size
()
==
1
,
inputsData
[
0
].
dims
==
4
);
CV_CheckEQ
(
inputsData
.
size
(),
(
size_t
)
1
,
""
);
CV_CheckEQ
(
inputsData
[
0
].
dims
,
4
,
""
);
const
size_t
numChannels
=
inputsData
[
0
].
size
[
1
];
CV_Assert
(
numChannels
<=
4
);
...
...
@@ -1302,7 +1303,7 @@ struct Net::Impl
if
(
!
node
.
empty
())
{
Ptr
<
InfEngineBackendNode
>
ieNode
=
node
.
dynamicCast
<
InfEngineBackendNode
>
();
CV_Assert
(
!
ieNode
.
empty
()
,
!
ieNode
->
net
.
empty
());
CV_Assert
(
!
ieNode
.
empty
()
);
CV_Assert
(
!
ieNode
->
net
.
empty
());
layerNet
=
ieNode
->
net
;
}
}
...
...
@@ -1316,7 +1317,7 @@ struct Net::Impl
if
(
!
inpNode
.
empty
())
{
Ptr
<
InfEngineBackendNode
>
ieInpNode
=
inpNode
.
dynamicCast
<
InfEngineBackendNode
>
();
CV_Assert
(
!
ieInpNode
.
empty
()
,
!
ieInpNode
->
net
.
empty
());
CV_Assert
(
!
ieInpNode
.
empty
()
);
CV_Assert
(
!
ieInpNode
->
net
.
empty
());
if
(
layerNet
!=
ieInpNode
->
net
)
{
// layerNet is empty or nodes are from different graphs.
...
...
@@ -1425,7 +1426,7 @@ struct Net::Impl
if
(
!
inpNode
.
empty
())
{
Ptr
<
InfEngineBackendNode
>
ieInpNode
=
inpNode
.
dynamicCast
<
InfEngineBackendNode
>
();
CV_Assert
(
!
ieInpNode
.
empty
()
,
!
ieInpNode
->
net
.
empty
());
CV_Assert
(
!
ieInpNode
.
empty
()
);
CV_Assert
(
!
ieInpNode
->
net
.
empty
());
if
(
ieInpNode
->
net
!=
net
)
{
net
=
Ptr
<
InfEngineBackendNet
>
();
...
...
modules/dnn/src/layers/prior_box_layer.cpp
浏览文件 @
6700fdb8
...
...
@@ -487,8 +487,8 @@ public:
if
(
_explicitSizes
)
{
CV_Assert
(
!
_boxWidths
.
empty
()
,
!
_boxHeights
.
empty
(),
_boxWidths
.
size
()
==
_boxHeights
.
size
());
CV_Assert
(
!
_boxWidths
.
empty
()
);
CV_Assert
(
!
_boxHeights
.
empty
());
CV_Assert
(
_boxWidths
.
size
()
==
_boxHeights
.
size
());
ieLayer
->
params
[
"width"
]
=
format
(
"%f"
,
_boxWidths
[
0
]);
ieLayer
->
params
[
"height"
]
=
format
(
"%f"
,
_boxHeights
[
0
]);
for
(
int
i
=
1
;
i
<
_boxWidths
.
size
();
++
i
)
...
...
@@ -530,7 +530,7 @@ public:
ieLayer
->
params
[
"step_h"
]
=
format
(
"%f"
,
_stepY
);
ieLayer
->
params
[
"step_w"
]
=
format
(
"%f"
,
_stepX
);
}
CV_
Assert
(
_offsetsX
.
size
()
==
1
,
_offsetsY
.
size
()
==
1
,
_offsetsX
[
0
]
==
_offsetsY
[
0
]
);
CV_
CheckEQ
(
_offsetsX
.
size
(),
(
size_t
)
1
,
""
);
CV_CheckEQ
(
_offsetsY
.
size
(),
(
size_t
)
1
,
""
);
CV_CheckEQ
(
_offsetsX
[
0
],
_offsetsY
[
0
],
""
);
ieLayer
->
params
[
"offset"
]
=
format
(
"%f"
,
_offsetsX
[
0
]);
return
Ptr
<
BackendNode
>
(
new
InfEngineBackendNode
(
ieLayer
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录