Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
cb6ece6d
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
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看板
提交
cb6ece6d
编写于
4月 15, 2019
作者:
T
tink2123
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modified infer shape
test=develop
上级
a5ef6bff
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
48 addition
and
18 deletion
+48
-18
paddle/fluid/operators/affine_channel_op.cc
paddle/fluid/operators/affine_channel_op.cc
+9
-2
paddle/fluid/operators/conv_op.cc
paddle/fluid/operators/conv_op.cc
+8
-3
paddle/fluid/operators/detection_map_op.cc
paddle/fluid/operators/detection_map_op.cc
+4
-2
paddle/fluid/operators/roi_pool_op.cc
paddle/fluid/operators/roi_pool_op.cc
+8
-6
paddle/fluid/operators/row_conv_op.cc
paddle/fluid/operators/row_conv_op.cc
+12
-3
paddle/fluid/operators/unpool_op.cc
paddle/fluid/operators/unpool_op.cc
+7
-2
未找到文件。
paddle/fluid/operators/affine_channel_op.cc
浏览文件 @
cb6ece6d
...
...
@@ -79,9 +79,16 @@ class AffineChannelOp : public framework::OperatorWithKernel {
:
x_dims
[
x_dims
.
size
()
-
1
]);
PADDLE_ENFORCE_EQ
(
scale_dims
.
size
(),
1UL
);
PADDLE_ENFORCE_EQ
(
scale_dims
[
0
],
C
);
PADDLE_ENFORCE_EQ
(
b_dims
.
size
(),
1UL
);
PADDLE_ENFORCE_EQ
(
b_dims
[
0
],
C
);
if
(
ctx
->
IsRuntime
())
{
PADDLE_ENFORCE_EQ
(
scale_dims
[
0
],
C
);
PADDLE_ENFORCE_EQ
(
b_dims
[
0
],
C
);
}
else
{
if
(
scale_dims
[
0
]
>
0
&&
b_dims
[
0
]
>
0
)
{
PADDLE_ENFORCE_EQ
(
scale_dims
[
0
],
C
);
PADDLE_ENFORCE_EQ
(
b_dims
[
0
],
C
);
}
}
ctx
->
SetOutputDim
(
"Out"
,
ctx
->
GetInputDim
(
"X"
));
ctx
->
ShareLoD
(
"X"
,
"Out"
);
...
...
paddle/fluid/operators/conv_op.cc
浏览文件 @
cb6ece6d
...
...
@@ -68,9 +68,14 @@ void ConvOp::InferShape(framework::InferShapeContext* ctx) const {
std
::
vector
<
int64_t
>
output_shape
({
in_dims
[
0
],
filter_dims
[
0
]});
for
(
size_t
i
=
0
;
i
<
strides
.
size
();
++
i
)
{
output_shape
.
push_back
(
ConvOutputSize
(
in_dims
[
i
+
2
],
filter_dims
[
i
+
2
],
dilations
[
i
],
paddings
[
i
],
strides
[
i
]));
if
((
!
ctx
->
IsRuntime
())
&&
(
in_dims
[
i
+
2
]
==
-
1
||
filter_dims
[
i
+
2
]
==
-
1
))
{
output_shape
.
push_back
(
-
1
);
}
else
{
output_shape
.
push_back
(
ConvOutputSize
(
in_dims
[
i
+
2
],
filter_dims
[
i
+
2
],
dilations
[
i
],
paddings
[
i
],
strides
[
i
]));
}
}
ctx
->
SetOutputDim
(
"Output"
,
framework
::
make_ddim
(
output_shape
));
ctx
->
ShareLoD
(
"Input"
,
"Output"
);
...
...
paddle/fluid/operators/detection_map_op.cc
浏览文件 @
cb6ece6d
...
...
@@ -51,8 +51,10 @@ class DetectionMAPOp : public framework::OperatorWithKernel {
PADDLE_ENFORCE_EQ
(
label_dims
.
size
(),
2
,
"The rank of Input(Label) must be 2, "
"the shape is [N, 6]."
);
PADDLE_ENFORCE
(
label_dims
[
1
]
==
6
||
label_dims
[
1
]
==
5
,
"The shape of Input(Label) is [N, 6] or [N, 5]."
);
if
(
ctx
->
IsRuntime
()
||
label_dims
[
1
]
>
0
)
{
PADDLE_ENFORCE
(
label_dims
[
1
]
==
6
||
label_dims
[
1
]
==
5
,
"The shape of Input(Label) is [N, 6] or [N, 5]."
);
}
if
(
ctx
->
HasInput
(
"PosCount"
))
{
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"TruePos"
),
...
...
paddle/fluid/operators/roi_pool_op.cc
浏览文件 @
cb6ece6d
...
...
@@ -50,12 +50,14 @@ class ROIPoolOp : public framework::OperatorWithKernel {
int
pooled_width
=
ctx
->
Attrs
().
Get
<
int
>
(
"pooled_width"
);
float
spatial_scale
=
ctx
->
Attrs
().
Get
<
float
>
(
"spatial_scale"
);
PADDLE_ENFORCE_GT
(
pooled_height
,
0
,
"The pooled output height must greater than 0"
);
PADDLE_ENFORCE_GT
(
pooled_width
,
0
,
"The pooled output width must greater than 0"
);
PADDLE_ENFORCE_GT
(
spatial_scale
,
0.0
f
,
"The spatial scale must greater than 0"
);
if
(
ctx
->
IsRuntime
())
{
PADDLE_ENFORCE_GT
(
pooled_height
,
0
,
"The pooled output height must greater than 0"
);
PADDLE_ENFORCE_GT
(
pooled_width
,
0
,
"The pooled output width must greater than 0"
);
PADDLE_ENFORCE_GT
(
spatial_scale
,
0.0
f
,
"The spatial scale must greater than 0"
);
}
auto
out_dims
=
input_dims
;
out_dims
[
0
]
=
rois_dims
[
0
];
...
...
paddle/fluid/operators/row_conv_op.cc
浏览文件 @
cb6ece6d
...
...
@@ -41,9 +41,18 @@ class RowConvOp : public framework::OperatorWithKernel {
auto
filter_dims
=
ctx
->
GetInputDim
(
"Filter"
);
PADDLE_ENFORCE_EQ
(
x_dims
.
size
(),
2
,
"Input(X)'s rank should be 2."
);
PADDLE_ENFORCE_EQ
(
filter_dims
.
size
(),
2
,
"Input(Y)'s rank should be 2."
);
PADDLE_ENFORCE_EQ
(
x_dims
[
1
],
filter_dims
[
1
],
"The 2nd dimension of Input(X) and Input(Filter) should be same."
);
if
(
ctx
->
IsRuntime
())
{
PADDLE_ENFORCE_EQ
(
x_dims
[
1
],
filter_dims
[
1
],
"The 2nd dimension of Input(X) and Input(Filter) should be same."
);
}
else
{
if
(
x_dims
[
1
]
>
0
&&
filter_dims
[
1
]
>
0
)
{
PADDLE_ENFORCE_EQ
(
x_dims
[
1
],
filter_dims
[
1
],
"The 2nd dimension of Input(X) and Input(Filter) should be same."
);
}
}
ctx
->
SetOutputDim
(
"Out"
,
x_dims
);
ctx
->
ShareLoD
(
"X"
,
"Out"
);
}
...
...
paddle/fluid/operators/unpool_op.cc
浏览文件 @
cb6ece6d
...
...
@@ -99,10 +99,15 @@ class UnpoolOp : public framework::OperatorWithKernel {
PADDLE_ENFORCE
(
in_x_dims
.
size
()
==
4
,
"Unpooling intput must be of 4-dimensional."
);
PADDLE_ENFORCE_EQ
(
in_x_dims
,
in_y_dims
);
std
::
vector
<
int64_t
>
output_shape
({
in_x_dims
[
0
],
in_x_dims
[
1
]});
for
(
size_t
i
=
0
;
i
<
ksize
.
size
();
++
i
)
{
output_shape
.
push_back
(
UnpoolOutputSize
(
in_x_dims
[
i
+
2
],
ksize
[
i
],
paddings
[
i
],
strides
[
i
]));
if
(
!
ctx
->
IsRuntime
()
&&
in_x_dims
[
i
+
2
]
==
-
1
)
{
output_shape
.
push_back
(
-
1
);
}
else
{
output_shape
.
push_back
(
UnpoolOutputSize
(
in_x_dims
[
i
+
2
],
ksize
[
i
],
paddings
[
i
],
strides
[
i
]));
}
}
ctx
->
SetOutputDim
(
"Out"
,
framework
::
make_ddim
(
output_shape
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录