Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
ccd42db7
P
Paddle
项目概览
Crayon鑫
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
ccd42db7
编写于
3年前
作者:
D
danleifeng
提交者:
GitHub
3年前
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix flatten infershape (#35321)
上级
a6cc567f
develop
Ligoml-patch-1
ZHUI-patch-1
add_some_yaml_config
cherry_undefined_var
delete_disable_iterable_dataset_unittest
delete_fix_undefined_var
delete_revert-36057-dev/read_flags_in_ut
dingjiaweiww-patch-1
disable_iterable_dataset_unittest
dy2static
enable_eager_model_test
final_state_gen_python_c
final_state_intermediate
fix-numpy-issue
fix_concat_slice
fix_op_flops
fix_rnn_docs
fix_tensor_type
fix_undefined_var
incubate/infrt
inplace_addto
make_flag_adding_easier
move_embedding_to_phi
move_histogram_to_pten
move_sgd_to_phi
move_slice_to_pten
move_temporal_shift_to_phi
move_yolo_box_to_phi
npu_fix_alloc
preln_ernie
prv-md-even-more
prv-onednn-2.5
pten_tensor_refactor
release/2.2
release/2.3
release/2.3-fc-ernie-fix
release/2.4
revert-36057-dev/read_flags_in_ut
revert-36201-refine_fast_threaded_ssa_graph_executor
revert-36985-add_license
revert-37318-refactor_dygraph_to_eager
revert-37926-eager_coreops_500
revert-37956-revert-37727-pylayer_support_tuple
revert-38100-mingdong
revert-38301-allocation_rearrange_pr
revert-38703-numpy_bf16_package_reupload
revert-38732-remove_useless_header_in_elementwise_mul_grad
revert-38959-Reduce_Grad
revert-39143-adjust_empty
revert-39227-move_trace_op_to_pten
revert-39268-dev/remove_concat_fluid_kernel
revert-40170-support_partial_grad
revert-41056-revert-40727-move_some_activaion_to_phi
revert-41065-revert-40993-mv_ele_floordiv_pow
revert-41068-revert-40790-phi_new
revert-41944-smaller_inference_api_test
revert-42149-do-not-reset-default-stream-for-stream-safe-cuda-allocator
revert-43155-fix_ut_tempfile
revert-43882-revert-41944-smaller_inference_api_test
revert-45808-phi/simplify_size_op
revert-46827-deform_comment
support_weight_transpose
zhiqiu-patch-1
v2.4.0-rc0
v2.3.2
v2.3.1
v2.3.0
v2.3.0-rc0
v2.2.2
v2.2.1
v2.2.0
v2.2.0-rc0
v2.2.0-bak0
无相关合并请求
变更
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
浏览文件 @
ccd42db7
...
...
@@ -55,9 +55,17 @@ class FlattenOp : public framework::OperatorWithKernel {
int64_t
outer
=
1
,
inner
=
1
;
for
(
int
i
=
0
;
i
<
in_dims
.
size
();
++
i
)
{
if
(
i
<
axis
)
{
outer
*=
in_dims
[
i
];
if
(
in_dims
[
i
]
==
-
1
||
outer
==
-
1
)
{
outer
=
-
1
;
}
else
{
outer
*=
in_dims
[
i
];
}
}
else
{
inner
*=
in_dims
[
i
];
if
(
in_dims
[
i
]
==
-
1
||
inner
==
-
1
)
{
inner
=
-
1
;
}
else
{
inner
*=
in_dims
[
i
];
}
}
}
std
::
vector
<
int32_t
>
out_shape
(
2
);
...
...
@@ -296,7 +304,11 @@ class FlattenContiguousRangeOp : public framework::OperatorWithKernel {
out_shape
.
push_back
(
in_dims
[
i
]);
}
for
(
int
i
=
start_axis
;
i
<=
stop_axis
;
i
++
)
{
outer
*=
in_dims
[
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
++
)
{
...
...
This diff is collapsed.
Click to expand it.
python/paddle/fluid/tests/unittests/test_flatten2_op.py
浏览文件 @
ccd42db7
...
...
@@ -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
()):
...
...
This diff is collapsed.
Click to expand it.
python/paddle/fluid/tests/unittests/test_flatten_contiguous_range_op.py
浏览文件 @
ccd42db7
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部