Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
35c48c75
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
35c48c75
编写于
1月 03, 2023
作者:
D
DesmonDay
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support 0D for paddle.sort/argsort
上级
72973d5a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
160 addition
and
12 deletion
+160
-12
paddle/phi/infermeta/unary.cc
paddle/phi/infermeta/unary.cc
+20
-12
paddle/phi/kernels/cpu/argsort_grad_kernel.cc
paddle/phi/kernels/cpu/argsort_grad_kernel.cc
+7
-0
paddle/phi/kernels/cpu/argsort_kernel.cc
paddle/phi/kernels/cpu/argsort_kernel.cc
+9
-0
paddle/phi/kernels/gpu/argsort_grad_kernel.cu
paddle/phi/kernels/gpu/argsort_grad_kernel.cu
+8
-0
paddle/phi/kernels/gpu/argsort_kernel.cu
paddle/phi/kernels/gpu/argsort_kernel.cu
+8
-0
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
+72
-0
python/paddle/fluid/tests/unittests/xpu/test_zero_dim_tensor_xpu.py
...dle/fluid/tests/unittests/xpu/test_zero_dim_tensor_xpu.py
+36
-0
未找到文件。
paddle/phi/infermeta/unary.cc
浏览文件 @
35c48c75
...
@@ -220,18 +220,26 @@ void ArgsortInferMeta(const MetaTensor& input,
...
@@ -220,18 +220,26 @@ void ArgsortInferMeta(const MetaTensor& input,
MetaTensor
*
indices
)
{
MetaTensor
*
indices
)
{
auto
in_dims
=
input
.
dims
();
auto
in_dims
=
input
.
dims
();
auto
num_dims
=
in_dims
.
size
();
auto
num_dims
=
in_dims
.
size
();
PADDLE_ENFORCE_GE
(
if
(
num_dims
>
0
)
{
axis
,
PADDLE_ENFORCE_GE
(
axis
,
-
num_dims
,
-
num_dims
,
phi
::
errors
::
InvalidArgument
(
"'axis'(%d) must be greater than or equal to"
phi
::
errors
::
InvalidArgument
(
" -num_dims(%d)."
,
"'axis'(%d) must be greater than or equal to"
axis
,
" -num_dims(%d)."
,
-
num_dims
));
axis
,
PADDLE_ENFORCE_LT
(
-
num_dims
));
axis
,
PADDLE_ENFORCE_LT
(
num_dims
,
axis
,
phi
::
errors
::
InvalidArgument
(
num_dims
,
"'axis'(%d) must be less than num_dims(%d)."
,
axis
,
num_dims
));
phi
::
errors
::
InvalidArgument
(
"'axis'(%d) must be less than num_dims(%d)."
,
axis
,
num_dims
));
}
else
{
// 0-dim tensor
PADDLE_ENFORCE_EQ
(
axis
==
0
||
axis
==
-
1
,
1
,
phi
::
errors
::
InvalidArgument
(
"'axis'(%d) must be 0 or -1 if input tensor is 0-dim."
,
axis
));
}
output
->
share_dims
(
input
);
output
->
share_dims
(
input
);
output
->
set_dtype
(
input
.
dtype
());
output
->
set_dtype
(
input
.
dtype
());
...
...
paddle/phi/kernels/cpu/argsort_grad_kernel.cc
浏览文件 @
35c48c75
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
#include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/transpose_kernel.h"
#include "paddle/phi/kernels/transpose_kernel.h"
namespace
phi
{
namespace
phi
{
...
@@ -58,6 +59,7 @@ void ArgsortGradKernel(const Context& dev_ctx,
...
@@ -58,6 +59,7 @@ void ArgsortGradKernel(const Context& dev_ctx,
bool
descending
,
bool
descending
,
DenseTensor
*
in_grad
)
{
DenseTensor
*
in_grad
)
{
auto
in_dims
=
indices
.
dims
();
auto
in_dims
=
indices
.
dims
();
auto
rank
=
input
.
dims
().
size
();
axis
=
(
axis
<
0
)
?
(
in_dims
.
size
()
+
axis
)
:
axis
;
axis
=
(
axis
<
0
)
?
(
in_dims
.
size
()
+
axis
)
:
axis
;
dev_ctx
.
template
Alloc
<
T
>(
in_grad
);
dev_ctx
.
template
Alloc
<
T
>(
in_grad
);
auto
dxt
=
EigenVector
<
T
>::
Flatten
(
*
in_grad
);
auto
dxt
=
EigenVector
<
T
>::
Flatten
(
*
in_grad
);
...
@@ -65,6 +67,11 @@ void ArgsortGradKernel(const Context& dev_ctx,
...
@@ -65,6 +67,11 @@ void ArgsortGradKernel(const Context& dev_ctx,
dxt
.
device
(
place
)
=
dxt
.
constant
(
static_cast
<
T
>
(
0
));
dxt
.
device
(
place
)
=
dxt
.
constant
(
static_cast
<
T
>
(
0
));
if
(
out_grad
.
numel
()
==
0
)
return
;
if
(
out_grad
.
numel
()
==
0
)
return
;
if
(
rank
==
0
)
{
phi
::
funcs
::
set_constant
(
dev_ctx
,
in_grad
,
1.0
);
return
;
}
// Do full assign
// Do full assign
if
(
axis
==
-
1
||
axis
+
1
==
in_dims
.
size
())
{
if
(
axis
==
-
1
||
axis
+
1
==
in_dims
.
size
())
{
const
int64_t
input_height
=
const
int64_t
input_height
=
...
...
paddle/phi/kernels/cpu/argsort_kernel.cc
浏览文件 @
35c48c75
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
#include "paddle/phi/kernels/funcs/eigen/eigen_function.h"
#include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/transpose_kernel.h"
#include "paddle/phi/kernels/transpose_kernel.h"
namespace
phi
{
namespace
phi
{
...
@@ -75,9 +76,17 @@ void ArgsortKernel(const Context& dev_ctx,
...
@@ -75,9 +76,17 @@ void ArgsortKernel(const Context& dev_ctx,
DenseTensor
*
output
,
DenseTensor
*
output
,
DenseTensor
*
indices
)
{
DenseTensor
*
indices
)
{
auto
in_dims
=
input
.
dims
();
auto
in_dims
=
input
.
dims
();
auto
rank
=
in_dims
.
size
();
axis
=
(
axis
<
0
)
?
(
in_dims
.
size
()
+
axis
)
:
axis
;
axis
=
(
axis
<
0
)
?
(
in_dims
.
size
()
+
axis
)
:
axis
;
T
*
out_data
=
dev_ctx
.
template
Alloc
<
T
>(
output
);
T
*
out_data
=
dev_ctx
.
template
Alloc
<
T
>(
output
);
// For 0D Tensor
if
(
rank
==
0
)
{
phi
::
Copy
<
Context
>
(
dev_ctx
,
input
,
dev_ctx
.
GetPlace
(),
false
,
output
);
phi
::
funcs
::
set_constant
(
dev_ctx
,
indices
,
0
);
return
;
}
// Do full sort
// Do full sort
if
(
axis
==
-
1
||
axis
+
1
==
in_dims
.
size
())
{
if
(
axis
==
-
1
||
axis
+
1
==
in_dims
.
size
())
{
const
int64_t
input_height
=
const
int64_t
input_height
=
...
...
paddle/phi/kernels/gpu/argsort_grad_kernel.cu
浏览文件 @
35c48c75
...
@@ -28,6 +28,7 @@ namespace cub = hipcub;
...
@@ -28,6 +28,7 @@ namespace cub = hipcub;
#include "paddle/phi/backends/gpu/gpu_context.h"
#include "paddle/phi/backends/gpu/gpu_context.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/primitive/functor_primitives.h"
#include "paddle/phi/kernels/primitive/functor_primitives.h"
#include "paddle/phi/kernels/transpose_kernel.h"
#include "paddle/phi/kernels/transpose_kernel.h"
...
@@ -141,11 +142,18 @@ void ArgsortGradKernel(const Context& dev_ctx,
...
@@ -141,11 +142,18 @@ void ArgsortGradKernel(const Context& dev_ctx,
bool
descending
,
bool
descending
,
DenseTensor
*
in_grad
)
{
DenseTensor
*
in_grad
)
{
dev_ctx
.
template
Alloc
<
T
>(
in_grad
);
dev_ctx
.
template
Alloc
<
T
>(
in_grad
);
phi
::
funcs
::
set_constant
(
dev_ctx
,
in_grad
,
0.0
);
if
(
out_grad
.
numel
()
==
0
)
return
;
if
(
out_grad
.
numel
()
==
0
)
return
;
auto
in_dims
=
in_grad
->
dims
();
auto
in_dims
=
in_grad
->
dims
();
auto
rank
=
in_dims
.
size
();
axis
=
(
axis
<
0
)
?
(
in_dims
.
size
()
+
axis
)
:
axis
;
axis
=
(
axis
<
0
)
?
(
in_dims
.
size
()
+
axis
)
:
axis
;
int64_t
size
=
in_grad
->
numel
();
int64_t
size
=
in_grad
->
numel
();
if
(
rank
==
0
)
{
phi
::
funcs
::
set_constant
(
dev_ctx
,
in_grad
,
1.0
);
return
;
}
// Parallel acceleration when the input size is equal to the length of the
// Parallel acceleration when the input size is equal to the length of the
// ‘axis’ dimension.
// ‘axis’ dimension.
// Compared to 'special case for full sort' below, the gradient calculation
// Compared to 'special case for full sort' below, the gradient calculation
...
...
paddle/phi/kernels/gpu/argsort_kernel.cu
浏览文件 @
35c48c75
...
@@ -30,6 +30,7 @@ namespace cub = hipcub;
...
@@ -30,6 +30,7 @@ namespace cub = hipcub;
#include "paddle/phi/backends/gpu/gpu_info.h"
#include "paddle/phi/backends/gpu/gpu_info.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/primitive/functor_primitives.h"
#include "paddle/phi/kernels/primitive/functor_primitives.h"
#include "paddle/phi/kernels/transpose_kernel.h"
#include "paddle/phi/kernels/transpose_kernel.h"
...
@@ -396,6 +397,7 @@ void ArgsortKernel(const Context &dev_ctx,
...
@@ -396,6 +397,7 @@ void ArgsortKernel(const Context &dev_ctx,
DenseTensor
*
output
,
DenseTensor
*
output
,
DenseTensor
*
indices
)
{
DenseTensor
*
indices
)
{
auto
in_dims
=
input
.
dims
();
auto
in_dims
=
input
.
dims
();
auto
rank
=
in_dims
.
size
();
axis
=
(
axis
<
0
)
?
(
in_dims
.
size
()
+
axis
)
:
axis
;
axis
=
(
axis
<
0
)
?
(
in_dims
.
size
()
+
axis
)
:
axis
;
const
T
*
in_data
=
input
.
data
<
T
>
();
const
T
*
in_data
=
input
.
data
<
T
>
();
...
@@ -403,6 +405,12 @@ void ArgsortKernel(const Context &dev_ctx,
...
@@ -403,6 +405,12 @@ void ArgsortKernel(const Context &dev_ctx,
T
*
out_data
=
dev_ctx
.
template
Alloc
<
T
>(
output
);
T
*
out_data
=
dev_ctx
.
template
Alloc
<
T
>(
output
);
int64_t
*
ids_data
=
dev_ctx
.
template
Alloc
<
int64_t
>(
indices
);
int64_t
*
ids_data
=
dev_ctx
.
template
Alloc
<
int64_t
>(
indices
);
if
(
rank
==
0
)
{
phi
::
Copy
<
Context
>
(
dev_ctx
,
input
,
dev_ctx
.
GetPlace
(),
false
,
output
);
phi
::
funcs
::
set_constant
(
dev_ctx
,
indices
,
0
);
return
;
}
// Use thrust for parallel acceleration when the input size is equal to the
// Use thrust for parallel acceleration when the input size is equal to the
// length of the ‘axis’ dimension.
// length of the ‘axis’ dimension.
// Compared to the following 'Special case for full sort', ascending sort is
// Compared to the following 'Special case for full sort', ascending sort is
...
...
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
浏览文件 @
35c48c75
...
@@ -747,6 +747,42 @@ class TestSundryAPI(unittest.TestCase):
...
@@ -747,6 +747,42 @@ class TestSundryAPI(unittest.TestCase):
np
.
testing
.
assert_array_equal
(
out3_1
.
numpy
(),
out3_2
.
numpy
())
np
.
testing
.
assert_array_equal
(
out3_1
.
numpy
(),
out3_2
.
numpy
())
np
.
testing
.
assert_array_equal
(
out3_2
.
numpy
(),
np
.
asarray
(
1
))
np
.
testing
.
assert_array_equal
(
out3_2
.
numpy
(),
np
.
asarray
(
1
))
def
test_sort
(
self
):
x1
=
paddle
.
rand
([])
x2
=
paddle
.
rand
([])
x1
.
stop_gradient
=
False
x2
.
stop_gradient
=
False
out1
=
paddle
.
sort
(
x1
,
axis
=-
1
)
out2
=
paddle
.
sort
(
x2
,
axis
=
0
)
out1
.
backward
()
out2
.
backward
()
self
.
assertEqual
(
out1
.
shape
,
[])
self
.
assertEqual
(
out2
.
shape
,
[])
self
.
assertEqual
(
out1
.
grad
.
shape
,
[])
self
.
assertEqual
(
out2
.
grad
.
shape
,
[])
self
.
assertEqual
(
x1
.
grad
.
shape
,
[])
self
.
assertEqual
(
x2
.
grad
.
shape
,
[])
def
test_argsort
(
self
):
x1
=
paddle
.
rand
([])
x2
=
paddle
.
rand
([])
x1
.
stop_gradient
=
False
x2
.
stop_gradient
=
False
out1
=
paddle
.
argsort
(
x1
,
axis
=-
1
)
out2
=
paddle
.
argsort
(
x2
,
axis
=
0
)
out1
.
backward
()
out2
.
backward
()
self
.
assertEqual
(
out1
.
shape
,
[])
self
.
assertEqual
(
out2
.
shape
,
[])
self
.
assertEqual
(
out1
.
grad
.
shape
,
[])
self
.
assertEqual
(
out2
.
grad
.
shape
,
[])
self
.
assertEqual
(
x1
.
grad
.
shape
,
[])
self
.
assertEqual
(
x2
.
grad
.
shape
,
[])
class
TestSundryAPIStatic
(
unittest
.
TestCase
):
class
TestSundryAPIStatic
(
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
...
@@ -990,6 +1026,42 @@ class TestSundryAPIStatic(unittest.TestCase):
...
@@ -990,6 +1026,42 @@ class TestSundryAPIStatic(unittest.TestCase):
np
.
testing
.
assert_array_equal
(
out3_1
,
out3_2
)
np
.
testing
.
assert_array_equal
(
out3_1
,
out3_2
)
np
.
testing
.
assert_array_equal
(
out3_2
,
np
.
asarray
(
1
))
np
.
testing
.
assert_array_equal
(
out3_2
,
np
.
asarray
(
1
))
@
prog_scope
()
def
test_sort
(
self
):
x1
=
paddle
.
rand
([])
x1
.
stop_gradient
=
False
out1
=
paddle
.
sort
(
x1
,
axis
=-
1
)
paddle
.
static
.
append_backward
(
out1
)
x2
=
paddle
.
rand
([])
x2
.
stop_gradient
=
False
out2
=
paddle
.
sort
(
x2
,
axis
=
0
)
paddle
.
static
.
append_backward
(
out2
)
prog
=
paddle
.
static
.
default_main_program
()
res
=
self
.
exe
.
run
(
prog
,
fetch_list
=
[
out1
,
out2
])
self
.
assertEqual
(
res
[
0
].
shape
,
())
self
.
assertEqual
(
res
[
1
].
shape
,
())
@
prog_scope
()
def
test_argsort
(
self
):
x1
=
paddle
.
rand
([])
x1
.
stop_gradient
=
False
out1
=
paddle
.
argsort
(
x1
,
axis
=-
1
)
paddle
.
static
.
append_backward
(
out1
)
x2
=
paddle
.
rand
([])
x2
.
stop_gradient
=
False
out2
=
paddle
.
argsort
(
x2
,
axis
=
0
)
paddle
.
static
.
append_backward
(
out2
)
prog
=
paddle
.
static
.
default_main_program
()
res
=
self
.
exe
.
run
(
prog
,
fetch_list
=
[
out1
,
out2
])
self
.
assertEqual
(
res
[
0
].
shape
,
())
self
.
assertEqual
(
res
[
1
].
shape
,
())
# Use to test API whose zero-dim input tensors don't have grad and not need to test backward in OpTest.
# Use to test API whose zero-dim input tensors don't have grad and not need to test backward in OpTest.
class
TestNoBackwardAPI
(
unittest
.
TestCase
):
class
TestNoBackwardAPI
(
unittest
.
TestCase
):
...
...
python/paddle/fluid/tests/unittests/xpu/test_zero_dim_tensor_xpu.py
浏览文件 @
35c48c75
...
@@ -556,6 +556,42 @@ class TestSundryAPI(unittest.TestCase):
...
@@ -556,6 +556,42 @@ class TestSundryAPI(unittest.TestCase):
np
.
testing
.
assert_array_equal
(
out3_1
.
numpy
(),
out3_2
.
numpy
())
np
.
testing
.
assert_array_equal
(
out3_1
.
numpy
(),
out3_2
.
numpy
())
np
.
testing
.
assert_array_equal
(
out3_2
.
numpy
(),
np
.
asarray
(
1
))
np
.
testing
.
assert_array_equal
(
out3_2
.
numpy
(),
np
.
asarray
(
1
))
def
test_sort
(
self
):
x1
=
paddle
.
rand
([])
x2
=
paddle
.
rand
([])
x1
.
stop_gradient
=
False
x2
.
stop_gradient
=
False
out1
=
paddle
.
sort
(
x1
,
axis
=-
1
)
out2
=
paddle
.
sort
(
x2
,
axis
=
0
)
out1
.
backward
()
out2
.
backward
()
self
.
assertEqual
(
out1
.
shape
,
[])
self
.
assertEqual
(
out2
.
shape
,
[])
self
.
assertEqual
(
out1
.
grad
.
shape
,
[])
self
.
assertEqual
(
out2
.
grad
.
shape
,
[])
self
.
assertEqual
(
x1
.
grad
.
shape
,
[])
self
.
assertEqual
(
x2
.
grad
.
shape
,
[])
def
test_argsort
(
self
):
x1
=
paddle
.
rand
([])
x2
=
paddle
.
rand
([])
x1
.
stop_gradient
=
False
x2
.
stop_gradient
=
False
out1
=
paddle
.
argsort
(
x1
,
axis
=-
1
)
out2
=
paddle
.
argsort
(
x2
,
axis
=
0
)
out1
.
backward
()
out2
.
backward
()
self
.
assertEqual
(
out1
.
shape
,
[])
self
.
assertEqual
(
out2
.
shape
,
[])
self
.
assertEqual
(
out1
.
grad
.
shape
,
[])
self
.
assertEqual
(
out2
.
grad
.
shape
,
[])
self
.
assertEqual
(
x1
.
grad
.
shape
,
[])
self
.
assertEqual
(
x2
.
grad
.
shape
,
[])
# Use to test API whose zero-dim input tensors don't have grad and not need to test backward in OpTest.
# Use to test API whose zero-dim input tensors don't have grad and not need to test backward in OpTest.
class
TestNoBackwardAPI
(
unittest
.
TestCase
):
class
TestNoBackwardAPI
(
unittest
.
TestCase
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录