Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
05c9c0a5
P
Paddle
项目概览
PaddlePaddle
/
Paddle
接近 2 年 前同步成功
通知
2323
Star
20933
Fork
5424
代码
文件
提交
分支
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看板
未验证
提交
05c9c0a5
编写于
2月 07, 2023
作者:
Y
Yuang Liu
提交者:
GitHub
2月 07, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix gather, scatter op 0d tenor GPU error. (#50271)
上级
0dd41a2a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
10 deletion
+15
-10
paddle/phi/kernels/funcs/gather.cu.h
paddle/phi/kernels/funcs/gather.cu.h
+2
-1
paddle/phi/kernels/funcs/scatter.cu.h
paddle/phi/kernels/funcs/scatter.cu.h
+7
-3
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
+6
-6
未找到文件。
paddle/phi/kernels/funcs/gather.cu.h
浏览文件 @
05c9c0a5
...
@@ -285,7 +285,8 @@ void GatherV2GradCUDAFunction(const DenseTensor* input,
...
@@ -285,7 +285,8 @@ void GatherV2GradCUDAFunction(const DenseTensor* input,
if
(
input
->
numel
()
==
0
)
return
;
if
(
input
->
numel
()
==
0
)
return
;
int
axis_index
=
axis
;
int
axis_index
=
axis
;
int64_t
input_index_dim_size
=
input_dim
[
axis_index
];
int64_t
input_index_dim_size
=
index
->
dims
().
size
()
==
0
?
1
:
input_dim
[
axis_index
];
int64_t
inner_dim_size
=
1
;
int64_t
inner_dim_size
=
1
;
int64_t
outer_dim_size
=
1
;
int64_t
outer_dim_size
=
1
;
...
...
paddle/phi/kernels/funcs/scatter.cu.h
浏览文件 @
05c9c0a5
...
@@ -182,11 +182,15 @@ template <typename T, typename IndexT = int>
...
@@ -182,11 +182,15 @@ template <typename T, typename IndexT = int>
void
GPUScatterGradForX
(
const
phi
::
GPUContext
&
ctx
,
void
GPUScatterGradForX
(
const
phi
::
GPUContext
&
ctx
,
const
DenseTensor
&
index
,
const
DenseTensor
&
index
,
DenseTensor
*
output
)
{
DenseTensor
*
output
)
{
int64_t
index_size
=
index
.
dims
()[
0
];
int64_t
index_size
=
index
.
dims
()
.
size
()
==
0
?
1
:
index
.
dims
()
[
0
];
auto
dst_dims
=
output
->
dims
();
auto
dst_dims
=
output
->
dims
();
// slice size
// slice size
int64_t
slice_size
=
1
;
int64_t
slice_size
=
1
;
// slice size
for
(
int
i
=
1
;
i
<
dst_dims
.
size
();
++
i
)
slice_size
*=
dst_dims
[
i
];
if
(
index
.
dims
().
size
()
!=
0
)
{
for
(
int
i
=
1
;
i
<
dst_dims
.
size
();
++
i
)
slice_size
*=
dst_dims
[
i
];
}
else
{
for
(
int
i
=
0
;
i
<
dst_dims
.
size
();
++
i
)
slice_size
*=
dst_dims
[
i
];
}
const
IndexT
*
p_index
=
index
.
data
<
IndexT
>
();
const
IndexT
*
p_index
=
index
.
data
<
IndexT
>
();
T
*
p_output
=
output
->
data
<
T
>
();
T
*
p_output
=
output
->
data
<
T
>
();
const
size_t
&
slice_bytes
=
slice_size
*
sizeof
(
T
);
const
size_t
&
slice_bytes
=
slice_size
*
sizeof
(
T
);
...
...
python/paddle/fluid/tests/unittests/test_zero_dim_tensor.py
浏览文件 @
05c9c0a5
...
@@ -887,7 +887,7 @@ class TestSundryAPI(unittest.TestCase):
...
@@ -887,7 +887,7 @@ class TestSundryAPI(unittest.TestCase):
self
.
assertEqual
(
x
.
grad
.
shape
,
[
2
,
3
])
self
.
assertEqual
(
x
.
grad
.
shape
,
[
2
,
3
])
self
.
assertEqual
(
out
.
grad
.
shape
,
[
3
])
self
.
assertEqual
(
out
.
grad
.
shape
,
[
3
])
def
_
test_gather_xD_axis_1
(
self
):
def
test_gather_xD_axis_1
(
self
):
x
=
paddle
.
to_tensor
(
x
=
paddle
.
to_tensor
(
[[
1.0
,
2.0
,
3.0
],
[
4.0
,
5.0
,
6.0
]],
stop_gradient
=
False
[[
1.0
,
2.0
,
3.0
],
[
4.0
,
5.0
,
6.0
]],
stop_gradient
=
False
)
)
...
@@ -901,7 +901,7 @@ class TestSundryAPI(unittest.TestCase):
...
@@ -901,7 +901,7 @@ class TestSundryAPI(unittest.TestCase):
self
.
assertEqual
(
x
.
grad
.
shape
,
[
2
,
3
])
self
.
assertEqual
(
x
.
grad
.
shape
,
[
2
,
3
])
self
.
assertEqual
(
out
.
grad
.
shape
,
[
2
])
self
.
assertEqual
(
out
.
grad
.
shape
,
[
2
])
def
_
test_scatter_1D
(
self
):
def
test_scatter_1D
(
self
):
x
=
paddle
.
to_tensor
([
1.0
,
3.0
,
5.0
,
7.0
,
9.0
],
stop_gradient
=
False
)
x
=
paddle
.
to_tensor
([
1.0
,
3.0
,
5.0
,
7.0
,
9.0
],
stop_gradient
=
False
)
index
=
paddle
.
full
([],
2
,
'int64'
)
index
=
paddle
.
full
([],
2
,
'int64'
)
updates
=
paddle
.
full
([],
4.0
)
updates
=
paddle
.
full
([],
4.0
)
...
@@ -913,7 +913,7 @@ class TestSundryAPI(unittest.TestCase):
...
@@ -913,7 +913,7 @@ class TestSundryAPI(unittest.TestCase):
self
.
assertEqual
(
out
.
numpy
()[
2
],
4
)
self
.
assertEqual
(
out
.
numpy
()[
2
],
4
)
self
.
assertEqual
(
out
.
grad
.
shape
,
[
5
])
self
.
assertEqual
(
out
.
grad
.
shape
,
[
5
])
def
_
test_scatter_XD
(
self
):
def
test_scatter_XD
(
self
):
x
=
paddle
.
to_tensor
(
x
=
paddle
.
to_tensor
(
[[
1.0
,
2.0
,
3.0
],
[
4.0
,
5.0
,
6.0
]],
stop_gradient
=
False
[[
1.0
,
2.0
,
3.0
],
[
4.0
,
5.0
,
6.0
]],
stop_gradient
=
False
)
)
...
@@ -1925,7 +1925,7 @@ class TestSundryAPIStatic(unittest.TestCase):
...
@@ -1925,7 +1925,7 @@ class TestSundryAPIStatic(unittest.TestCase):
self
.
assertEqual
(
res
[
2
].
shape
,
(
3
,))
self
.
assertEqual
(
res
[
2
].
shape
,
(
3
,))
@
prog_scope
()
@
prog_scope
()
def
_
test_gather_XD_axis_1
(
self
):
def
test_gather_XD_axis_1
(
self
):
x
=
paddle
.
full
([
2
,
3
],
1.0
,
'float32'
)
x
=
paddle
.
full
([
2
,
3
],
1.0
,
'float32'
)
x
.
stop_gradient
=
False
x
.
stop_gradient
=
False
index
=
paddle
.
full
([],
1
,
'int64'
)
index
=
paddle
.
full
([],
1
,
'int64'
)
...
@@ -1940,7 +1940,7 @@ class TestSundryAPIStatic(unittest.TestCase):
...
@@ -1940,7 +1940,7 @@ class TestSundryAPIStatic(unittest.TestCase):
self
.
assertEqual
(
res
[
2
].
shape
,
(
2
,))
self
.
assertEqual
(
res
[
2
].
shape
,
(
2
,))
@
prog_scope
()
@
prog_scope
()
def
_
test_scatter_1D
(
self
):
def
test_scatter_1D
(
self
):
x
=
paddle
.
full
([
10
],
1.0
,
'float32'
)
x
=
paddle
.
full
([
10
],
1.0
,
'float32'
)
x
.
stop_gradient
=
False
x
.
stop_gradient
=
False
index
=
paddle
.
full
([],
2
,
'int64'
)
index
=
paddle
.
full
([],
2
,
'int64'
)
...
@@ -1956,7 +1956,7 @@ class TestSundryAPIStatic(unittest.TestCase):
...
@@ -1956,7 +1956,7 @@ class TestSundryAPIStatic(unittest.TestCase):
self
.
assertEqual
(
res
[
2
].
shape
,
(
10
,))
self
.
assertEqual
(
res
[
2
].
shape
,
(
10
,))
@
prog_scope
()
@
prog_scope
()
def
_
test_scatter_XD
(
self
):
def
test_scatter_XD
(
self
):
x
=
paddle
.
full
([
2
,
3
],
1.0
,
'float32'
)
x
=
paddle
.
full
([
2
,
3
],
1.0
,
'float32'
)
x
.
stop_gradient
=
False
x
.
stop_gradient
=
False
index
=
paddle
.
full
([],
1
,
'int64'
)
index
=
paddle
.
full
([],
1
,
'int64'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录