Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
9cc5603d
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2297
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,发现更多精彩内容 >>
未验证
提交
9cc5603d
编写于
9月 28, 2020
作者:
W
whs
提交者:
GitHub
9月 28, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make grid support stopping graients. (#27630)
上级
074a71bd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
68 addition
and
55 deletion
+68
-55
paddle/fluid/operators/grid_sampler_op.cc
paddle/fluid/operators/grid_sampler_op.cc
+0
-2
paddle/fluid/operators/grid_sampler_op.cu
paddle/fluid/operators/grid_sampler_op.cu
+21
-13
paddle/fluid/operators/grid_sampler_op.h
paddle/fluid/operators/grid_sampler_op.h
+47
-40
未找到文件。
paddle/fluid/operators/grid_sampler_op.cc
浏览文件 @
9cc5603d
...
@@ -176,8 +176,6 @@ class GridSampleOpGrad : public framework::OperatorWithKernel {
...
@@ -176,8 +176,6 @@ class GridSampleOpGrad : public framework::OperatorWithKernel {
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
OP_INOUT_CHECK
(
ctx
->
HasOutput
(
framework
::
GradVarName
(
"X"
)),
"Output"
,
OP_INOUT_CHECK
(
ctx
->
HasOutput
(
framework
::
GradVarName
(
"X"
)),
"Output"
,
framework
::
GradVarName
(
"X"
),
"grid_sampler"
);
framework
::
GradVarName
(
"X"
),
"grid_sampler"
);
OP_INOUT_CHECK
(
ctx
->
HasOutput
(
framework
::
GradVarName
(
"Grid"
)),
"Output"
,
framework
::
GradVarName
(
"Grid"
),
"grid_sampler"
);
auto
input_dims
=
ctx
->
GetInputDim
(
"X"
);
auto
input_dims
=
ctx
->
GetInputDim
(
"X"
);
auto
grid_dims
=
ctx
->
GetInputDim
(
"Grid"
);
auto
grid_dims
=
ctx
->
GetInputDim
(
"Grid"
);
if
(
ctx
->
HasOutput
(
framework
::
GradVarName
(
"X"
)))
{
if
(
ctx
->
HasOutput
(
framework
::
GradVarName
(
"X"
)))
{
...
...
paddle/fluid/operators/grid_sampler_op.cu
浏览文件 @
9cc5603d
...
@@ -397,9 +397,11 @@ __global__ void grid_sampler_cuda_backward_kernel(
...
@@ -397,9 +397,11 @@ __global__ void grid_sampler_cuda_backward_kernel(
}
}
}
}
T
*
gGrid_ptr_NHW
=
grad_grid
+
index
*
grid_sW
;
if
(
grad_grid
!=
nullptr
)
{
gGrid_ptr_NHW
[
0
]
=
gix_mult
*
gix
;
T
*
gGrid_ptr_NHW
=
grad_grid
+
index
*
grid_sW
;
gGrid_ptr_NHW
[
1
]
=
giy_mult
*
giy
;
gGrid_ptr_NHW
[
0
]
=
gix_mult
*
gix
;
gGrid_ptr_NHW
[
1
]
=
giy_mult
*
giy
;
}
}
else
if
(
mode
==
Mode
::
nearest
)
{
}
else
if
(
mode
==
Mode
::
nearest
)
{
int
ix_nearest
=
static_cast
<
int
>
(
::
round
(
ix
));
int
ix_nearest
=
static_cast
<
int
>
(
::
round
(
ix
));
int
iy_nearest
=
static_cast
<
int
>
(
::
round
(
iy
));
int
iy_nearest
=
static_cast
<
int
>
(
::
round
(
iy
));
...
@@ -412,9 +414,11 @@ __global__ void grid_sampler_cuda_backward_kernel(
...
@@ -412,9 +414,11 @@ __global__ void grid_sampler_cuda_backward_kernel(
in_w
,
grad_output
[
gOut_offset
]);
in_w
,
grad_output
[
gOut_offset
]);
}
}
T
*
gGrid_ptr_NHW
=
grad_grid
+
index
*
grid_sW
;
if
(
grad_grid
!=
nullptr
)
{
gGrid_ptr_NHW
[
0
]
=
static_cast
<
T
>
(
0
);
T
*
gGrid_ptr_NHW
=
grad_grid
+
index
*
grid_sW
;
gGrid_ptr_NHW
[
1
]
=
static_cast
<
T
>
(
0
);
gGrid_ptr_NHW
[
0
]
=
static_cast
<
T
>
(
0
);
gGrid_ptr_NHW
[
1
]
=
static_cast
<
T
>
(
0
);
}
}
}
}
}
}
}
...
@@ -460,11 +464,15 @@ class GridSampleGradOpCUDAKernel : public framework::OpKernel<T> {
...
@@ -460,11 +464,15 @@ class GridSampleGradOpCUDAKernel : public framework::OpKernel<T> {
math
::
SetConstant
<
paddle
::
platform
::
CUDADeviceContext
,
T
>
()(
math
::
SetConstant
<
paddle
::
platform
::
CUDADeviceContext
,
T
>
()(
ctx
.
template
device_context
<
paddle
::
platform
::
CUDADeviceContext
>(),
ctx
.
template
device_context
<
paddle
::
platform
::
CUDADeviceContext
>(),
input_grad
,
static_cast
<
T
>
(
0
));
input_grad
,
static_cast
<
T
>
(
0
));
auto
*
grid_grad
=
ctx
.
Output
<
Tensor
>
(
framework
::
GradVarName
(
"Grid"
));
grid_grad
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
T
*
grid_grad_data
=
nullptr
;
math
::
SetConstant
<
paddle
::
platform
::
CUDADeviceContext
,
T
>
()(
if
(
ctx
.
HasOutput
(
framework
::
GradVarName
(
"Grid"
)))
{
ctx
.
template
device_context
<
paddle
::
platform
::
CUDADeviceContext
>(),
auto
*
grid_grad
=
ctx
.
Output
<
Tensor
>
(
framework
::
GradVarName
(
"Grid"
));
grid_grad
,
static_cast
<
T
>
(
0
));
grid_grad_data
=
grid_grad
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
math
::
SetConstant
<
paddle
::
platform
::
CUDADeviceContext
,
T
>
()(
ctx
.
template
device_context
<
paddle
::
platform
::
CUDADeviceContext
>(),
grid_grad
,
static_cast
<
T
>
(
0
));
}
int
count
=
static_cast
<
int
>
(
n
*
out_h
*
out_w
);
int
count
=
static_cast
<
int
>
(
n
*
out_h
*
out_w
);
auto
cu_stream
=
dev_ctx
.
stream
();
auto
cu_stream
=
dev_ctx
.
stream
();
...
@@ -472,8 +480,8 @@ class GridSampleGradOpCUDAKernel : public framework::OpKernel<T> {
...
@@ -472,8 +480,8 @@ class GridSampleGradOpCUDAKernel : public framework::OpKernel<T> {
int
grid_size
=
(
count
+
block
-
1
)
/
block
;
int
grid_size
=
(
count
+
block
-
1
)
/
block
;
grid_sampler_cuda_backward_kernel
<
T
><<<
block
,
grid_size
,
0
,
cu_stream
>>>
(
grid_sampler_cuda_backward_kernel
<
T
><<<
block
,
grid_size
,
0
,
cu_stream
>>>
(
count
,
output_grad
->
data
<
T
>
(),
input
->
data
<
T
>
(),
grid
->
data
<
T
>
(),
n
,
c
,
count
,
output_grad
->
data
<
T
>
(),
input
->
data
<
T
>
(),
grid
->
data
<
T
>
(),
n
,
c
,
out_h
,
out_w
,
in_h
,
in_w
,
input_grad
->
data
<
T
>
(),
grid_grad
->
data
<
T
>
()
,
out_h
,
out_w
,
in_h
,
in_w
,
input_grad
->
data
<
T
>
(),
grid_grad
_data
,
mode
,
mode
,
padding_mode
,
align_corners
);
padding_mode
,
align_corners
);
}
}
};
};
...
...
paddle/fluid/operators/grid_sampler_op.h
浏览文件 @
9cc5603d
...
@@ -450,45 +450,47 @@ static void gatherBilinearGrad(const platform::CPUDeviceContext& ctx,
...
@@ -450,45 +450,47 @@ static void gatherBilinearGrad(const platform::CPUDeviceContext& ctx,
auto
output_grad_t
=
EigenTensor
<
T
,
4
>::
From
(
output_grad
);
auto
output_grad_t
=
EigenTensor
<
T
,
4
>::
From
(
output_grad
);
Tensor
grid_grad_x
,
grid_grad_y
;
if
(
grid_grad
!=
nullptr
)
{
grid_grad_x
.
mutable_data
<
T
>
({
n
,
out_h
,
out_w
},
ctx
.
GetPlace
());
Tensor
grid_grad_x
,
grid_grad_y
;
grid_grad_y
.
mutable_data
<
T
>
({
n
,
out_h
,
out_w
},
ctx
.
GetPlace
());
grid_grad_x
.
mutable_data
<
T
>
({
n
,
out_h
,
out_w
},
ctx
.
GetPlace
());
auto
grid_grad_x_t
=
grid_grad_y
.
mutable_data
<
T
>
({
n
,
out_h
,
out_w
},
ctx
.
GetPlace
());
EigenTensor
<
T
,
3
>::
From
(
grid_grad_x
).
setConstant
(
static_cast
<
T
>
(
0.0
));
auto
grid_grad_x_t
=
auto
grid_grad_y_t
=
EigenTensor
<
T
,
3
>::
From
(
grid_grad_x
).
setConstant
(
static_cast
<
T
>
(
0.0
));
EigenTensor
<
T
,
3
>::
From
(
grid_grad_y
).
setConstant
(
static_cast
<
T
>
(
0.0
));
auto
grid_grad_y_t
=
for
(
int
i
=
0
;
i
<
n
;
i
++
)
{
EigenTensor
<
T
,
3
>::
From
(
grid_grad_y
).
setConstant
(
static_cast
<
T
>
(
0.0
));
for
(
int
j
=
0
;
j
<
c
;
j
++
)
{
for
(
int
i
=
0
;
i
<
n
;
i
++
)
{
for
(
int
k
=
0
;
k
<
out_h
;
k
++
)
{
for
(
int
j
=
0
;
j
<
c
;
j
++
)
{
for
(
int
l
=
0
;
l
<
out_w
;
l
++
)
{
for
(
int
k
=
0
;
k
<
out_h
;
k
++
)
{
grid_grad_x_t
(
i
,
k
,
l
)
+=
for
(
int
l
=
0
;
l
<
out_w
;
l
++
)
{
((
v_en_t
(
i
,
j
,
k
,
l
)
-
v_wn_t
(
i
,
j
,
k
,
l
))
*
d_s_t
(
i
,
k
,
l
)
+
grid_grad_x_t
(
i
,
k
,
l
)
+=
(
v_es_t
(
i
,
j
,
k
,
l
)
-
v_ws_t
(
i
,
j
,
k
,
l
))
*
d_n_t
(
i
,
k
,
l
))
*
((
v_en_t
(
i
,
j
,
k
,
l
)
-
v_wn_t
(
i
,
j
,
k
,
l
))
*
d_s_t
(
i
,
k
,
l
)
+
output_grad_t
(
i
,
j
,
k
,
l
);
(
v_es_t
(
i
,
j
,
k
,
l
)
-
v_ws_t
(
i
,
j
,
k
,
l
))
*
d_n_t
(
i
,
k
,
l
))
*
grid_grad_y_t
(
i
,
k
,
l
)
+=
output_grad_t
(
i
,
j
,
k
,
l
);
((
v_ws_t
(
i
,
j
,
k
,
l
)
-
v_wn_t
(
i
,
j
,
k
,
l
))
*
d_e_t
(
i
,
k
,
l
)
+
grid_grad_y_t
(
i
,
k
,
l
)
+=
(
v_es_t
(
i
,
j
,
k
,
l
)
-
v_en_t
(
i
,
j
,
k
,
l
))
*
d_w_t
(
i
,
k
,
l
))
*
((
v_ws_t
(
i
,
j
,
k
,
l
)
-
v_wn_t
(
i
,
j
,
k
,
l
))
*
d_e_t
(
i
,
k
,
l
)
+
output_grad_t
(
i
,
j
,
k
,
l
);
(
v_es_t
(
i
,
j
,
k
,
l
)
-
v_en_t
(
i
,
j
,
k
,
l
))
*
d_w_t
(
i
,
k
,
l
))
*
output_grad_t
(
i
,
j
,
k
,
l
);
}
}
}
}
}
}
}
}
// const T x_max = static_cast<T>(in_w - 1);
// const T y_max = static_cast<T>(in_h - 1);
auto
grid_x_scale_t
=
EigenTensor
<
T
,
3
>::
From
(
*
grid_x_scale
);
auto
grid_y_scale_t
=
EigenTensor
<
T
,
3
>::
From
(
*
grid_y_scale
);
grid_grad_x_t
=
grid_grad_x_t
*
grid_x_scale_t
;
grid_grad_y_t
=
grid_grad_y_t
*
grid_y_scale_t
;
// gather grid_grad [x, y] in 3rd Dim
// const T x_max = static_cast<T>(in_w - 1);
T
*
grid_grad_data
=
grid_grad
->
data
<
T
>
();
// const T y_max = static_cast<T>(in_h - 1);
T
*
grid_grad_x_data
=
grid_grad_x
.
data
<
T
>
();
T
*
grid_grad_y_data
=
grid_grad_y
.
data
<
T
>
();
auto
grid_x_scale_t
=
EigenTensor
<
T
,
3
>::
From
(
*
grid_x_scale
);
for
(
int
i
=
0
;
i
<
n
*
out_h
*
out_w
;
i
++
)
{
auto
grid_y_scale_t
=
EigenTensor
<
T
,
3
>::
From
(
*
grid_y_scale
);
grid_grad_data
[
2
*
i
]
=
grid_grad_x_data
[
i
];
grid_grad_x_t
=
grid_grad_x_t
*
grid_x_scale_t
;
grid_grad_data
[
2
*
i
+
1
]
=
grid_grad_y_data
[
i
];
grid_grad_y_t
=
grid_grad_y_t
*
grid_y_scale_t
;
// gather grid_grad [x, y] in 3rd Dim
T
*
grid_grad_data
=
grid_grad
->
data
<
T
>
();
T
*
grid_grad_x_data
=
grid_grad_x
.
data
<
T
>
();
T
*
grid_grad_y_data
=
grid_grad_y
.
data
<
T
>
();
for
(
int
i
=
0
;
i
<
n
*
out_h
*
out_w
;
i
++
)
{
grid_grad_data
[
2
*
i
]
=
grid_grad_x_data
[
i
];
grid_grad_data
[
2
*
i
+
1
]
=
grid_grad_y_data
[
i
];
}
}
}
}
}
...
@@ -558,11 +560,16 @@ class GridSampleGradOpKernel : public framework::OpKernel<T> {
...
@@ -558,11 +560,16 @@ class GridSampleGradOpKernel : public framework::OpKernel<T> {
math
::
SetConstant
<
DeviceContext
,
T
>
()(
math
::
SetConstant
<
DeviceContext
,
T
>
()(
ctx
.
template
device_context
<
DeviceContext
>(),
input_grad
,
ctx
.
template
device_context
<
DeviceContext
>(),
input_grad
,
static_cast
<
T
>
(
0
));
static_cast
<
T
>
(
0
));
auto
*
grid_grad
=
ctx
.
Output
<
Tensor
>
(
framework
::
GradVarName
(
"Grid"
));
grid_grad
->
mutable_data
<
T
>
({
n
,
out_h
,
out_w
,
2
},
ctx
.
GetPlace
());
Tensor
*
grid_grad
=
nullptr
;
math
::
SetConstant
<
DeviceContext
,
T
>
()(
if
(
ctx
.
HasOutput
(
framework
::
GradVarName
(
"Grid"
)))
{
ctx
.
template
device_context
<
DeviceContext
>(),
grid_grad
,
grid_grad
=
ctx
.
Output
<
Tensor
>
(
framework
::
GradVarName
(
"Grid"
));
static_cast
<
T
>
(
0
));
grid_grad
->
mutable_data
<
T
>
({
n
,
out_h
,
out_w
,
2
},
ctx
.
GetPlace
());
math
::
SetConstant
<
DeviceContext
,
T
>
()(
ctx
.
template
device_context
<
DeviceContext
>(),
grid_grad
,
static_cast
<
T
>
(
0
));
}
Tensor
grid_x
,
grid_y
;
Tensor
grid_x
,
grid_y
;
Tensor
grid_x_scale
,
grid_y_scale
;
Tensor
grid_x_scale
,
grid_y_scale
;
calcGridLocationsWithGrad
<
T
>
(
calcGridLocationsWithGrad
<
T
>
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录