Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
55eb2fcf
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
提交
55eb2fcf
编写于
1月 26, 2017
作者:
H
Haonan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format correction
上级
f5995300
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
45 addition
and
47 deletion
+45
-47
paddle/gserver/layers/RotateLayer.cpp
paddle/gserver/layers/RotateLayer.cpp
+26
-28
python/paddle/trainer/config_parser.py
python/paddle/trainer/config_parser.py
+0
-1
python/paddle/trainer_config_helpers/layers.py
python/paddle/trainer_config_helpers/layers.py
+17
-14
python/paddle/trainer_config_helpers/tests/layers_test_config.py
...paddle/trainer_config_helpers/tests/layers_test_config.py
+2
-4
未找到文件。
paddle/gserver/layers/RotateLayer.cpp
浏览文件 @
55eb2fcf
...
...
@@ -40,15 +40,13 @@ void RotateLayer::forward(PassType passType) {
MatrixPtr
outV
=
getOutputValue
();
for
(
int
b
=
0
;
b
<
batchSize_
;
b
++
)
{
MatrixPtr
inputSample
=
Matrix
::
create
(
input
->
getData
()
+
b
*
sampleSize_
,
for
(
int
b
=
0
;
b
<
batchSize_
;
b
++
)
{
MatrixPtr
inputSample
=
Matrix
::
create
(
input
->
getData
()
+
b
*
sampleSize_
,
sampleHeight_
,
sampleWidth_
,
false
,
useGpu_
);
MatrixPtr
outputSample
=
Matrix
::
create
(
outV
->
getData
()
+
b
*
sampleSize_
,
MatrixPtr
outputSample
=
Matrix
::
create
(
outV
->
getData
()
+
b
*
sampleSize_
,
sampleWidth_
,
sampleHeight_
,
false
,
...
...
@@ -71,21 +69,21 @@ void RotateLayer::backward(const UpdateCallback& callback) {
// the grad should be rotated in the reverse direction
MatrixPtr
preGrad
=
getInputGrad
(
0
);
for
(
int
b
=
0
;
b
<
batchSize_
;
b
++
)
{
MatrixPtr
inputSampleGrad
=
Matrix
::
create
(
preGrad
->
getData
()
+
b
*
sampleSize_
,
for
(
int
b
=
0
;
b
<
batchSize_
;
b
++
)
{
MatrixPtr
inputSampleGrad
=
Matrix
::
create
(
preGrad
->
getData
()
+
b
*
sampleSize_
,
sampleHeight_
,
sampleWidth_
,
false
,
useGpu_
);
MatrixPtr
outputSampleGrad
=
Matrix
::
create
(
outputGrad
->
getData
()
+
b
*
sampleSize_
,
MatrixPtr
outputSampleGrad
=
Matrix
::
create
(
outputGrad
->
getData
()
+
b
*
sampleSize_
,
sampleWidth_
,
sampleHeight_
,
false
,
useGpu_
);
MatrixPtr
tmpGrad
=
Matrix
::
create
(
sampleHeight_
,
sampleWidth_
,
false
,
useGpu_
);
MatrixPtr
tmpGrad
=
Matrix
::
create
(
sampleHeight_
,
sampleWidth_
,
false
,
useGpu_
);
outputSampleGrad
->
rotate
(
tmpGrad
,
false
,
false
);
inputSampleGrad
->
add
(
*
tmpGrad
);
}
...
...
python/paddle/trainer/config_parser.py
浏览文件 @
55eb2fcf
...
...
@@ -1833,7 +1833,6 @@ class PoolLayer(LayerBase):
pool_conf
.
channels
)
@
config_layer
(
'spp'
)
class
SpatialPyramidPoolLayer
(
LayerBase
):
def
__init__
(
self
,
name
,
inputs
,
**
xargs
):
...
...
python/paddle/trainer_config_helpers/layers.py
浏览文件 @
55eb2fcf
...
...
@@ -1707,12 +1707,14 @@ def rotate_layer(input, height, name=None, layer_attr=None):
:rtype: LayerOutput
"""
assert
isinstance
(
input
,
LayerOutput
)
l
=
Layer
(
name
=
name
,
l
=
Layer
(
name
=
name
,
height
=
height
,
type
=
LayerType
.
ROTATE_LAYER
,
inputs
=
[
input
.
name
],
**
ExtraLayerAttribute
.
to_kwargs
(
layer_attr
))
return
LayerOutput
(
name
=
name
,
return
LayerOutput
(
name
=
name
,
layer_type
=
LayerType
.
ROTATE_LAYER
,
parents
=
[
input
],
size
=
l
.
config
.
size
)
...
...
@@ -1750,8 +1752,9 @@ def flip_layer(input, height, name=None, layer_attr=None):
:rtype: LayerOutput
"""
assert
isinstance
(
input
,
LayerOutput
)
return
rotate_layer
(
input
=
rotate_layer
(
input
=
input
,
height
=
height
),
return
rotate_layer
(
input
=
rotate_layer
(
input
=
input
,
height
=
height
),
height
=
height
,
name
=
name
,
layer_attr
=
layer_attr
)
...
...
python/paddle/trainer_config_helpers/tests/layers_test_config.py
浏览文件 @
55eb2fcf
...
...
@@ -39,10 +39,8 @@ z1 = mixed_layer(
assert
z1
.
size
>
0
y2
=
fc_layer
(
input
=
y
,
size
=
15
)
z2
=
rotate_layer
(
input
=
y2
,
height
=
5
)
z3
=
flip_layer
(
input
=
y2
,
height
=
3
)
z2
=
rotate_layer
(
input
=
y2
,
height
=
5
)
z3
=
flip_layer
(
input
=
y2
,
height
=
3
)
cos1
=
cos_sim
(
a
=
x1
,
b
=
y1
)
cos3
=
cos_sim
(
a
=
x1
,
b
=
y2
,
size
=
3
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录