Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
598039c0
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 9 个月
通知
992
Star
71100
Fork
55581
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
598039c0
编写于
3月 31, 2018
作者:
D
Dmitry Kurtaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix embedded Torch's nn.ConcatTable
上级
dbcb4549
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
13 deletion
+23
-13
modules/dnn/src/torch/torch_importer.cpp
modules/dnn/src/torch/torch_importer.cpp
+18
-13
modules/dnn/test/test_torch_importer.cpp
modules/dnn/test/test_torch_importer.cpp
+5
-0
未找到文件。
modules/dnn/src/torch/torch_importer.cpp
浏览文件 @
598039c0
...
...
@@ -101,6 +101,8 @@ struct TorchImporter
std
::
set
<
int
>
readedIndexes
;
std
::
map
<
int
,
Mat
>
storages
;
std
::
map
<
int
,
Mat
>
tensors
;
// Stack with numbers of unconnected layers per scope (Sequential, ConcatTable etc.)
std
::
vector
<
int
>
numUnconnectedLayers
;
struct
Module
{
...
...
@@ -489,15 +491,7 @@ struct TorchImporter
layerParams
.
set
(
"inputDimension"
,
scalarParams
.
get
<
int
>
(
"inputDimension"
));
layerParams
.
set
(
"outputDimension"
,
scalarParams
.
get
<
int
>
(
"outputDimension"
));
}
if
(
nnName
==
"Concat"
)
{
layerParams
.
set
(
"dimension"
,
scalarParams
.
get
<
int
>
(
"dimension"
));
}
if
(
nnName
==
"JoinTable"
)
{
layerParams
.
set
(
"dimension"
,
scalarParams
.
get
<
int
>
(
"dimension"
));
}
if
(
nnName
==
"DepthConcat"
)
else
if
(
nnName
==
"Concat"
||
nnName
==
"JoinTable"
||
nnName
==
"DepthConcat"
)
{
layerParams
.
set
(
"dimension"
,
scalarParams
.
get
<
int
>
(
"dimension"
));
}
...
...
@@ -1096,6 +1090,7 @@ struct TorchImporter
{
newId
=
fill
(
module
->
modules
[
i
],
addedModules
,
prevLayerId
,
prevOutNum
);
}
numUnconnectedLayers
.
push_back
(
module
->
modules
.
size
());
return
newId
;
}
else
if
(
module
->
thName
==
"JoinTable"
)
{
...
...
@@ -1108,9 +1103,14 @@ struct TorchImporter
mergeId
=
net
.
addLayer
(
generateLayerName
(
"torchMerge"
),
"Concat"
,
mergeParams
);
addedModules
.
push_back
(
std
::
make_pair
(
mergeId
,
module
));
for
(
int
i
=
0
;
i
<
ids
.
size
();
i
++
)
// Connect to the last number of unconnected layers.
CV_Assert
(
!
numUnconnectedLayers
.
empty
());
const
int
numInputs
=
numUnconnectedLayers
.
back
();
numUnconnectedLayers
.
pop_back
();
CV_Assert
(
numInputs
<=
ids
.
size
());
for
(
int
i
=
0
;
i
<
numInputs
;
i
++
)
{
net
.
connect
(
ids
[
i
],
0
,
mergeId
,
i
);
net
.
connect
(
ids
[
i
ds
.
size
()
-
numInputs
+
i
],
0
,
mergeId
,
i
);
}
return
mergeId
;
...
...
@@ -1124,9 +1124,14 @@ struct TorchImporter
int
id
=
net
.
addLayer
(
name
,
"Eltwise"
,
params
);
for
(
int
i
=
0
;
i
<
ids
.
size
();
i
++
)
// Connect to the last number of unconnected layers.
CV_Assert
(
!
numUnconnectedLayers
.
empty
());
const
int
numInputs
=
numUnconnectedLayers
.
back
();
numUnconnectedLayers
.
pop_back
();
CV_Assert
(
numInputs
<=
ids
.
size
());
for
(
int
i
=
0
;
i
<
numInputs
;
i
++
)
{
net
.
connect
(
ids
[
i
],
0
,
id
,
i
);
net
.
connect
(
ids
[
i
ds
.
size
()
-
numInputs
+
i
],
0
,
id
,
i
);
}
addedModules
.
push_back
(
std
::
make_pair
(
id
,
module
));
...
...
modules/dnn/test/test_torch_importer.cpp
浏览文件 @
598039c0
...
...
@@ -320,4 +320,9 @@ TEST(Torch_Importer, DISABLED_run_paralel)
runTorchNet
(
"net_parallel"
,
DNN_TARGET_OPENCL
,
"l5_torchMerge"
);
}
TEST
(
Torch_Importer
,
net_residual
)
{
runTorchNet
(
"net_residual"
,
DNN_TARGET_CPU
,
""
,
false
,
true
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录