Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
吃玉米的猫
Paddle
提交
e19736d7
P
Paddle
项目概览
吃玉米的猫
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e19736d7
编写于
6月 10, 2021
作者:
W
wangguanzhong
提交者:
GitHub
6月 10, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix aligned in roi_align (#33444)
上级
dffc331f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
12 deletion
+22
-12
paddle/fluid/operators/roi_align_op.cu
paddle/fluid/operators/roi_align_op.cu
+9
-6
paddle/fluid/operators/roi_align_op.h
paddle/fluid/operators/roi_align_op.h
+9
-3
python/paddle/fluid/tests/unittests/test_roi_align_op.py
python/paddle/fluid/tests/unittests/test_roi_align_op.py
+4
-3
未找到文件。
paddle/fluid/operators/roi_align_op.cu
浏览文件 @
e19736d7
...
@@ -124,8 +124,10 @@ __global__ void GPUROIAlignForward(
...
@@ -124,8 +124,10 @@ __global__ void GPUROIAlignForward(
T
roi_width
=
roi_xmax
-
roi_xmin
;
T
roi_width
=
roi_xmax
-
roi_xmin
;
T
roi_height
=
roi_ymax
-
roi_ymin
;
T
roi_height
=
roi_ymax
-
roi_ymin
;
roi_width
=
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
if
(
!
continuous_coordinate
)
{
roi_height
=
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
roi_width
=
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
roi_height
=
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
}
T
bin_size_h
=
static_cast
<
T
>
(
roi_height
)
/
static_cast
<
T
>
(
pooled_height
);
T
bin_size_h
=
static_cast
<
T
>
(
roi_height
)
/
static_cast
<
T
>
(
pooled_height
);
T
bin_size_w
=
static_cast
<
T
>
(
roi_width
)
/
static_cast
<
T
>
(
pooled_width
);
T
bin_size_w
=
static_cast
<
T
>
(
roi_width
)
/
static_cast
<
T
>
(
pooled_width
);
...
@@ -138,7 +140,7 @@ __global__ void GPUROIAlignForward(
...
@@ -138,7 +140,7 @@ __global__ void GPUROIAlignForward(
:
ceil
(
roi_height
/
pooled_height
);
:
ceil
(
roi_height
/
pooled_height
);
int
roi_bin_grid_w
=
int
roi_bin_grid_w
=
(
sampling_ratio
>
0
)
?
sampling_ratio
:
ceil
(
roi_width
/
pooled_width
);
(
sampling_ratio
>
0
)
?
sampling_ratio
:
ceil
(
roi_width
/
pooled_width
);
const
T
count
=
roi_bin_grid_h
*
roi_bin_grid_w
;
const
T
count
=
max
(
roi_bin_grid_h
*
roi_bin_grid_w
,
1
)
;
T
output_val
=
0
;
T
output_val
=
0
;
for
(
int
iy
=
0
;
iy
<
roi_bin_grid_h
;
iy
++
)
{
for
(
int
iy
=
0
;
iy
<
roi_bin_grid_h
;
iy
++
)
{
const
T
y
=
roi_ymin
+
ph
*
bin_size_h
+
const
T
y
=
roi_ymin
+
ph
*
bin_size_h
+
...
@@ -180,9 +182,10 @@ __global__ void GPUROIAlignBackward(
...
@@ -180,9 +182,10 @@ __global__ void GPUROIAlignBackward(
T
roi_width
=
roi_xmax
-
roi_xmin
;
T
roi_width
=
roi_xmax
-
roi_xmin
;
T
roi_height
=
roi_ymax
-
roi_ymin
;
T
roi_height
=
roi_ymax
-
roi_ymin
;
roi_width
=
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
if
(
!
continuous_coordinate
)
{
roi_height
=
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
roi_width
=
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
roi_height
=
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
}
T
bin_size_h
=
static_cast
<
T
>
(
roi_height
)
/
static_cast
<
T
>
(
pooled_height
);
T
bin_size_h
=
static_cast
<
T
>
(
roi_height
)
/
static_cast
<
T
>
(
pooled_height
);
T
bin_size_w
=
static_cast
<
T
>
(
roi_width
)
/
static_cast
<
T
>
(
pooled_width
);
T
bin_size_w
=
static_cast
<
T
>
(
roi_width
)
/
static_cast
<
T
>
(
pooled_width
);
...
...
paddle/fluid/operators/roi_align_op.h
浏览文件 @
e19736d7
...
@@ -226,8 +226,10 @@ class CPUROIAlignOpKernel : public framework::OpKernel<T> {
...
@@ -226,8 +226,10 @@ class CPUROIAlignOpKernel : public framework::OpKernel<T> {
T
roi_width
=
roi_xmax
-
roi_xmin
;
T
roi_width
=
roi_xmax
-
roi_xmin
;
T
roi_height
=
roi_ymax
-
roi_ymin
;
T
roi_height
=
roi_ymax
-
roi_ymin
;
roi_width
=
std
::
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
if
(
!
aligned
)
{
roi_height
=
std
::
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
roi_width
=
std
::
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
roi_height
=
std
::
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
}
T
bin_size_h
=
static_cast
<
T
>
(
roi_height
)
/
static_cast
<
T
>
(
pooled_height
);
T
bin_size_h
=
static_cast
<
T
>
(
roi_height
)
/
static_cast
<
T
>
(
pooled_height
);
T
bin_size_w
=
static_cast
<
T
>
(
roi_width
)
/
static_cast
<
T
>
(
pooled_width
);
T
bin_size_w
=
static_cast
<
T
>
(
roi_width
)
/
static_cast
<
T
>
(
pooled_width
);
...
@@ -239,7 +241,7 @@ class CPUROIAlignOpKernel : public framework::OpKernel<T> {
...
@@ -239,7 +241,7 @@ class CPUROIAlignOpKernel : public framework::OpKernel<T> {
int
roi_bin_grid_w
=
(
sampling_ratio
>
0
)
int
roi_bin_grid_w
=
(
sampling_ratio
>
0
)
?
sampling_ratio
?
sampling_ratio
:
ceil
(
roi_width
/
pooled_width
);
:
ceil
(
roi_width
/
pooled_width
);
const
T
count
=
roi_bin_grid_h
*
roi_bin_grid_w
;
const
T
count
=
std
::
max
(
roi_bin_grid_h
*
roi_bin_grid_w
,
1
)
;
Tensor
pre_pos
;
Tensor
pre_pos
;
Tensor
pre_w
;
Tensor
pre_w
;
int
pre_size
=
count
*
out_stride
[
1
];
int
pre_size
=
count
*
out_stride
[
1
];
...
@@ -362,6 +364,10 @@ class CPUROIAlignGradOpKernel : public framework::OpKernel<T> {
...
@@ -362,6 +364,10 @@ class CPUROIAlignGradOpKernel : public framework::OpKernel<T> {
T
roi_height
=
roi_ymax
-
roi_ymin
;
T
roi_height
=
roi_ymax
-
roi_ymin
;
roi_width
=
std
::
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
roi_width
=
std
::
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
roi_height
=
std
::
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
roi_height
=
std
::
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
if
(
!
aligned
)
{
roi_width
=
std
::
max
(
roi_width
,
static_cast
<
T
>
(
1.
));
roi_height
=
std
::
max
(
roi_height
,
static_cast
<
T
>
(
1.
));
}
T
bin_size_h
=
static_cast
<
T
>
(
roi_height
)
/
static_cast
<
T
>
(
pooled_height
);
T
bin_size_h
=
static_cast
<
T
>
(
roi_height
)
/
static_cast
<
T
>
(
pooled_height
);
T
bin_size_w
=
static_cast
<
T
>
(
roi_width
)
/
static_cast
<
T
>
(
pooled_width
);
T
bin_size_w
=
static_cast
<
T
>
(
roi_width
)
/
static_cast
<
T
>
(
pooled_width
);
...
...
python/paddle/fluid/tests/unittests/test_roi_align_op.py
浏览文件 @
e19736d7
...
@@ -129,8 +129,9 @@ class TestROIAlignOp(OpTest):
...
@@ -129,8 +129,9 @@ class TestROIAlignOp(OpTest):
roi_width
=
roi_xmax
-
roi_xmin
roi_width
=
roi_xmax
-
roi_xmin
roi_height
=
roi_ymax
-
roi_ymin
roi_height
=
roi_ymax
-
roi_ymin
roi_width
=
max
(
roi_width
,
1
)
if
not
self
.
aligned
:
roi_height
=
max
(
roi_height
,
1
)
roi_width
=
max
(
roi_width
,
1
)
roi_height
=
max
(
roi_height
,
1
)
bin_size_h
=
float
(
roi_height
)
/
float
(
self
.
pooled_height
)
bin_size_h
=
float
(
roi_height
)
/
float
(
self
.
pooled_height
)
bin_size_w
=
float
(
roi_width
)
/
float
(
self
.
pooled_width
)
bin_size_w
=
float
(
roi_width
)
/
float
(
self
.
pooled_width
)
...
@@ -138,7 +139,7 @@ class TestROIAlignOp(OpTest):
...
@@ -138,7 +139,7 @@ class TestROIAlignOp(OpTest):
math
.
ceil
(
roi_height
/
self
.
pooled_height
)
math
.
ceil
(
roi_height
/
self
.
pooled_height
)
roi_bin_grid_w
=
self
.
sampling_ratio
if
self
.
sampling_ratio
>
0
else
\
roi_bin_grid_w
=
self
.
sampling_ratio
if
self
.
sampling_ratio
>
0
else
\
math
.
ceil
(
roi_width
/
self
.
pooled_width
)
math
.
ceil
(
roi_width
/
self
.
pooled_width
)
count
=
int
(
roi_bin_grid_h
*
roi_bin_grid_w
)
count
=
max
(
int
(
roi_bin_grid_h
*
roi_bin_grid_w
),
1
)
pre_size
=
count
*
self
.
pooled_width
*
self
.
pooled_height
pre_size
=
count
*
self
.
pooled_width
*
self
.
pooled_height
bilinear_pos
,
bilinear_w
=
self
.
pre_calc
(
x_i
,
roi_xmin
,
roi_ymin
,
bilinear_pos
,
bilinear_w
=
self
.
pre_calc
(
x_i
,
roi_xmin
,
roi_ymin
,
int
(
roi_bin_grid_h
),
int
(
roi_bin_grid_h
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录