Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
389f8c5e
P
Paddle
项目概览
wmsofts
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
389f8c5e
编写于
7月 06, 2021
作者:
Q
Qi Li
提交者:
GitHub
7月 06, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[OP] fix histogram op when input tensor is empty, test=develop (#33970)
上级
7a476608
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
10 deletion
+14
-10
paddle/fluid/operators/histogram_op.cu
paddle/fluid/operators/histogram_op.cu
+7
-5
paddle/fluid/operators/histogram_op.h
paddle/fluid/operators/histogram_op.h
+7
-5
未找到文件。
paddle/fluid/operators/histogram_op.cu
浏览文件 @
389f8c5e
...
@@ -81,6 +81,13 @@ class HistogramCUDAKernel : public framework::OpKernel<T> {
...
@@ -81,6 +81,13 @@ class HistogramCUDAKernel : public framework::OpKernel<T> {
const
T
*
input_data
=
input
->
data
<
T
>
();
const
T
*
input_data
=
input
->
data
<
T
>
();
const
int
input_numel
=
input
->
numel
();
const
int
input_numel
=
input
->
numel
();
int64_t
*
out_data
=
output
->
mutable_data
<
int64_t
>
(
context
.
GetPlace
());
math
::
SetConstant
<
platform
::
CUDADeviceContext
,
int64_t
>
()(
context
.
template
device_context
<
platform
::
CUDADeviceContext
>(),
output
,
static_cast
<
int64_t
>
(
0
));
if
(
input_data
==
nullptr
)
return
;
T
output_min
=
static_cast
<
T
>
(
minval
);
T
output_min
=
static_cast
<
T
>
(
minval
);
T
output_max
=
static_cast
<
T
>
(
maxval
);
T
output_max
=
static_cast
<
T
>
(
maxval
);
...
@@ -126,11 +133,6 @@ class HistogramCUDAKernel : public framework::OpKernel<T> {
...
@@ -126,11 +133,6 @@ class HistogramCUDAKernel : public framework::OpKernel<T> {
"But received max is %d, min is %d"
,
"But received max is %d, min is %d"
,
maxval
,
minval
));
maxval
,
minval
));
int64_t
*
out_data
=
output
->
mutable_data
<
int64_t
>
(
context
.
GetPlace
());
math
::
SetConstant
<
platform
::
CUDADeviceContext
,
int64_t
>
()(
context
.
template
device_context
<
platform
::
CUDADeviceContext
>(),
output
,
static_cast
<
int64_t
>
(
0
));
auto
stream
=
auto
stream
=
context
.
template
device_context
<
platform
::
CUDADeviceContext
>().
stream
();
context
.
template
device_context
<
platform
::
CUDADeviceContext
>().
stream
();
KernelHistogram
<
KernelHistogram
<
...
...
paddle/fluid/operators/histogram_op.h
浏览文件 @
389f8c5e
...
@@ -38,6 +38,13 @@ class HistogramKernel : public framework::OpKernel<T> {
...
@@ -38,6 +38,13 @@ class HistogramKernel : public framework::OpKernel<T> {
const
T
*
input_data
=
input
->
data
<
T
>
();
const
T
*
input_data
=
input
->
data
<
T
>
();
auto
input_numel
=
input
->
numel
();
auto
input_numel
=
input
->
numel
();
int64_t
*
out_data
=
output
->
mutable_data
<
int64_t
>
(
context
.
GetPlace
());
math
::
SetConstant
<
DeviceContext
,
int64_t
>
()(
context
.
template
device_context
<
DeviceContext
>(),
output
,
static_cast
<
int64_t
>
(
0
));
if
(
input_data
==
nullptr
)
return
;
T
output_min
=
static_cast
<
T
>
(
minval
);
T
output_min
=
static_cast
<
T
>
(
minval
);
T
output_max
=
static_cast
<
T
>
(
maxval
);
T
output_max
=
static_cast
<
T
>
(
maxval
);
if
(
output_min
==
output_max
)
{
if
(
output_min
==
output_max
)
{
...
@@ -63,11 +70,6 @@ class HistogramKernel : public framework::OpKernel<T> {
...
@@ -63,11 +70,6 @@ class HistogramKernel : public framework::OpKernel<T> {
"But received max is %d, min is %d"
,
"But received max is %d, min is %d"
,
maxval
,
minval
));
maxval
,
minval
));
int64_t
*
out_data
=
output
->
mutable_data
<
int64_t
>
(
context
.
GetPlace
());
math
::
SetConstant
<
DeviceContext
,
int64_t
>
()(
context
.
template
device_context
<
DeviceContext
>(),
output
,
static_cast
<
int64_t
>
(
0
));
for
(
int64_t
i
=
0
;
i
<
input_numel
;
i
++
)
{
for
(
int64_t
i
=
0
;
i
<
input_numel
;
i
++
)
{
if
(
input_data
[
i
]
>=
output_min
&&
input_data
[
i
]
<=
output_max
)
{
if
(
input_data
[
i
]
>=
output_min
&&
input_data
[
i
]
<=
output_max
)
{
const
int64_t
bin
=
(
int64_t
)((
input_data
[
i
]
-
output_min
)
*
nbins
/
const
int64_t
bin
=
(
int64_t
)((
input_data
[
i
]
-
output_min
)
*
nbins
/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录