Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
7b1e30fc
P
Paddle
项目概览
OPTHREE
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
7b1e30fc
编写于
10月 26, 2021
作者:
F
Feiyu Chan
提交者:
GitHub
10月 26, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
roll_op: support Tensor as input for shifts (#36727)
上级
236ed94d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
105 addition
and
22 deletion
+105
-22
paddle/fluid/operators/roll_op.cc
paddle/fluid/operators/roll_op.cc
+24
-15
paddle/fluid/operators/roll_op.cu
paddle/fluid/operators/roll_op.cu
+20
-0
paddle/fluid/operators/roll_op.h
paddle/fluid/operators/roll_op.h
+17
-0
python/paddle/fluid/tests/unittests/test_roll_op.py
python/paddle/fluid/tests/unittests/test_roll_op.py
+28
-0
python/paddle/tensor/manipulation.py
python/paddle/tensor/manipulation.py
+16
-7
未找到文件。
paddle/fluid/operators/roll_op.cc
浏览文件 @
7b1e30fc
...
...
@@ -40,21 +40,23 @@ class RollOp : public framework::OperatorWithKernel {
auto
dims
=
ctx
->
Attrs
().
Get
<
std
::
vector
<
int64_t
>>
(
"axis"
);
auto
shifts
=
ctx
->
Attrs
().
Get
<
std
::
vector
<
int64_t
>>
(
"shifts"
);
if
(
dims
.
size
()
!=
0
)
{
PADDLE_ENFORCE_EQ
(
dims
.
size
(),
shifts
.
size
(),
platform
::
errors
::
InvalidArgument
(
"When dims.size() != 0, dims.size() "
"should be equal to "
"shifts.size(). But received "
"dims.size() = %d, shifts.size() = %d"
,
dims
.
size
(),
shifts
.
size
()));
}
else
{
PADDLE_ENFORCE_EQ
(
shifts
.
size
(),
1
,
platform
::
errors
::
InvalidArgument
(
"When dims.size() == 0, shifts.size() "
"should be equal to 1, But received "
"shifts.size() = %d"
,
shifts
.
size
()));
if
(
!
ctx
->
HasInput
(
"ShiftsTensor"
))
{
if
(
dims
.
size
()
!=
0
)
{
PADDLE_ENFORCE_EQ
(
dims
.
size
(),
shifts
.
size
(),
platform
::
errors
::
InvalidArgument
(
"When dims.size() != 0, dims.size() "
"should be equal to "
"shifts.size(). But received "
"dims.size() = %d, shifts.size() = %d"
,
dims
.
size
(),
shifts
.
size
()));
}
else
{
PADDLE_ENFORCE_EQ
(
shifts
.
size
(),
1
,
platform
::
errors
::
InvalidArgument
(
"When dims.size() == 0, shifts.size() "
"should be equal to 1, But received "
"shifts.size() = %d"
,
shifts
.
size
()));
}
}
ctx
->
SetOutputDim
(
"Out"
,
ctx
->
GetInputDim
(
"X"
));
...
...
@@ -105,6 +107,10 @@ class RollOpMaker : public framework::OpProtoAndCheckerMaker {
"The number of places by which the elements "
"of the tensor are shifted."
)
.
SetDefault
({});
AddInput
(
"ShiftsTensor"
,
"The number of places by which the elements of the tensor "
"are shifted."
)
.
AsDispensable
();
AddAttr
<
std
::
vector
<
int64_t
>>
(
"axis"
,
"Axis along which to roll. It must have the same size "
...
...
@@ -129,6 +135,9 @@ class RollGradMaker : public framework::SingleGradOpMaker<T> {
void
Apply
(
GradOpPtr
<
T
>
op
)
const
override
{
op
->
SetType
(
"roll_grad"
);
op
->
SetInput
(
"X"
,
this
->
Input
(
"X"
));
if
(
this
->
HasInput
(
"ShiftsTensor"
))
{
op
->
SetInput
(
"ShiftsTensor"
,
this
->
Input
(
"ShiftsTensor"
));
}
op
->
SetInput
(
framework
::
GradVarName
(
"Out"
),
this
->
OutputGrad
(
"Out"
));
op
->
SetOutput
(
framework
::
GradVarName
(
"X"
),
this
->
InputGrad
(
"X"
));
op
->
SetAttrMap
(
this
->
Attrs
());
...
...
paddle/fluid/operators/roll_op.cu
浏览文件 @
7b1e30fc
...
...
@@ -59,6 +59,16 @@ class RollKernel<platform::CUDADeviceContext, T>
auto
*
in
=
context
.
Input
<
LoDTensor
>
(
"X"
);
auto
*
out
=
context
.
Output
<
LoDTensor
>
(
"Out"
);
std
::
vector
<
int64_t
>
shifts
=
context
.
Attr
<
std
::
vector
<
int64_t
>>
(
"shifts"
);
if
(
context
.
HasInput
(
"ShiftsTensor"
))
{
const
auto
*
shifts_tensor
=
context
.
Input
<
framework
::
Tensor
>
(
"ShiftsTensor"
);
PADDLE_ENFORCE_EQ
(
shifts_tensor
->
dims
().
size
(),
1
,
platform
::
errors
::
InvalidArgument
(
"The rank of ShiftsTensor is expected to be 1, got %s"
,
shifts_tensor
->
dims
().
size
()));
shifts
=
GetDataFromTensor
<
int64_t
>
(
shifts_tensor
);
}
std
::
vector
<
int64_t
>
dims
=
context
.
Attr
<
std
::
vector
<
int64_t
>>
(
"axis"
);
auto
*
in_data
=
in
->
data
<
T
>
();
...
...
@@ -134,6 +144,16 @@ class RollGradKernel<platform::CUDADeviceContext, T>
auto
*
in
=
context
.
Input
<
LoDTensor
>
(
framework
::
GradVarName
(
"Out"
));
auto
*
out
=
context
.
Output
<
LoDTensor
>
(
framework
::
GradVarName
(
"X"
));
std
::
vector
<
int64_t
>
shifts
=
context
.
Attr
<
std
::
vector
<
int64_t
>>
(
"shifts"
);
if
(
context
.
HasInput
(
"ShiftsTensor"
))
{
const
auto
*
shifts_tensor
=
context
.
Input
<
framework
::
Tensor
>
(
"ShiftsTensor"
);
PADDLE_ENFORCE_EQ
(
shifts_tensor
->
dims
().
size
(),
1
,
platform
::
errors
::
InvalidArgument
(
"The rank of ShiftsTensor is expected to be 1, got %s"
,
shifts_tensor
->
dims
().
size
()));
shifts
=
GetDataFromTensor
<
int64_t
>
(
shifts_tensor
);
}
std
::
vector
<
int64_t
>
dims
=
context
.
Attr
<
std
::
vector
<
int64_t
>>
(
"axis"
);
auto
*
in_data
=
in
->
data
<
T
>
();
...
...
paddle/fluid/operators/roll_op.h
浏览文件 @
7b1e30fc
...
...
@@ -16,6 +16,8 @@
#include <memory>
#include <vector>
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/operators/utils.h"
#include "paddle/fluid/platform/enforce.h"
namespace
paddle
{
namespace
operators
{
...
...
@@ -85,6 +87,16 @@ class RollKernel : public framework::OpKernel<T> {
auto
&
input
=
input_var
->
Get
<
LoDTensor
>
();
auto
*
output
=
output_var
->
GetMutable
<
LoDTensor
>
();
std
::
vector
<
int64_t
>
shifts
=
context
.
Attr
<
std
::
vector
<
int64_t
>>
(
"shifts"
);
if
(
context
.
HasInput
(
"ShiftsTensor"
))
{
const
auto
*
shifts_tensor
=
context
.
Input
<
framework
::
Tensor
>
(
"ShiftsTensor"
);
PADDLE_ENFORCE_EQ
(
shifts_tensor
->
dims
().
size
(),
1
,
platform
::
errors
::
InvalidArgument
(
"The rank of ShiftsTensor is expected to be 1, got %s"
,
shifts_tensor
->
dims
().
size
()));
shifts
=
GetDataFromTensor
<
int64_t
>
(
shifts_tensor
);
}
std
::
vector
<
int64_t
>
dims
=
context
.
Attr
<
std
::
vector
<
int64_t
>>
(
"axis"
);
std
::
vector
<
T
>
out_vec
;
...
...
@@ -123,6 +135,11 @@ class RollGradKernel : public framework::OpKernel<T> {
auto
&
input
=
input_var
->
Get
<
LoDTensor
>
();
auto
*
output
=
output_var
->
GetMutable
<
LoDTensor
>
();
std
::
vector
<
int64_t
>
shifts
=
context
.
Attr
<
std
::
vector
<
int64_t
>>
(
"shifts"
);
if
(
context
.
HasInput
(
"ShiftsTensor"
))
{
const
auto
*
shifts_tensor
=
context
.
Input
<
framework
::
Tensor
>
(
"ShiftsTensor"
);
shifts
=
GetDataFromTensor
<
int64_t
>
(
shifts_tensor
);
}
std
::
vector
<
int64_t
>
dims
=
context
.
Attr
<
std
::
vector
<
int64_t
>>
(
"axis"
);
std
::
vector
<
T
>
out_vec
;
...
...
python/paddle/fluid/tests/unittests/test_roll_op.py
浏览文件 @
7b1e30fc
...
...
@@ -122,6 +122,34 @@ class TestRollAPI(unittest.TestCase):
self
.
assertRaises
(
ValueError
,
test_axis_out_range
)
def
test_shifts_as_tensor_dygraph
(
self
):
with
fluid
.
dygraph
.
guard
():
x
=
paddle
.
arange
(
9
).
reshape
([
3
,
3
])
shape
=
paddle
.
shape
(
x
)
shifts
=
shape
//
2
axes
=
[
0
,
1
]
out
=
paddle
.
roll
(
x
,
shifts
=
shifts
,
axis
=
axes
).
numpy
()
expected_out
=
np
.
array
([[
8
,
6
,
7
],
[
2
,
0
,
1
],
[
5
,
3
,
4
]])
self
.
assertTrue
(
np
.
allclose
(
out
,
expected_out
))
def
test_shifts_as_tensor_static
(
self
):
with
program_guard
(
Program
(),
Program
()):
x
=
paddle
.
arange
(
9
).
reshape
([
3
,
3
]).
astype
(
'float32'
)
shape
=
paddle
.
shape
(
x
)
shifts
=
shape
//
2
axes
=
[
0
,
1
]
out
=
paddle
.
roll
(
x
,
shifts
=
shifts
,
axis
=
axes
)
expected_out
=
np
.
array
([[
8
,
6
,
7
],
[
2
,
0
,
1
],
[
5
,
3
,
4
]])
exe
=
fluid
.
Executor
(
fluid
.
CPUPlace
())
[
out_np
]
=
exe
.
run
(
fetch_list
=
[
out
])
self
.
assertTrue
(
np
.
allclose
(
out_np
,
expected_out
))
if
paddle
.
is_compiled_with_cuda
():
exe
=
fluid
.
Executor
(
fluid
.
CPUPlace
())
[
out_np
]
=
exe
.
run
(
fetch_list
=
[
out
])
self
.
assertTrue
(
np
.
allclose
(
out_np
,
expected_out
))
if
__name__
==
"__main__"
:
unittest
.
main
()
python/paddle/tensor/manipulation.py
浏览文件 @
7b1e30fc
...
...
@@ -696,15 +696,24 @@ def roll(x, shifts, axis=None, name=None):
helper
=
LayerHelper
(
"roll"
,
**
locals
())
check_type
(
axis
,
'axis'
,
(
list
,
tuple
),
'roll'
)
check_type
(
shifts
,
'shifts'
,
(
list
,
tuple
),
'roll'
)
out
=
helper
.
create_variable_for_type_inference
(
x
.
dtype
)
helper
.
append_op
(
type
=
'roll'
,
inputs
=
{
'X'
:
x
},
outputs
=
{
'Out'
:
out
},
attrs
=
{
'axis'
:
axis
,
'shifts'
:
shifts
})
if
isinstance
(
shifts
,
Variable
):
helper
.
append_op
(
type
=
'roll'
,
inputs
=
{
'X'
:
x
,
"ShiftsTensor"
:
shifts
},
outputs
=
{
'Out'
:
out
},
attrs
=
{
'axis'
:
axis
})
else
:
check_type
(
shifts
,
'shifts'
,
(
list
,
tuple
),
'roll'
)
helper
.
append_op
(
type
=
'roll'
,
inputs
=
{
'X'
:
x
},
outputs
=
{
'Out'
:
out
},
attrs
=
{
'axis'
:
axis
,
'shifts'
:
shifts
})
return
out
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录