Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
0cd9b8c0
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
694
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0cd9b8c0
编写于
9月 20, 2017
作者:
X
xzl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the input\output name to X\Out
上级
a9a7ba3c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
46 deletion
+44
-46
paddle/operators/transpose_op.cc
paddle/operators/transpose_op.cc
+20
-22
paddle/operators/transpose_op.h
paddle/operators/transpose_op.h
+21
-21
python/paddle/v2/framework/tests/test_transpose_op.py
python/paddle/v2/framework/tests/test_transpose_op.py
+3
-3
未找到文件。
paddle/operators/transpose_op.cc
浏览文件 @
0cd9b8c0
...
...
@@ -25,19 +25,18 @@ class TransposeOp : public framework::OperatorWithKernel {
protected:
void
InferShape
(
const
framework
::
InferShapeContext
&
ctx
)
const
override
{
PADDLE_ENFORCE_NOT_NULL
(
ctx
.
InputVar
(
"Input"
),
"Input(Input) should not be null"
);
PADDLE_ENFORCE_NOT_NULL
(
ctx
.
OutputVar
(
"Output"
),
"Output(Output) should not be null"
);
auto
input_dim
=
ctx
.
Input
<
Tensor
>
(
"Input"
)
->
dims
();
PADDLE_ENFORCE_NOT_NULL
(
ctx
.
InputVar
(
"X"
),
"Input(X) should not be null"
);
PADDLE_ENFORCE_NOT_NULL
(
ctx
.
OutputVar
(
"Out"
),
"Output(Out) should not be null"
);
auto
x_dims
=
ctx
.
Input
<
Tensor
>
(
"X"
)
->
dims
();
std
::
vector
<
int
>
axis
=
ctx
.
Attr
<
std
::
vector
<
int
>>
(
"axis"
);
size_t
input_rank
=
input_dim
.
size
();
size_t
x_rank
=
x_dims
.
size
();
size_t
axis_size
=
axis
.
size
();
PADDLE_ENFORCE_EQ
(
input
_rank
,
axis_size
,
PADDLE_ENFORCE_EQ
(
x
_rank
,
axis_size
,
"the input tensor's rank(%d) "
"should be equal to the axis's size(%d)"
,
input
_rank
,
axis_size
);
x
_rank
,
axis_size
);
std
::
vector
<
int
>
count
(
axis_size
,
0
);
for
(
size_t
i
=
0
;
i
<
axis_size
;
i
++
)
{
...
...
@@ -48,11 +47,11 @@ class TransposeOp : public framework::OperatorWithKernel {
"where the dims is the axis's size"
);
}
framework
::
DDim
out
put_dim
(
input_dim
);
framework
::
DDim
out
_dims
(
x_dims
);
for
(
size_t
i
=
0
;
i
<
axis_size
;
i
++
)
{
out
put_dim
[
i
]
=
input_dim
[
axis
[
i
]];
out
_dims
[
i
]
=
x_dims
[
axis
[
i
]];
}
ctx
.
Output
<
framework
::
LoDTensor
>
(
"Out
put"
)
->
Resize
(
output_dim
);
ctx
.
Output
<
framework
::
LoDTensor
>
(
"Out
"
)
->
Resize
(
out_dims
);
}
};
...
...
@@ -62,9 +61,9 @@ class TransposeOpMaker : public framework::OpProtoAndCheckerMaker {
framework
::
OpAttrChecker
*
op_checker
)
:
OpProtoAndCheckerMaker
(
proto
,
op_checker
)
{
AddInput
(
"
Input
"
,
"
X
"
,
"(Tensor)The input tensor, tensors with rank at most 6 are supported"
);
AddOutput
(
"Out
put
"
,
"(Tensor)The output tensor"
);
AddOutput
(
"Out"
,
"(Tensor)The output tensor"
);
AddAttr
<
std
::
vector
<
int
>>
(
"axis"
,
"(vector<int>)a list of values, and the size of the list should be "
...
...
@@ -96,15 +95,14 @@ class TransposeOpGrad : public framework::OperatorWithKernel {
protected:
void
InferShape
(
const
framework
::
InferShapeContext
&
ctx
)
const
override
{
PADDLE_ENFORCE_NOT_NULL
(
ctx
.
InputVar
(
"Input"
),
"Input(Input) should not be null"
);
PADDLE_ENFORCE_NOT_NULL
(
ctx
.
InputVar
(
framework
::
GradVarName
(
"Output"
)),
"Input(Output@GRAD) should not be null"
);
auto
input_dim
=
ctx
.
Input
<
Tensor
>
(
"Input"
)
->
dims
();
auto
*
input_grad
=
ctx
.
Output
<
framework
::
LoDTensor
>
(
framework
::
GradVarName
(
"Input"
));
if
(
input_grad
)
input_grad
->
Resize
(
input_dim
);
PADDLE_ENFORCE_NOT_NULL
(
ctx
.
InputVar
(
"X"
),
"Input(X) should not be null"
);
PADDLE_ENFORCE_NOT_NULL
(
ctx
.
InputVar
(
framework
::
GradVarName
(
"Out"
)),
"Input(Out@GRAD) should not be null"
);
auto
x_dims
=
ctx
.
Input
<
Tensor
>
(
"X"
)
->
dims
();
auto
*
x_grad
=
ctx
.
Output
<
framework
::
LoDTensor
>
(
framework
::
GradVarName
(
"X"
));
if
(
x_grad
)
x_grad
->
Resize
(
x_dims
);
}
};
...
...
paddle/operators/transpose_op.h
浏览文件 @
0cd9b8c0
...
...
@@ -41,30 +41,30 @@ template <typename Place, typename T>
class
TransposeKernel
:
public
framework
::
OpKernel
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
auto
*
input
=
context
.
Input
<
framework
::
Tensor
>
(
"Input
"
);
auto
*
out
put
=
context
.
Output
<
framework
::
Tensor
>
(
"Outp
ut"
);
out
put
->
mutable_data
<
T
>
(
context
.
GetPlace
());
auto
*
x
=
context
.
Input
<
framework
::
Tensor
>
(
"X
"
);
auto
*
out
=
context
.
Output
<
framework
::
Tensor
>
(
"O
ut"
);
out
->
mutable_data
<
T
>
(
context
.
GetPlace
());
std
::
vector
<
int
>
axis
=
context
.
Attr
<
std
::
vector
<
int
>>
(
"axis"
);
int
ndims
=
axis
.
size
();
switch
(
ndims
)
{
case
1
:
EigenTranspose
<
Place
,
T
,
1
>
(
context
,
*
input
,
*
outp
ut
,
axis
);
EigenTranspose
<
Place
,
T
,
1
>
(
context
,
*
x
,
*
o
ut
,
axis
);
break
;
case
2
:
EigenTranspose
<
Place
,
T
,
2
>
(
context
,
*
input
,
*
outp
ut
,
axis
);
EigenTranspose
<
Place
,
T
,
2
>
(
context
,
*
x
,
*
o
ut
,
axis
);
break
;
case
3
:
EigenTranspose
<
Place
,
T
,
3
>
(
context
,
*
input
,
*
outp
ut
,
axis
);
EigenTranspose
<
Place
,
T
,
3
>
(
context
,
*
x
,
*
o
ut
,
axis
);
break
;
case
4
:
EigenTranspose
<
Place
,
T
,
4
>
(
context
,
*
input
,
*
outp
ut
,
axis
);
EigenTranspose
<
Place
,
T
,
4
>
(
context
,
*
x
,
*
o
ut
,
axis
);
break
;
case
5
:
EigenTranspose
<
Place
,
T
,
5
>
(
context
,
*
input
,
*
outp
ut
,
axis
);
EigenTranspose
<
Place
,
T
,
5
>
(
context
,
*
x
,
*
o
ut
,
axis
);
break
;
case
6
:
EigenTranspose
<
Place
,
T
,
6
>
(
context
,
*
input
,
*
outp
ut
,
axis
);
EigenTranspose
<
Place
,
T
,
6
>
(
context
,
*
x
,
*
o
ut
,
axis
);
break
;
default:
PADDLE_THROW
(
"Tensors with rank at most 6 are supported"
);
...
...
@@ -76,12 +76,12 @@ template <typename Place, typename T>
class
TransposeGradKernel
:
public
framework
::
OpKernel
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
auto
*
out
put
_grad
=
context
.
Input
<
framework
::
Tensor
>
(
framework
::
GradVarName
(
"Out
put
"
));
auto
*
input
_grad
=
context
.
Output
<
framework
::
Tensor
>
(
framework
::
GradVarName
(
"
Input
"
));
if
(
input
_grad
)
{
input
_grad
->
mutable_data
<
T
>
(
context
.
GetPlace
());
auto
*
out_grad
=
context
.
Input
<
framework
::
Tensor
>
(
framework
::
GradVarName
(
"Out"
));
auto
*
x
_grad
=
context
.
Output
<
framework
::
Tensor
>
(
framework
::
GradVarName
(
"
X
"
));
if
(
x
_grad
)
{
x
_grad
->
mutable_data
<
T
>
(
context
.
GetPlace
());
std
::
vector
<
int
>
axis
=
context
.
Attr
<
std
::
vector
<
int
>>
(
"axis"
);
std
::
vector
<
int
>
reversed_axis
(
axis
);
...
...
@@ -94,27 +94,27 @@ class TransposeGradKernel : public framework::OpKernel {
switch
(
ndims
)
{
case
1
:
EigenTranspose
<
Place
,
T
,
1
>
(
context
,
*
out
put_grad
,
*
input
_grad
,
EigenTranspose
<
Place
,
T
,
1
>
(
context
,
*
out
_grad
,
*
x
_grad
,
reversed_axis
);
break
;
case
2
:
EigenTranspose
<
Place
,
T
,
2
>
(
context
,
*
out
put_grad
,
*
input
_grad
,
EigenTranspose
<
Place
,
T
,
2
>
(
context
,
*
out
_grad
,
*
x
_grad
,
reversed_axis
);
break
;
case
3
:
EigenTranspose
<
Place
,
T
,
3
>
(
context
,
*
out
put_grad
,
*
input
_grad
,
EigenTranspose
<
Place
,
T
,
3
>
(
context
,
*
out
_grad
,
*
x
_grad
,
reversed_axis
);
break
;
case
4
:
EigenTranspose
<
Place
,
T
,
4
>
(
context
,
*
out
put_grad
,
*
input
_grad
,
EigenTranspose
<
Place
,
T
,
4
>
(
context
,
*
out
_grad
,
*
x
_grad
,
reversed_axis
);
break
;
case
5
:
EigenTranspose
<
Place
,
T
,
5
>
(
context
,
*
out
put_grad
,
*
input
_grad
,
EigenTranspose
<
Place
,
T
,
5
>
(
context
,
*
out
_grad
,
*
x
_grad
,
reversed_axis
);
break
;
case
6
:
EigenTranspose
<
Place
,
T
,
6
>
(
context
,
*
out
put_grad
,
*
input
_grad
,
EigenTranspose
<
Place
,
T
,
6
>
(
context
,
*
out
_grad
,
*
x
_grad
,
reversed_axis
);
break
;
default:
...
...
python/paddle/v2/framework/tests/test_transpose_op.py
浏览文件 @
0cd9b8c0
...
...
@@ -7,15 +7,15 @@ class TestTransposeOp(OpTest):
def
setUp
(
self
):
self
.
initTestCase
()
self
.
op_type
=
"transpose"
self
.
inputs
=
{
'
Input
'
:
np
.
random
.
random
(
self
.
shape
).
astype
(
"float32"
)}
self
.
inputs
=
{
'
X
'
:
np
.
random
.
random
(
self
.
shape
).
astype
(
"float32"
)}
self
.
attrs
=
{
'axis'
:
list
(
self
.
axis
)}
self
.
outputs
=
{
'Out
put'
:
self
.
inputs
[
'Input
'
].
transpose
(
self
.
axis
)}
self
.
outputs
=
{
'Out
'
:
self
.
inputs
[
'X
'
].
transpose
(
self
.
axis
)}
def
test_check_output
(
self
):
self
.
check_output
()
def
test_check_grad
(
self
):
self
.
check_grad
([
'
Input'
],
'Outp
ut'
)
self
.
check_grad
([
'
X'
],
'O
ut'
)
def
initTestCase
(
self
):
self
.
shape
=
(
3
,
4
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录