Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
60b84856
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
60b84856
编写于
10月 17, 2017
作者:
T
tensor-tang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine the conf files, combine in one file
上级
b487c62a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
33 addition
and
154 deletion
+33
-154
paddle/gserver/tests/mkldnn_branches_conv.conf
paddle/gserver/tests/mkldnn_branches_conv.conf
+25
-14
paddle/gserver/tests/mkldnn_branches_conv_conv_addto.conf
paddle/gserver/tests/mkldnn_branches_conv_conv_addto.conf
+0
-45
paddle/gserver/tests/mkldnn_branches_conv_conv_concat.conf
paddle/gserver/tests/mkldnn_branches_conv_conv_concat.conf
+0
-45
paddle/gserver/tests/mkldnn_branches_conv_conv_concat_32c.conf
...e/gserver/tests/mkldnn_branches_conv_conv_concat_32c.conf
+0
-45
paddle/gserver/tests/test_MKLDNN.cpp
paddle/gserver/tests/test_MKLDNN.cpp
+8
-5
未找到文件。
paddle/gserver/tests/mkldnn_branches_conv
_conv_addto_32c
.conf
→
paddle/gserver/tests/mkldnn_branches_conv.conf
浏览文件 @
60b84856
...
...
@@ -15,31 +15,42 @@
from
paddle
.
trainer_config_helpers
import
*
settings
(
batch_size
=
16
)
channels
=
get_config_arg
(
"channels"
,
int
,
2
)
data
=
data_layer
(
name
=
"input"
,
size
=
32
*
16
*
16
)
def
two_conv
(
input
,
group_name
):
out1
=
img_conv_layer
(
input
=
input
,
name
=
group_name
+
'_conv1'
,
filter_size
=
1
,
num_filters
=
channels
,
padding
=
0
,
shared_biases
=
True
,
act
=
ReluActivation
())
conv
=
img_conv_layer
(
input
=
data
,
n
um_channels
=
32
,
out2
=
img_conv_layer
(
input
=
input
,
n
ame
=
group_name
+
'_conv2'
,
filter_size
=
3
,
num_filters
=
32
,
num_filters
=
channels
,
padding
=
1
,
shared_biases
=
True
,
act
=
ReluActivation
())
return
out1
,
out2
b1
=
img_conv_layer
(
input
=
conv
,
filter_size
=
1
,
num_filters
=
32
,
padding
=
0
,
shared_biases
=
True
,
act
=
ReluActivation
())
data
=
data_layer
(
name
=
"input"
,
size
=
channels
*
16
*
16
)
b2
=
img_conv_layer
(
input
=
conv
,
conv
=
img_conv_layer
(
input
=
data
,
num_channels
=
channels
,
filter_size
=
3
,
num_filters
=
32
,
num_filters
=
channels
,
padding
=
1
,
shared_biases
=
True
,
act
=
ReluActivation
())
concat
=
addto_layer
(
input
=[
b1
,
b2
])
a1
,
a2
=
two_conv
(
input
=
conv
,
group_name
=
'a'
)
concat
=
concat_layer
(
input
=[
a1
,
a2
])
b1
,
b2
=
two_conv
(
input
=
conv
,
group_name
=
'b'
)
addto
=
addto_layer
(
input
=[
b1
,
b2
])
outputs
(
concat
)
outputs
(
[
concat
,
addto
]
)
paddle/gserver/tests/mkldnn_branches_conv_conv_addto.conf
已删除
100644 → 0
浏览文件 @
b487c62a
# Copyright (c) 2017 PaddlePaddle Authors. All Rights Reserved
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from
paddle
.
trainer_config_helpers
import
*
settings
(
batch_size
=
2
)
data
=
data_layer
(
name
=
"input"
,
size
=
3
*
4
*
4
)
conv
=
img_conv_layer
(
input
=
data
,
num_channels
=
1
,
filter_size
=
3
,
num_filters
=
2
,
padding
=
1
,
shared_biases
=
True
,
act
=
ReluActivation
())
b1
=
img_conv_layer
(
input
=
conv
,
filter_size
=
1
,
num_filters
=
2
,
padding
=
0
,
shared_biases
=
True
,
act
=
ReluActivation
())
b2
=
img_conv_layer
(
input
=
conv
,
filter_size
=
3
,
num_filters
=
2
,
padding
=
1
,
shared_biases
=
True
,
act
=
ReluActivation
())
concat
=
addto_layer
(
input
=[
b1
,
b2
])
outputs
(
concat
)
paddle/gserver/tests/mkldnn_branches_conv_conv_concat.conf
已删除
100644 → 0
浏览文件 @
b487c62a
# Copyright (c) 2017 PaddlePaddle Authors. All Rights Reserved
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from
paddle
.
trainer_config_helpers
import
*
settings
(
batch_size
=
2
)
data
=
data_layer
(
name
=
"input"
,
size
=
3
*
4
*
4
)
conv
=
img_conv_layer
(
input
=
data
,
num_channels
=
1
,
filter_size
=
3
,
num_filters
=
2
,
padding
=
1
,
shared_biases
=
True
,
act
=
ReluActivation
())
b1
=
img_conv_layer
(
input
=
conv
,
filter_size
=
1
,
num_filters
=
2
,
padding
=
0
,
shared_biases
=
True
,
act
=
ReluActivation
())
b2
=
img_conv_layer
(
input
=
conv
,
filter_size
=
3
,
num_filters
=
2
,
padding
=
1
,
shared_biases
=
True
,
act
=
ReluActivation
())
concat
=
concat_layer
(
input
=[
b1
,
b2
])
outputs
(
concat
)
paddle/gserver/tests/mkldnn_branches_conv_conv_concat_32c.conf
已删除
100644 → 0
浏览文件 @
b487c62a
# Copyright (c) 2017 PaddlePaddle Authors. All Rights Reserved
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from
paddle
.
trainer_config_helpers
import
*
settings
(
batch_size
=
16
)
data
=
data_layer
(
name
=
"input"
,
size
=
32
*
16
*
16
)
conv
=
img_conv_layer
(
input
=
data
,
num_channels
=
32
,
filter_size
=
3
,
num_filters
=
32
,
padding
=
1
,
shared_biases
=
True
,
act
=
ReluActivation
())
b1
=
img_conv_layer
(
input
=
conv
,
filter_size
=
1
,
num_filters
=
32
,
padding
=
0
,
shared_biases
=
True
,
act
=
ReluActivation
())
b2
=
img_conv_layer
(
input
=
conv
,
filter_size
=
3
,
num_filters
=
32
,
padding
=
1
,
shared_biases
=
True
,
act
=
ReluActivation
())
concat
=
concat_layer
(
input
=[
b1
,
b2
])
outputs
(
concat
)
paddle/gserver/tests/test_MKLDNN.cpp
浏览文件 @
60b84856
...
...
@@ -248,14 +248,17 @@ TEST(MKLDNNActivation, Activations) {
}
}
DECLARE_string
(
config_args
);
TEST
(
MKLDNNLayer
,
branches
)
{
std
::
vector
<
std
::
string
>
cases
=
{
"conv_conv_concat"
,
"conv_conv_concat_32c"
,
"conv_conv_addto"
,
"conv_conv_addto_32c"
};
std
::
vector
<
std
::
string
>
cases
=
{
"conv"
};
for
(
auto
name
:
cases
)
{
std
::
string
config
=
"./gserver/tests/mkldnn_branches_"
+
name
+
".conf"
;
MKLDNNTester
::
runBranchesTest
(
config
);
for
(
auto
channels
:
{
2
,
32
})
{
std
::
ostringstream
oss
;
oss
<<
"channels="
<<
channels
;
FLAGS_config_args
=
oss
.
str
();
MKLDNNTester
::
runBranchesTest
(
config
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录