Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
579173d8
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
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看板
未验证
提交
579173d8
编写于
3月 18, 2022
作者:
Z
zyfncg
提交者:
GitHub
3月 18, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Phi] Move infershape of roi_pool to phi (#40682)
* move infershape of roi_pool to phi * polish code
上级
7f93e2b0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
102 addition
and
80 deletion
+102
-80
paddle/fluid/operators/roi_pool_op.cc
paddle/fluid/operators/roi_pool_op.cc
+8
-70
paddle/phi/infermeta/ternary.cc
paddle/phi/infermeta/ternary.cc
+85
-10
paddle/phi/infermeta/ternary.h
paddle/phi/infermeta/ternary.h
+9
-0
未找到文件。
paddle/fluid/operators/roi_pool_op.cc
浏览文件 @
579173d8
...
@@ -13,9 +13,11 @@ See the License for the specific language governing permissions and
...
@@ -13,9 +13,11 @@ See the License for the specific language governing permissions and
limitations under the License. */
limitations under the License. */
#include <memory>
#include <memory>
#include "paddle/fluid/framework/infershape_utils.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_version_registry.h"
#include "paddle/fluid/framework/op_version_registry.h"
#include "paddle/phi/kernels/roi_pool_kernel.h"
#include "paddle/phi/core/infermeta_utils.h"
#include "paddle/phi/infermeta/ternary.h"
namespace
paddle
{
namespace
paddle
{
namespace
operators
{
namespace
operators
{
...
@@ -27,74 +29,6 @@ class ROIPoolOp : public framework::OperatorWithKernel {
...
@@ -27,74 +29,6 @@ class ROIPoolOp : public framework::OperatorWithKernel {
public:
public:
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"X"
),
"Input"
,
"X"
,
"roi_pool"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"ROIs"
),
"Input"
,
"ROIs"
,
"roi_pool"
);
OP_INOUT_CHECK
(
ctx
->
HasOutput
(
"Out"
),
"Output"
,
"Out"
,
"roi_pool"
);
OP_INOUT_CHECK
(
ctx
->
HasOutput
(
"Argmax"
),
"Output"
,
"Argmax"
,
"roi_pool"
);
auto
input_dims
=
ctx
->
GetInputDim
(
"X"
);
auto
rois_dims
=
ctx
->
GetInputDim
(
"ROIs"
);
if
(
ctx
->
HasInput
(
"RoisNum"
))
{
auto
rois_num_dims
=
ctx
->
GetInputDim
(
"RoisNum"
);
PADDLE_ENFORCE_EQ
(
rois_num_dims
.
size
(),
1
,
platform
::
errors
::
InvalidArgument
(
"The second dimension of RoisNum should "
"be 1, but received dimension is %d"
,
rois_num_dims
.
size
()));
}
PADDLE_ENFORCE_EQ
(
input_dims
.
size
(),
4
,
platform
::
errors
::
InvalidArgument
(
"The input data should be a four-dimensional "
"tensor with [N,C,H,W], but received input data with "
" %d dimension"
,
input_dims
.
size
()));
PADDLE_ENFORCE_EQ
(
rois_dims
.
size
(),
2
,
platform
::
errors
::
InvalidArgument
(
"ROIs should be a 2-D LoDTensor with shape (num_rois, 4)"
"given as [[x1, y1, x2, y2], ...], but received ROIs is "
"%d-dimensional LoDTensor"
,
rois_dims
.
size
()));
PADDLE_ENFORCE_EQ
(
rois_dims
[
1
],
phi
::
kROISize
,
platform
::
errors
::
InvalidArgument
(
"ROIs should be a 2-D LoDTensor with shape (num_rois, 4)"
"given as [[x1, y1, x2, y2], ...]. But the second dimension of "
"the received data is %d"
,
rois_dims
[
1
]));
int
pooled_height
=
ctx
->
Attrs
().
Get
<
int
>
(
"pooled_height"
);
int
pooled_width
=
ctx
->
Attrs
().
Get
<
int
>
(
"pooled_width"
);
float
spatial_scale
=
ctx
->
Attrs
().
Get
<
float
>
(
"spatial_scale"
);
PADDLE_ENFORCE_GT
(
pooled_height
,
0
,
platform
::
errors
::
OutOfRange
(
"The pooled output height must be greater than 0"
"but received height is %d"
,
pooled_height
));
PADDLE_ENFORCE_GT
(
pooled_width
,
0
,
platform
::
errors
::
OutOfRange
(
"The pooled output width must be greater than 0"
"but received width is %d"
,
pooled_width
));
PADDLE_ENFORCE_GT
(
spatial_scale
,
0.0
f
,
platform
::
errors
::
OutOfRange
(
"The spatial scale must be greater than 0, "
"but received spatial scale is %f"
,
spatial_scale
));
auto
out_dims
=
input_dims
;
out_dims
[
0
]
=
rois_dims
[
0
];
out_dims
[
1
]
=
input_dims
[
1
];
out_dims
[
2
]
=
pooled_height
;
out_dims
[
3
]
=
pooled_width
;
ctx
->
SetOutputDim
(
"Out"
,
out_dims
);
ctx
->
SetOutputDim
(
"Argmax"
,
out_dims
);
}
protected:
protected:
framework
::
OpKernelType
GetExpectedKernelType
(
framework
::
OpKernelType
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
...
@@ -213,9 +147,13 @@ class ROIPoolGradMaker : public framework::SingleGradOpMaker<T> {
...
@@ -213,9 +147,13 @@ class ROIPoolGradMaker : public framework::SingleGradOpMaker<T> {
}
// namespace paddle
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
ops
=
paddle
::
operators
;
DECLARE_INFER_SHAPE_FUNCTOR
(
roi_pool
,
RoiPoolInferShapeFunctor
,
PD_INFER_META
(
phi
::
RoiPoolInferMeta
));
REGISTER_OPERATOR
(
roi_pool
,
ops
::
ROIPoolOp
,
ops
::
ROIPoolOpMaker
,
REGISTER_OPERATOR
(
roi_pool
,
ops
::
ROIPoolOp
,
ops
::
ROIPoolOpMaker
,
ops
::
ROIPoolGradMaker
<
paddle
::
framework
::
OpDesc
>
,
ops
::
ROIPoolGradMaker
<
paddle
::
framework
::
OpDesc
>
,
ops
::
ROIPoolGradMaker
<
paddle
::
imperative
::
OpBase
>
);
ops
::
ROIPoolGradMaker
<
paddle
::
imperative
::
OpBase
>
,
RoiPoolInferShapeFunctor
);
REGISTER_OPERATOR
(
roi_pool_grad
,
ops
::
ROIPoolGradOp
);
REGISTER_OPERATOR
(
roi_pool_grad
,
ops
::
ROIPoolGradOp
);
REGISTER_OP_VERSION
(
roi_pool
)
REGISTER_OP_VERSION
(
roi_pool
)
...
...
paddle/phi/infermeta/ternary.cc
浏览文件 @
579173d8
...
@@ -340,29 +340,29 @@ void RoiAlignInferMeta(const MetaTensor& x,
...
@@ -340,29 +340,29 @@ void RoiAlignInferMeta(const MetaTensor& x,
PADDLE_ENFORCE_EQ
(
PADDLE_ENFORCE_EQ
(
boxes_num_dims
.
size
(),
boxes_num_dims
.
size
(),
1
,
1
,
phi
::
errors
::
InvalidArgument
(
"The size of
RoisN
um should be 1"
phi
::
errors
::
InvalidArgument
(
"The size of
boxes_n
um should be 1"
", but received size = %d"
,
", but received size = %d"
,
boxes_num_dims
.
size
()));
boxes_num_dims
.
size
()));
}
}
PADDLE_ENFORCE_EQ
(
input_dims
.
size
(),
PADDLE_ENFORCE_EQ
(
input_dims
.
size
(),
4
,
4
,
phi
::
errors
::
InvalidArgument
(
phi
::
errors
::
InvalidArgument
(
"The format of Input(
X
) in"
"The format of Input(
x
) in"
"Ro
I
AlignOp is NCHW. And the rank of input must be 4. "
"Ro
i
AlignOp is NCHW. And the rank of input must be 4. "
"But received rank = %d"
,
"But received rank = %d"
,
input_dims
.
size
()));
input_dims
.
size
()));
PADDLE_ENFORCE_EQ
(
boxes_dims
.
size
(),
PADDLE_ENFORCE_EQ
(
boxes_dims
.
size
(),
2
,
2
,
phi
::
errors
::
InvalidArgument
(
"The rank of Input(
ROI
s) "
phi
::
errors
::
InvalidArgument
(
"The rank of Input(
boxe
s) "
"in Ro
I
AlignOp should be 2. "
"in Ro
i
AlignOp should be 2. "
"But the rank of
RoI
s is %d"
,
"But the rank of
boxe
s is %d"
,
boxes_dims
.
size
()));
boxes_dims
.
size
()));
if
(
config
.
is_runtime
)
{
if
(
config
.
is_runtime
)
{
PADDLE_ENFORCE_EQ
(
boxes_dims
[
1
],
PADDLE_ENFORCE_EQ
(
boxes_dims
[
1
],
4
,
4
,
phi
::
errors
::
InvalidArgument
(
phi
::
errors
::
InvalidArgument
(
"The second dimension "
"The second dimension "
"of Input(
ROI
s) should be 4. But received the "
"of Input(
boxe
s) should be 4. But received the "
"dimension = %d"
,
"dimension = %d"
,
boxes_dims
[
1
]));
boxes_dims
[
1
]));
}
}
...
@@ -370,21 +370,21 @@ void RoiAlignInferMeta(const MetaTensor& x,
...
@@ -370,21 +370,21 @@ void RoiAlignInferMeta(const MetaTensor& x,
PADDLE_ENFORCE_GT
(
pooled_height
,
PADDLE_ENFORCE_GT
(
pooled_height
,
0
,
0
,
phi
::
errors
::
InvalidArgument
(
phi
::
errors
::
InvalidArgument
(
"The 'pooled_height' attribute in Ro
I
AlignOp is "
"The 'pooled_height' attribute in Ro
i
AlignOp is "
"invalid. The height must be greater than 0. But "
"invalid. The height must be greater than 0. But "
"received 'pooled_height' = %d"
,
"received 'pooled_height' = %d"
,
pooled_height
));
pooled_height
));
PADDLE_ENFORCE_GT
(
pooled_width
,
PADDLE_ENFORCE_GT
(
pooled_width
,
0
,
0
,
phi
::
errors
::
InvalidArgument
(
phi
::
errors
::
InvalidArgument
(
"The 'pooled_width' attribute in Ro
I
AlignOp is "
"The 'pooled_width' attribute in Ro
i
AlignOp is "
"invalid. The width must be greater than 0. But "
"invalid. The width must be greater than 0. But "
"received 'pooled_width' = %d"
,
"received 'pooled_width' = %d"
,
pooled_width
));
pooled_width
));
PADDLE_ENFORCE_GT
(
spatial_scale
,
PADDLE_ENFORCE_GT
(
spatial_scale
,
0.0
f
,
0.0
f
,
phi
::
errors
::
InvalidArgument
(
phi
::
errors
::
InvalidArgument
(
"The 'spatial_scale' attribute in Ro
I
AlignOp is "
"The 'spatial_scale' attribute in Ro
i
AlignOp is "
"invalid. The scale must be greater than 0. But "
"invalid. The scale must be greater than 0. But "
"received 'spatial_scale' = %f"
,
"received 'spatial_scale' = %f"
,
spatial_scale
));
spatial_scale
));
...
@@ -399,6 +399,81 @@ void RoiAlignInferMeta(const MetaTensor& x,
...
@@ -399,6 +399,81 @@ void RoiAlignInferMeta(const MetaTensor& x,
out
->
set_dtype
(
x
.
dtype
());
out
->
set_dtype
(
x
.
dtype
());
}
}
void
RoiPoolInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
boxes
,
paddle
::
optional
<
const
MetaTensor
&>
boxes_num
,
int
pooled_height
,
int
pooled_width
,
float
spatial_scale
,
MetaTensor
*
out
,
MetaTensor
*
arg_max
)
{
auto
input_dims
=
x
.
dims
();
auto
boxes_dims
=
boxes
.
dims
();
if
(
boxes_num
)
{
auto
boxes_num_dims
=
boxes_num
->
dims
();
PADDLE_ENFORCE_EQ
(
boxes_num_dims
.
size
(),
1
,
phi
::
errors
::
InvalidArgument
(
"The second dimension of boxes_num should "
"be 1, but received dimension is %d"
,
boxes_num_dims
.
size
()));
}
PADDLE_ENFORCE_EQ
(
input_dims
.
size
(),
4
,
phi
::
errors
::
InvalidArgument
(
"The input data should be a four-dimensional "
"tensor with [N,C,H,W], but received input data with "
" %d dimension"
,
input_dims
.
size
()));
PADDLE_ENFORCE_EQ
(
boxes_dims
.
size
(),
2
,
phi
::
errors
::
InvalidArgument
(
"boxes should be a 2-D LoDTensor with shape (num_boxes, 4)"
"given as [[x1, y1, x2, y2], ...], but received boxes is "
"%d-dimensional LoDTensor"
,
boxes_dims
.
size
()));
PADDLE_ENFORCE_EQ
(
boxes_dims
[
1
],
4
,
phi
::
errors
::
InvalidArgument
(
"boxes should be a 2-D LoDTensor with shape (num_boxes, 4)"
"given as [[x1, y1, x2, y2], ...]. But the second dimension of "
"the received data is %d"
,
boxes_dims
[
1
]));
PADDLE_ENFORCE_GT
(
pooled_height
,
0
,
phi
::
errors
::
OutOfRange
(
"The pooled output height must be greater than 0"
"but received height is %d"
,
pooled_height
));
PADDLE_ENFORCE_GT
(
pooled_width
,
0
,
phi
::
errors
::
OutOfRange
(
"The pooled output width must be greater than 0"
"but received width is %d"
,
pooled_width
));
PADDLE_ENFORCE_GT
(
spatial_scale
,
0.0
f
,
phi
::
errors
::
OutOfRange
(
"The spatial scale must be greater than 0, "
"but received spatial scale is %f"
,
spatial_scale
));
auto
out_dims
=
input_dims
;
out_dims
[
0
]
=
boxes_dims
[
0
];
out_dims
[
1
]
=
input_dims
[
1
];
out_dims
[
2
]
=
pooled_height
;
out_dims
[
3
]
=
pooled_width
;
out
->
set_dims
(
out_dims
);
out
->
set_dtype
(
x
.
dtype
());
arg_max
->
set_dims
(
out_dims
);
arg_max
->
set_dtype
(
DataType
::
INT64
);
}
void
ScatterInferMeta
(
const
MetaTensor
&
x
,
void
ScatterInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
index
,
const
MetaTensor
&
index
,
const
MetaTensor
&
updates
,
const
MetaTensor
&
updates
,
...
...
paddle/phi/infermeta/ternary.h
浏览文件 @
579173d8
...
@@ -84,6 +84,15 @@ void RoiAlignInferMeta(const MetaTensor& x,
...
@@ -84,6 +84,15 @@ void RoiAlignInferMeta(const MetaTensor& x,
MetaTensor
*
out
,
MetaTensor
*
out
,
MetaConfig
config
=
MetaConfig
());
MetaConfig
config
=
MetaConfig
());
void
RoiPoolInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
boxes
,
paddle
::
optional
<
const
MetaTensor
&>
boxes_num
,
int
pooled_height
,
int
pooled_width
,
float
spatial_scale
,
MetaTensor
*
out
,
MetaTensor
*
arg_max
);
void
ScatterInferMeta
(
const
MetaTensor
&
x
,
void
ScatterInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
index
,
const
MetaTensor
&
index
,
const
MetaTensor
&
updates
,
const
MetaTensor
&
updates
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录