Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
827c7515
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,发现更多精彩内容 >>
提交
827c7515
编写于
10月 13, 2017
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9842 from alalek:fix_dnn_experimental
上级
1ba29cc9
4857cae6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
14 deletion
+14
-14
modules/dnn/src/darknet/darknet_io.cpp
modules/dnn/src/darknet/darknet_io.cpp
+12
-12
modules/dnn/src/darknet/darknet_io.hpp
modules/dnn/src/darknet/darknet_io.hpp
+2
-2
未找到文件。
modules/dnn/src/darknet/darknet_io.cpp
浏览文件 @
827c7515
...
...
@@ -103,14 +103,14 @@ namespace cv {
void
setLayerBlobs
(
int
i
,
std
::
vector
<
cv
::
Mat
>
blobs
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
&
params
=
net
->
layers
[
i
].
layerParams
;
cv
::
dnn
::
LayerParams
&
params
=
net
->
layers
[
i
].
layerParams
;
params
.
blobs
=
blobs
;
}
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
getParamConvolution
(
int
kernel
,
int
pad
,
cv
::
dnn
::
LayerParams
getParamConvolution
(
int
kernel
,
int
pad
,
int
stride
,
int
filters_num
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
params
;
cv
::
dnn
::
LayerParams
params
;
params
.
name
=
"Convolution-name"
;
params
.
type
=
"Convolution"
;
...
...
@@ -128,7 +128,7 @@ namespace cv {
void
setConvolution
(
int
kernel
,
int
pad
,
int
stride
,
int
filters_num
,
int
channels_num
,
int
use_batch_normalize
,
int
use_relu
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
conv_param
=
cv
::
dnn
::
LayerParams
conv_param
=
getParamConvolution
(
kernel
,
pad
,
stride
,
filters_num
);
darknet
::
LayerParameter
lp
;
...
...
@@ -148,7 +148,7 @@ namespace cv {
if
(
use_batch_normalize
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
bn_param
;
cv
::
dnn
::
LayerParams
bn_param
;
bn_param
.
name
=
"BatchNorm-name"
;
bn_param
.
type
=
"BatchNorm"
;
...
...
@@ -168,7 +168,7 @@ namespace cv {
if
(
use_relu
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
activation_param
;
cv
::
dnn
::
LayerParams
activation_param
;
activation_param
.
set
<
float
>
(
"negative_slope"
,
0.1
f
);
activation_param
.
name
=
"ReLU-name"
;
activation_param
.
type
=
"ReLU"
;
...
...
@@ -189,7 +189,7 @@ namespace cv {
void
setMaxpool
(
size_t
kernel
,
size_t
pad
,
size_t
stride
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
maxpool_param
;
cv
::
dnn
::
LayerParams
maxpool_param
;
maxpool_param
.
set
<
cv
::
String
>
(
"pool"
,
"max"
);
maxpool_param
.
set
<
int
>
(
"kernel_size"
,
kernel
);
maxpool_param
.
set
<
int
>
(
"pad"
,
pad
);
...
...
@@ -212,7 +212,7 @@ namespace cv {
void
setConcat
(
int
number_of_inputs
,
int
*
input_indexes
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
concat_param
;
cv
::
dnn
::
LayerParams
concat_param
;
concat_param
.
name
=
"Concat-name"
;
concat_param
.
type
=
"Concat"
;
concat_param
.
set
<
int
>
(
"axis"
,
1
);
// channels are in axis = 1
...
...
@@ -235,7 +235,7 @@ namespace cv {
void
setIdentity
(
int
bottom_index
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
identity_param
;
cv
::
dnn
::
LayerParams
identity_param
;
identity_param
.
name
=
"Identity-name"
;
identity_param
.
type
=
"Identity"
;
...
...
@@ -256,7 +256,7 @@ namespace cv {
void
setReorg
(
int
stride
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
reorg_params
;
cv
::
dnn
::
LayerParams
reorg_params
;
reorg_params
.
name
=
"Reorg-name"
;
reorg_params
.
type
=
"Reorg"
;
reorg_params
.
set
<
int
>
(
"reorg_stride"
,
stride
);
...
...
@@ -277,7 +277,7 @@ namespace cv {
void
setPermute
()
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
permute_params
;
cv
::
dnn
::
LayerParams
permute_params
;
permute_params
.
name
=
"Permute-name"
;
permute_params
.
type
=
"Permute"
;
int
permute
[]
=
{
0
,
2
,
3
,
1
};
...
...
@@ -300,7 +300,7 @@ namespace cv {
void
setRegion
(
float
thresh
,
int
coords
,
int
classes
,
int
anchors
,
int
classfix
,
int
softmax
,
int
softmax_tree
,
float
*
biasData
)
{
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
region_param
;
cv
::
dnn
::
LayerParams
region_param
;
region_param
.
name
=
"Region-name"
;
region_param
.
type
=
"Region"
;
...
...
modules/dnn/src/darknet/darknet_io.hpp
浏览文件 @
827c7515
...
...
@@ -78,10 +78,10 @@ namespace cv {
class
LayerParameter
{
std
::
string
layer_name
,
layer_type
;
std
::
vector
<
std
::
string
>
bottom_indexes
;
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
layerParams
;
cv
::
dnn
::
LayerParams
layerParams
;
public:
friend
class
setLayersParams
;
cv
::
dnn
::
experimental_dnn_v1
::
LayerParams
getLayerParams
()
const
{
return
layerParams
;
}
cv
::
dnn
::
LayerParams
getLayerParams
()
const
{
return
layerParams
;
}
std
::
string
name
()
const
{
return
layer_name
;
}
std
::
string
type
()
const
{
return
layer_type
;
}
int
bottom_size
()
const
{
return
bottom_indexes
.
size
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录