Skip to content

fix flatten_ stride calcaulate error & add paddle.flatten_ #63084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeff41404 merged 7 commits into from
Apr 9, 2024
Merged

fix flatten_ stride calcaulate error & add paddle.flatten_ #63084

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
abd069c
fix flatten_ stride calcaulate error & add paddle.flatten_
GGBond8488 Mar 28, 2024
ee31335
remove log
GGBond8488 Mar 28, 2024
22367f4
fix stride error
GGBond8488 Mar 29, 2024
4bf6302
rm glog
GGBond8488 Mar 29, 2024
f3f09c1
add stride error testcase
GGBond8488 Apr 7, 2024
6dfa19d
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
GGBond8488 Apr 7, 2024
bb586e7
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
GGBond8488 Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion paddle/phi/kernels/flatten_kernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ void FlattenInferStridedKernel(const Context& dev_ctx,
const DenseTensor& x,
int start_axis,
int stop_axis,
DenseTensor* out);
DenseTensor* out,
DenseTensor* xshape);

template <typename Context>
void FlattenStridedKernel(const Context& dev_ctx,
Expand Down
10 changes: 6 additions & 4 deletions paddle/phi/kernels/stride/flatten_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ void FlattenInferStridedKernel(const Context& dev_ctx,
const DenseTensor& x,
int start_axis UNUSED,
int stop_axis UNUSED,
DenseTensor* out) {
DenseTensor* out,
DenseTensor* xshape) {
ReshapeStridedKernel<Context>(
dev_ctx,
x,
IntArray(common::vectorize<int64_t>(out->dims())),
out,
nullptr);
xshape);
}

template <typename Context>
Expand All @@ -38,8 +39,9 @@ void FlattenStridedKernel(const Context& dev_ctx,
int start_axis,
int stop_axis,
DenseTensor* out,
DenseTensor* xshape UNUSED) {
FlattenInferStridedKernel<Context>(dev_ctx, x, start_axis, stop_axis, out);
DenseTensor* xshape) {
FlattenInferStridedKernel<Context>(
dev_ctx, x, start_axis, stop_axis, out, xshape);
}

} // namespace phi
Expand Down
1 change: 0 additions & 1 deletion paddle/phi/kernels/stride/reshape_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ void ReshapeStridedKernel(const Context& dev_ctx,
size_t x_offset = x.offset();
if (xshape) {
x_dims = DDim(xshape->dims().Get() + 1, xshape->dims().size() - 1);
x_stride = xshape->strides();
}
MetaTensor meta_out(out);
InferMetaFromVecValue(x, shape.GetData(), &meta_out);
Expand Down
2 changes: 2 additions & 0 deletions python/paddle/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@
expand,
expand_as,
flatten,
flatten_,
flip,
flip as reverse,
gather,
Expand Down Expand Up @@ -881,6 +882,7 @@
'set_printoptions',
'std',
'flatten',
'flatten_',
'asin',
'multiply',
'multiply_',
Expand Down