Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
852c78b3
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
未验证
提交
852c78b3
编写于
9月 03, 2021
作者:
D
danleifeng
提交者:
GitHub
9月 03, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[cherry-pick] fix flatten infershape (#35398)
* fix flatten infershape; test=develop * fix flatten infershape; test=develop
上级
e04b66f2
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
44 addition
and
3 deletion
+44
-3
paddle/fluid/operators/flatten_op.cc
paddle/fluid/operators/flatten_op.cc
+15
-3
python/paddle/fluid/tests/unittests/test_flatten2_op.py
python/paddle/fluid/tests/unittests/test_flatten2_op.py
+15
-0
python/paddle/fluid/tests/unittests/test_flatten_contiguous_range_op.py
...fluid/tests/unittests/test_flatten_contiguous_range_op.py
+14
-0
未找到文件。
paddle/fluid/operators/flatten_op.cc
浏览文件 @
852c78b3
...
...
@@ -55,11 +55,19 @@ class FlattenOp : public framework::OperatorWithKernel {
int64_t
outer
=
1
,
inner
=
1
;
for
(
int
i
=
0
;
i
<
in_dims
.
size
();
++
i
)
{
if
(
i
<
axis
)
{
if
(
in_dims
[
i
]
==
-
1
||
outer
==
-
1
)
{
outer
=
-
1
;
}
else
{
outer
*=
in_dims
[
i
];
}
}
else
{
if
(
in_dims
[
i
]
==
-
1
||
inner
==
-
1
)
{
inner
=
-
1
;
}
else
{
inner
*=
in_dims
[
i
];
}
}
}
std
::
vector
<
int32_t
>
out_shape
(
2
);
out_shape
[
0
]
=
outer
;
out_shape
[
1
]
=
inner
;
...
...
@@ -296,8 +304,12 @@ class FlattenContiguousRangeOp : public framework::OperatorWithKernel {
out_shape
.
push_back
(
in_dims
[
i
]);
}
for
(
int
i
=
start_axis
;
i
<=
stop_axis
;
i
++
)
{
if
(
in_dims
[
i
]
==
-
1
||
outer
==
-
1
)
{
outer
=
-
1
;
}
else
{
outer
*=
in_dims
[
i
];
}
}
out_shape
.
push_back
(
outer
);
for
(
int
i
=
stop_axis
+
1
;
i
<
in_dims_size
;
i
++
)
{
out_shape
.
push_back
(
in_dims
[
i
]);
...
...
python/paddle/fluid/tests/unittests/test_flatten2_op.py
浏览文件 @
852c78b3
...
...
@@ -17,6 +17,7 @@ from __future__ import print_function
import
unittest
import
numpy
as
np
import
paddle.fluid
as
fluid
import
paddle
from
op_test
import
OpTest
...
...
@@ -69,6 +70,20 @@ class TestFlattenOpSixDims(TestFlattenOp):
self
.
new_shape
=
(
36
,
16
)
class
TestStaticFlattenInferShapePythonAPI
(
unittest
.
TestCase
):
def
execute_api
(
self
,
x
,
axis
=
1
):
return
fluid
.
layers
.
flatten
(
x
,
axis
=
axis
)
def
test_static_api
(
self
):
paddle
.
enable_static
()
main_prog
=
paddle
.
static
.
Program
()
with
paddle
.
static
.
program_guard
(
main_prog
,
paddle
.
static
.
Program
()):
x
=
paddle
.
static
.
data
(
name
=
"x"
,
shape
=
[
-
1
,
3
,
-
1
,
-
1
],
dtype
=
'float32'
)
out
=
self
.
execute_api
(
x
,
axis
=
2
)
self
.
assertTrue
((
-
1
,
-
1
)
==
out
.
shape
)
class
TestFlatten2OpError
(
unittest
.
TestCase
):
def
test_errors
(
self
):
with
fluid
.
program_guard
(
fluid
.
Program
(),
fluid
.
Program
()):
...
...
python/paddle/fluid/tests/unittests/test_flatten_contiguous_range_op.py
浏览文件 @
852c78b3
...
...
@@ -201,6 +201,20 @@ class TestStaticFlattenPythonAPI(unittest.TestCase):
self
.
assertTrue
((
2
,
3
,
16
)
==
fetch_out
[
0
].
shape
)
class
TestStaticFlattenInferShapePythonAPI
(
unittest
.
TestCase
):
def
execute_api
(
self
,
x
,
start_axis
=
0
,
stop_axis
=-
1
):
return
paddle
.
flatten
(
x
,
start_axis
,
stop_axis
)
def
test_static_api
(
self
):
paddle
.
enable_static
()
main_prog
=
paddle
.
static
.
Program
()
with
paddle
.
static
.
program_guard
(
main_prog
,
paddle
.
static
.
Program
()):
x
=
paddle
.
static
.
data
(
name
=
"x"
,
shape
=
[
-
1
,
3
,
-
1
,
-
1
],
dtype
=
'float32'
)
out
=
self
.
execute_api
(
x
,
start_axis
=
2
,
stop_axis
=
3
)
self
.
assertTrue
((
-
1
,
3
,
-
1
)
==
out
.
shape
)
class
TestStaticInplaceFlattenPythonAPI
(
TestStaticFlattenPythonAPI
):
def
execute_api
(
self
,
x
,
start_axis
=
0
,
stop_axis
=-
1
):
return
x
.
flatten_
(
start_axis
,
stop_axis
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录